diff options
Diffstat (limited to 'drivers/net/epic100.c')
| -rw-r--r-- | drivers/net/epic100.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 703b4c8e9b4d..41494f7b2ec8 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -630,8 +630,8 @@ static int mdio_read(struct net_device *dev, int phy_id, int location) | |||
| 630 | barrier(); | 630 | barrier(); |
| 631 | if ((inl(ioaddr + MIICtrl) & MII_READOP) == 0) { | 631 | if ((inl(ioaddr + MIICtrl) & MII_READOP) == 0) { |
| 632 | /* Work around read failure bug. */ | 632 | /* Work around read failure bug. */ |
| 633 | if (phy_id == 1 && location < 6 | 633 | if (phy_id == 1 && location < 6 && |
| 634 | && inw(ioaddr + MIIData) == 0xffff) { | 634 | inw(ioaddr + MIIData) == 0xffff) { |
| 635 | outl(read_cmd, ioaddr + MIICtrl); | 635 | outl(read_cmd, ioaddr + MIICtrl); |
| 636 | continue; | 636 | continue; |
| 637 | } | 637 | } |
| @@ -1205,8 +1205,8 @@ static int epic_rx(struct net_device *dev, int budget) | |||
| 1205 | } | 1205 | } |
| 1206 | /* Check if the packet is long enough to accept without copying | 1206 | /* Check if the packet is long enough to accept without copying |
| 1207 | to a minimally-sized skbuff. */ | 1207 | to a minimally-sized skbuff. */ |
| 1208 | if (pkt_len < rx_copybreak | 1208 | if (pkt_len < rx_copybreak && |
| 1209 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 1209 | (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
| 1210 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1210 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
| 1211 | pci_dma_sync_single_for_cpu(ep->pci_dev, | 1211 | pci_dma_sync_single_for_cpu(ep->pci_dev, |
| 1212 | ep->rx_ring[entry].bufaddr, | 1212 | ep->rx_ring[entry].bufaddr, |