Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed7fdff5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4827bbb0 2bcff60f

drivers/net/mv643xx_eth.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

drivers/net/mv643xx_eth.h

+3 −1
Original line number Diff line number Diff line
@@ -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