Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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 17 years ago
parent
4827bbb06e 2bcff60f7c
commit
ed7fdff5d6
2 changed files with 4 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/net/mv643xx_eth.c
  2. 3 1
      drivers/net/mv643xx_eth.h

+ 1 - 1
drivers/net/mv643xx_eth.c
View File 

@@ -534,7 +534,7 @@ static irqreturn_t mv643xx_eth_int_handler(int irq, void *dev_id)
 
 	}
 
 
 	/* PHY status changed */
 
-	if (eth_int_cause_ext & ETH_INT_CAUSE_PHY) {
 
+	if (eth_int_cause_ext & (ETH_INT_CAUSE_PHY | ETH_INT_CAUSE_STATE)) {
 
 		struct ethtool_cmd cmd;
 
 
 		if (mii_link_ok(&mp->mii)) {

+ 3 - 1
drivers/net/mv643xx_eth.h
View File 

@@ -64,7 +64,9 @@
 
 #define ETH_INT_CAUSE_TX_ERROR	(ETH_TX_QUEUES_ENABLED << 8)
 
 #define ETH_INT_CAUSE_TX	(ETH_INT_CAUSE_TX_DONE | ETH_INT_CAUSE_TX_ERROR)
 
 #define ETH_INT_CAUSE_PHY	0x00010000
 
-#define ETH_INT_UNMASK_ALL_EXT	(ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY)
 
+#define ETH_INT_CAUSE_STATE	0x00100000
 
+#define ETH_INT_UNMASK_ALL_EXT	(ETH_INT_CAUSE_TX | ETH_INT_CAUSE_PHY | \
 
+					ETH_INT_CAUSE_STATE)
 
 
 #define ETH_INT_MASK_ALL	0x00000000
 
 #define ETH_INT_MASK_ALL_EXT	0x00000000