These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / macvlan.c

diff --git a/kernel/drivers/net/macvlan.c b/kernel/drivers/net/macvlan.c
index 9f59f17..06c8bfe 100644 (file)
--- a/kernel/drivers/net/macvlan.c
+++ b/kernel/drivers/net/macvlan.c
@@ -412,9 +412,10 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
 
        port = macvlan_port_get_rcu(skb->dev);
        if (is_multicast_ether_addr(eth->h_dest)) {
-               skb = ip_check_defrag(skb, IP_DEFRAG_MACVLAN);
+               skb = ip_check_defrag(dev_net(skb->dev), skb, IP_DEFRAG_MACVLAN);
                if (!skb)
                        return RX_HANDLER_CONSUMED;
+               *pskb = skb;
                eth = eth_hdr(skb);
                macvlan_forward_source(skb, port, eth->h_source);
                src = macvlan_hash_lookup(port, eth->h_source);
@@ -456,6 +457,7 @@ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb)
                goto out;
        }
 
+       *pskb = skb;
        skb->dev = dev;
        skb->pkt_type = PACKET_HOST;
 
@@ -1047,6 +1049,7 @@ static const struct net_device_ops macvlan_netdev_ops = {
        .ndo_netpoll_cleanup    = macvlan_dev_netpoll_cleanup,
 #endif
        .ndo_get_iflink         = macvlan_dev_get_iflink,
+       .ndo_features_check     = passthru_features_check,
 };
 
 void macvlan_common_setup(struct net_device *dev)