1 files changed, 6 insertions, 3 deletions

diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 6227248597c4..654e45f5719d 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -79,9 +79,6 @@ static int vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
 {
         struct sk_buff *p;
 
-        if (netpoll_rx_on(skb))
-                return GRO_NORMAL;
-
         if (skb_bond_should_drop(skb))
                 goto drop;
 
@@ -107,6 +104,9 @@ drop:
 int vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
                      unsigned int vlan_tci, struct sk_buff *skb)
 {
+        if (netpoll_rx_on(skb))
+                return vlan_hwaccel_receive_skb(skb, grp, vlan_tci);
+
         skb_gro_reset_offset(skb);
 
         return napi_skb_finish(vlan_gro_common(napi, grp, vlan_tci, skb), skb);
@@ -121,6 +121,9 @@ int vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
         if (!skb)
                 return NET_RX_DROP;
 
+        if (netpoll_rx_on(skb))
+                return vlan_hwaccel_receive_skb(skb, grp, vlan_tci);
+
         return napi_frags_finish(napi, skb,
                                  vlan_gro_common(napi, grp, vlan_tci, skb));
 }