diff options
| author |   Antoine Ténart <antoine.tenart@free-electrons.com> | 2014-09-30 16:28:10 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-30 16:36:12 -0400 |
| commit | 09f5da1b6afbebaa0e04e65c7cd732099686ec5a (patch) | |
| tree | f16826f56d001b541dce8f507f14c12928bbb3ca /drivers/net/ethernet/marvell | |
| parent | Documentation: bindings: net: add the Marvell PXA168 Ethernet controller (diff) | |
| download | linux-dev-09f5da1b6afbebaa0e04e65c7cd732099686ec5a.tar.xz linux-dev-09f5da1b6afbebaa0e04e65c7cd732099686ec5a.zip | |
net: pxa168_eth: fix Ethernet flow control status
IEEE 802.3x Ethernet flow control is disabled when bit (1 << 2) is set
in the port status register. Fix the flow control detection in the link
event handling function which was relying on the opposite assumption.
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/pxa168_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c index c9920c322c8f..46b86714e9d7 100644 --- a/drivers/net/ethernet/marvell/pxa168_eth.c +++ b/drivers/net/ethernet/marvell/pxa168_eth.c @@ -163,7 +163,7 @@ /* Bit definitions for Port status */ #define PORT_SPEED_100 (1 << 0) #define FULL_DUPLEX (1 << 1) -#define FLOW_CONTROL_ENABLED (1 << 2) +#define FLOW_CONTROL_DISABLED (1 << 2) #define LINK_UP (1 << 3) /* Bit definitions for work to be done */ @@ -885,7 +885,7 @@ static void handle_link_event(struct pxa168_eth_private *pep) speed = 10; duplex = (port_status & FULL_DUPLEX) ? 1 : 0; - fc = (port_status & FLOW_CONTROL_ENABLED) ? 1 : 0; + fc = (port_status & FLOW_CONTROL_DISABLED) ? 0 : 1; netdev_info(dev, "link up, %d Mb/s, %s duplex, flow control %sabled\n", speed, duplex ? "full" : "half", fc ? "en" : "dis"); if (!netif_carrier_ok(dev)) |