diff options
Diffstat (limited to 'drivers/net/8139cp.c')
-rw-r--r-- | drivers/net/8139cp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 066e22b01a94..46d8c01437e9 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
@@ -19,11 +19,11 @@ | |||
19 | See the file COPYING in this distribution for more information. | 19 | See the file COPYING in this distribution for more information. |
20 | 20 | ||
21 | Contributors: | 21 | Contributors: |
22 | 22 | ||
23 | Wake-on-LAN support - Felipe Damasio <felipewd@terra.com.br> | 23 | Wake-on-LAN support - Felipe Damasio <felipewd@terra.com.br> |
24 | PCI suspend/resume - Felipe Damasio <felipewd@terra.com.br> | 24 | PCI suspend/resume - Felipe Damasio <felipewd@terra.com.br> |
25 | LinkChg interrupt - Felipe Damasio <felipewd@terra.com.br> | 25 | LinkChg interrupt - Felipe Damasio <felipewd@terra.com.br> |
26 | 26 | ||
27 | TODO: | 27 | TODO: |
28 | * Test Tx checksumming thoroughly | 28 | * Test Tx checksumming thoroughly |
29 | * Implement dev->tx_timeout | 29 | * Implement dev->tx_timeout |
@@ -461,7 +461,7 @@ static void cp_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) | |||
461 | static inline void cp_set_rxbufsize (struct cp_private *cp) | 461 | static inline void cp_set_rxbufsize (struct cp_private *cp) |
462 | { | 462 | { |
463 | unsigned int mtu = cp->dev->mtu; | 463 | unsigned int mtu = cp->dev->mtu; |
464 | 464 | ||
465 | if (mtu > ETH_DATA_LEN) | 465 | if (mtu > ETH_DATA_LEN) |
466 | /* MTU + ethernet header + FCS + optional VLAN tag */ | 466 | /* MTU + ethernet header + FCS + optional VLAN tag */ |
467 | cp->rx_buf_sz = mtu + ETH_HLEN + 8; | 467 | cp->rx_buf_sz = mtu + ETH_HLEN + 8; |
@@ -510,7 +510,7 @@ static void cp_rx_err_acct (struct cp_private *cp, unsigned rx_tail, | |||
510 | static inline unsigned int cp_rx_csum_ok (u32 status) | 510 | static inline unsigned int cp_rx_csum_ok (u32 status) |
511 | { | 511 | { |
512 | unsigned int protocol = (status >> 16) & 0x3; | 512 | unsigned int protocol = (status >> 16) & 0x3; |
513 | 513 | ||
514 | if (likely((protocol == RxProtoTCP) && (!(status & TCPFail)))) | 514 | if (likely((protocol == RxProtoTCP) && (!(status & TCPFail)))) |
515 | return 1; | 515 | return 1; |
516 | else if ((protocol == RxProtoUDP) && (!(status & UDPFail))) | 516 | else if ((protocol == RxProtoUDP) && (!(status & UDPFail))) |
@@ -1061,7 +1061,7 @@ static void cp_init_hw (struct cp_private *cp) | |||
1061 | cpw8(Config3, PARMEnable); | 1061 | cpw8(Config3, PARMEnable); |
1062 | cp->wol_enabled = 0; | 1062 | cp->wol_enabled = 0; |
1063 | 1063 | ||
1064 | cpw8(Config5, cpr8(Config5) & PMEStatus); | 1064 | cpw8(Config5, cpr8(Config5) & PMEStatus); |
1065 | 1065 | ||
1066 | cpw32_f(HiTxRingAddr, 0); | 1066 | cpw32_f(HiTxRingAddr, 0); |
1067 | cpw32_f(HiTxRingAddr + 4, 0); | 1067 | cpw32_f(HiTxRingAddr + 4, 0); |
@@ -1351,7 +1351,7 @@ static void netdev_get_wol (struct cp_private *cp, | |||
1351 | WAKE_MCAST | WAKE_UCAST; | 1351 | WAKE_MCAST | WAKE_UCAST; |
1352 | /* We don't need to go on if WOL is disabled */ | 1352 | /* We don't need to go on if WOL is disabled */ |
1353 | if (!cp->wol_enabled) return; | 1353 | if (!cp->wol_enabled) return; |
1354 | 1354 | ||
1355 | options = cpr8 (Config3); | 1355 | options = cpr8 (Config3); |
1356 | if (options & LinkUp) wol->wolopts |= WAKE_PHY; | 1356 | if (options & LinkUp) wol->wolopts |= WAKE_PHY; |
1357 | if (options & MagicPacket) wol->wolopts |= WAKE_MAGIC; | 1357 | if (options & MagicPacket) wol->wolopts |= WAKE_MAGIC; |
@@ -1919,7 +1919,7 @@ static int cp_resume (struct pci_dev *pdev) | |||
1919 | mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE); | 1919 | mii_check_media(&cp->mii_if, netif_msg_link(cp), FALSE); |
1920 | 1920 | ||
1921 | spin_unlock_irqrestore (&cp->lock, flags); | 1921 | spin_unlock_irqrestore (&cp->lock, flags); |
1922 | 1922 | ||
1923 | return 0; | 1923 | return 0; |
1924 | } | 1924 | } |
1925 | #endif /* CONFIG_PM */ | 1925 | #endif /* CONFIG_PM */ |