aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bnx2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index ab26bbc2a1d3..320526b9b467 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -3207,10 +3207,10 @@ bnx2_rx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget)
3207 3207
3208#ifdef BCM_VLAN 3208#ifdef BCM_VLAN
3209 if (hw_vlan) 3209 if (hw_vlan)
3210 vlan_hwaccel_receive_skb(skb, bp->vlgrp, vtag); 3210 vlan_gro_receive(&bnapi->napi, bp->vlgrp, vtag, skb);
3211 else 3211 else
3212#endif 3212#endif
3213 netif_receive_skb(skb); 3213 napi_gro_receive(&bnapi->napi, skb);
3214 3214
3215 rx_pkt++; 3215 rx_pkt++;
3216 3216
@@ -8296,7 +8296,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
8296 memcpy(dev->dev_addr, bp->mac_addr, 6); 8296 memcpy(dev->dev_addr, bp->mac_addr, 6);
8297 memcpy(dev->perm_addr, bp->mac_addr, 6); 8297 memcpy(dev->perm_addr, bp->mac_addr, 6);
8298 8298
8299 dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG; 8299 dev->features |= NETIF_F_IP_CSUM | NETIF_F_SG | NETIF_F_GRO;
8300 vlan_features_add(dev, NETIF_F_IP_CSUM | NETIF_F_SG); 8300 vlan_features_add(dev, NETIF_F_IP_CSUM | NETIF_F_SG);
8301 if (CHIP_NUM(bp) == CHIP_NUM_5709) { 8301 if (CHIP_NUM(bp) == CHIP_NUM_5709) {
8302 dev->features |= NETIF_F_IPV6_CSUM; 8302 dev->features |= NETIF_F_IPV6_CSUM;