diff options
Diffstat (limited to 'drivers/net/tulip/interrupt.c')
| -rw-r--r-- | drivers/net/tulip/interrupt.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/tulip/interrupt.c b/drivers/net/tulip/interrupt.c index c8d220cf2cce..2e8e8ee893c7 100644 --- a/drivers/net/tulip/interrupt.c +++ b/drivers/net/tulip/interrupt.c | |||
| @@ -170,8 +170,8 @@ int tulip_poll(struct napi_struct *napi, int budget) | |||
| 170 | RxDescCollisionSeen | | 170 | RxDescCollisionSeen | |
| 171 | RxDescRunt | | 171 | RxDescRunt | |
| 172 | RxDescDescErr | | 172 | RxDescDescErr | |
| 173 | RxWholePkt)) != RxWholePkt | 173 | RxWholePkt)) != RxWholePkt || |
| 174 | || pkt_len > 1518) { | 174 | pkt_len > 1518) { |
| 175 | if ((status & (RxLengthOver2047 | | 175 | if ((status & (RxLengthOver2047 | |
| 176 | RxWholePkt)) != RxWholePkt) { | 176 | RxWholePkt)) != RxWholePkt) { |
| 177 | /* Ingore earlier buffers. */ | 177 | /* Ingore earlier buffers. */ |
| @@ -201,8 +201,8 @@ int tulip_poll(struct napi_struct *napi, int budget) | |||
| 201 | 201 | ||
| 202 | /* Check if the packet is long enough to accept without copying | 202 | /* Check if the packet is long enough to accept without copying |
| 203 | to a minimally-sized skbuff. */ | 203 | to a minimally-sized skbuff. */ |
| 204 | if (pkt_len < tulip_rx_copybreak | 204 | if (pkt_len < tulip_rx_copybreak && |
| 205 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 205 | (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
| 206 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 206 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
| 207 | pci_dma_sync_single_for_cpu(tp->pdev, | 207 | pci_dma_sync_single_for_cpu(tp->pdev, |
| 208 | tp->rx_buffers[entry].mapping, | 208 | tp->rx_buffers[entry].mapping, |
| @@ -395,8 +395,8 @@ static int tulip_rx(struct net_device *dev) | |||
| 395 | RxDescCollisionSeen | | 395 | RxDescCollisionSeen | |
| 396 | RxDescRunt | | 396 | RxDescRunt | |
| 397 | RxDescDescErr | | 397 | RxDescDescErr | |
| 398 | RxWholePkt)) != RxWholePkt | 398 | RxWholePkt)) != RxWholePkt || |
| 399 | || pkt_len > 1518) { | 399 | pkt_len > 1518) { |
| 400 | if ((status & (RxLengthOver2047 | | 400 | if ((status & (RxLengthOver2047 | |
| 401 | RxWholePkt)) != RxWholePkt) { | 401 | RxWholePkt)) != RxWholePkt) { |
| 402 | /* Ingore earlier buffers. */ | 402 | /* Ingore earlier buffers. */ |
| @@ -425,8 +425,8 @@ static int tulip_rx(struct net_device *dev) | |||
| 425 | 425 | ||
| 426 | /* Check if the packet is long enough to accept without copying | 426 | /* Check if the packet is long enough to accept without copying |
| 427 | to a minimally-sized skbuff. */ | 427 | to a minimally-sized skbuff. */ |
| 428 | if (pkt_len < tulip_rx_copybreak | 428 | if (pkt_len < tulip_rx_copybreak && |
| 429 | && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { | 429 | (skb = dev_alloc_skb(pkt_len + 2)) != NULL) { |
| 430 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 430 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
| 431 | pci_dma_sync_single_for_cpu(tp->pdev, | 431 | pci_dma_sync_single_for_cpu(tp->pdev, |
| 432 | tp->rx_buffers[entry].mapping, | 432 | tp->rx_buffers[entry].mapping, |