diff options
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 302ea0b7b235..f845837e4aa5 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -4621,13 +4621,12 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) | |||
4621 | len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - | 4621 | len = ((desc->idx_len & RXD_LEN_MASK) >> RXD_LEN_SHIFT) - |
4622 | ETH_FCS_LEN; | 4622 | ETH_FCS_LEN; |
4623 | 4623 | ||
4624 | if (len > RX_COPY_THRESHOLD | 4624 | if (len > RX_COPY_THRESHOLD && |
4625 | && tp->rx_offset == NET_IP_ALIGN | 4625 | tp->rx_offset == NET_IP_ALIGN) { |
4626 | /* rx_offset will likely not equal NET_IP_ALIGN | 4626 | /* rx_offset will likely not equal NET_IP_ALIGN |
4627 | * if this is a 5701 card running in PCI-X mode | 4627 | * if this is a 5701 card running in PCI-X mode |
4628 | * [see tg3_get_invariants()] | 4628 | * [see tg3_get_invariants()] |
4629 | */ | 4629 | */ |
4630 | ) { | ||
4631 | int skb_size; | 4630 | int skb_size; |
4632 | 4631 | ||
4633 | skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key, | 4632 | skb_size = tg3_alloc_rx_skb(tp, tpr, opaque_key, |