1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c
index d50887e3df6d..8c48bb2a94ea 100644
--- a/drivers/net/ipvlan/ipvlan_core.c
+++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -254,7 +254,7 @@ acct:
         }
 }
 
-static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff *skb,
+static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff **pskb,
                             bool local)
 {
         struct ipvl_dev *ipvlan = addr->master;
@@ -262,6 +262,7 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff *skb,
         unsigned int len;
         rx_handler_result_t ret = RX_HANDLER_CONSUMED;
         bool success = false;
+        struct sk_buff *skb = *pskb;
 
         len = skb->len + ETH_HLEN;
         if (unlikely(!(dev->flags & IFF_UP))) {
@@ -273,6 +274,7 @@ static int ipvlan_rcv_frame(struct ipvl_addr *addr, struct sk_buff *skb,
         if (!skb)
                 goto out;
 
+        *pskb = skb;
         skb->dev = dev;
         skb->pkt_type = PACKET_HOST;
 
@@ -486,7 +488,7 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev)
 
         addr = ipvlan_addr_lookup(ipvlan->port, lyr3h, addr_type, true);
         if (addr)
-                return ipvlan_rcv_frame(addr, skb, true);
+                return ipvlan_rcv_frame(addr, &skb, true);
 
 out:
         skb->dev = ipvlan->phy_dev;
@@ -506,7 +508,7 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev)
                 if (lyr3h) {
                         addr = ipvlan_addr_lookup(ipvlan->port, lyr3h, addr_type, true);
                         if (addr)
-                                return ipvlan_rcv_frame(addr, skb, true);
+                                return ipvlan_rcv_frame(addr, &skb, true);
                 }
                 skb = skb_share_check(skb, GFP_ATOMIC);
                 if (!skb)
@@ -589,7 +591,7 @@ static rx_handler_result_t ipvlan_handle_mode_l3(struct sk_buff **pskb,
 
         addr = ipvlan_addr_lookup(port, lyr3h, addr_type, true);
         if (addr)
-                ret = ipvlan_rcv_frame(addr, skb, false);
+                ret = ipvlan_rcv_frame(addr, pskb, false);
 
 out:
         return ret;
@@ -626,7 +628,7 @@ static rx_handler_result_t ipvlan_handle_mode_l2(struct sk_buff **pskb,
 
                 addr = ipvlan_addr_lookup(port, lyr3h, addr_type, true);
                 if (addr)
-                        ret = ipvlan_rcv_frame(addr, skb, false);
+                        ret = ipvlan_rcv_frame(addr, pskb, false);
         }
 
         return ret;
@@ -651,5 +653,5 @@ rx_handler_result_t ipvlan_handle_frame(struct sk_buff **pskb)
         WARN_ONCE(true, "ipvlan_handle_frame() called for mode = [%hx]\n",
                           port->mode);
         kfree_skb(skb);
-        return NET_RX_DROP;
+        return RX_HANDLER_CONSUMED;
 }