Loading drivers/net/tg3.c +2 −2 Original line number Original line Diff line number Diff line Loading @@ -4392,7 +4392,7 @@ static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key, #if TG3_VLAN_TAG_USED #if TG3_VLAN_TAG_USED static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag) static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag) { { return vlan_hwaccel_receive_skb(skb, tp->vlgrp, vlan_tag); return vlan_gro_receive(&tp->napi, tp->vlgrp, vlan_tag, skb); } } #endif #endif Loading Loading @@ -4539,7 +4539,7 @@ static int tg3_rx(struct tg3 *tp, int budget) desc->err_vlan & RXD_VLAN_MASK); desc->err_vlan & RXD_VLAN_MASK); } else } else #endif #endif netif_receive_skb(skb); napi_gro_receive(&tp->napi, skb); received++; received++; budget--; budget--; Loading Loading
drivers/net/tg3.c +2 −2 Original line number Original line Diff line number Diff line Loading @@ -4392,7 +4392,7 @@ static void tg3_recycle_rx(struct tg3 *tp, u32 opaque_key, #if TG3_VLAN_TAG_USED #if TG3_VLAN_TAG_USED static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag) static int tg3_vlan_rx(struct tg3 *tp, struct sk_buff *skb, u16 vlan_tag) { { return vlan_hwaccel_receive_skb(skb, tp->vlgrp, vlan_tag); return vlan_gro_receive(&tp->napi, tp->vlgrp, vlan_tag, skb); } } #endif #endif Loading Loading @@ -4539,7 +4539,7 @@ static int tg3_rx(struct tg3 *tp, int budget) desc->err_vlan & RXD_VLAN_MASK); desc->err_vlan & RXD_VLAN_MASK); } else } else #endif #endif netif_receive_skb(skb); napi_gro_receive(&tp->napi, skb); received++; received++; budget--; budget--; Loading