tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
mv643xx_eth: Check ETH_INT_CAUSE_STATE bit

Linus Torvalds ed7fdff5 4827bbb0

+4 -2
unified split
+1 -1
drivers/net/mv643xx_eth.c
··· 534 } 535 536 /* PHY status changed */ 537 - if (eth_int_cause_ext & ETH_INT_CAUSE_PHY) { 538 struct ethtool_cmd cmd; 539 540 if (mii_link_ok(&mp->mii)) {
··· 534 } 535 536 /* PHY status changed */ 537 + if (eth_int_cause_ext & (ETH_INT_CAUSE_PHY | ETH_INT_CAUSE_STATE)) { 538 struct ethtool_cmd cmd; 539 540 if (mii_link_ok(&mp->mii)) {
+3 -1
drivers/net/mv643xx_eth.h
··· 64 #define ETH_INT_CAUSE_TX_ERROR (ETH_TX_QUEUES_ENABLED << 8) 65 #define ETH_INT_CAUSE_TX (ETH_INT_CAUSE_TX_DONE | ETH_INT_CAUSE_TX_ERROR) 66 #define ETH_INT_CAUSE_PHY 0x00010000 67 - #define ETH_INT_UNMASK_ALL_EXT (ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY) 68 69 #define ETH_INT_MASK_ALL 0x00000000 70 #define ETH_INT_MASK_ALL_EXT 0x00000000
··· 64 #define ETH_INT_CAUSE_TX_ERROR (ETH_TX_QUEUES_ENABLED << 8) 65 #define ETH_INT_CAUSE_TX (ETH_INT_CAUSE_TX_DONE | ETH_INT_CAUSE_TX_ERROR) 66 #define ETH_INT_CAUSE_PHY 0x00010000 67 + #define ETH_INT_CAUSE_STATE 0x00100000 68 + #define ETH_INT_UNMASK_ALL_EXT (ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY | \ 69 + ETH_INT_CAUSE_STATE) 70 71 #define ETH_INT_MASK_ALL 0x00000000 72 #define ETH_INT_MASK_ALL_EXT 0x00000000