diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sky2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 2e29972b8d0b..ffe3aa7e2ab2 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -852,7 +852,7 @@ static int sky2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) | |||
852 | if (!netif_running(dev)) | 852 | if (!netif_running(dev)) |
853 | return -ENODEV; /* Phy still in reset */ | 853 | return -ENODEV; /* Phy still in reset */ |
854 | 854 | ||
855 | switch(cmd) { | 855 | switch (cmd) { |
856 | case SIOCGMIIPHY: | 856 | case SIOCGMIIPHY: |
857 | data->phy_id = PHY_ADDR_MARV; | 857 | data->phy_id = PHY_ADDR_MARV; |
858 | 858 | ||
@@ -1304,7 +1304,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done) | |||
1304 | struct tx_ring_info *re = sky2->tx_ring + put; | 1304 | struct tx_ring_info *re = sky2->tx_ring + put; |
1305 | struct sk_buff *skb = re->skb; | 1305 | struct sk_buff *skb = re->skb; |
1306 | 1306 | ||
1307 | nxt = re->idx; | 1307 | nxt = re->idx; |
1308 | BUG_ON(nxt >= TX_RING_SIZE); | 1308 | BUG_ON(nxt >= TX_RING_SIZE); |
1309 | prefetch(sky2->tx_ring + nxt); | 1309 | prefetch(sky2->tx_ring + nxt); |
1310 | 1310 | ||
@@ -1320,7 +1320,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done) | |||
1320 | struct tx_ring_info *fre; | 1320 | struct tx_ring_info *fre; |
1321 | fre = sky2->tx_ring + (put + i + 1) % TX_RING_SIZE; | 1321 | fre = sky2->tx_ring + (put + i + 1) % TX_RING_SIZE; |
1322 | pci_unmap_page(pdev, pci_unmap_addr(fre, mapaddr), | 1322 | pci_unmap_page(pdev, pci_unmap_addr(fre, mapaddr), |
1323 | skb_shinfo(skb)->frags[i].size, | 1323 | skb_shinfo(skb)->frags[i].size, |
1324 | PCI_DMA_TODEVICE); | 1324 | PCI_DMA_TODEVICE); |
1325 | } | 1325 | } |
1326 | 1326 | ||
@@ -2187,7 +2187,7 @@ static int sky2_reset(struct sky2_hw *hw) | |||
2187 | sky2_write8(hw, B0_CTST, CS_MRST_CLR); | 2187 | sky2_write8(hw, B0_CTST, CS_MRST_CLR); |
2188 | 2188 | ||
2189 | /* clear any PEX errors */ | 2189 | /* clear any PEX errors */ |
2190 | if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) | 2190 | if (pci_find_capability(hw->pdev, PCI_CAP_ID_EXP)) |
2191 | sky2_pci_write32(hw, PEX_UNC_ERR_STAT, 0xffffffffUL); | 2191 | sky2_pci_write32(hw, PEX_UNC_ERR_STAT, 0xffffffffUL); |
2192 | 2192 | ||
2193 | 2193 | ||
@@ -2954,7 +2954,7 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw, | |||
2954 | sky2->speed = -1; | 2954 | sky2->speed = -1; |
2955 | sky2->advertising = sky2_supported_modes(hw); | 2955 | sky2->advertising = sky2_supported_modes(hw); |
2956 | 2956 | ||
2957 | /* Receive checksum disabled for Yukon XL | 2957 | /* Receive checksum disabled for Yukon XL |
2958 | * because of observed problems with incorrect | 2958 | * because of observed problems with incorrect |
2959 | * values when multiple packets are received in one interrupt | 2959 | * values when multiple packets are received in one interrupt |
2960 | */ | 2960 | */ |