futex: Split futex_mm_release() for exit/exec

[mirror_ubuntu-bionic-kernel.git] / include / net / l3mdev.h

diff --git a/include/net/l3mdev.h b/include/net/l3mdev.h
index 3832099289c5aa607ed89bc6eb711a8e412980f0..128487658ff7c2fa147fabd02bc4c9ef943656e3 100644 (file)
--- a/include/net/l3mdev.h
+++ b/include/net/l3mdev.h
@@ -142,7 +142,8 @@ struct sk_buff *l3mdev_l3_rcv(struct sk_buff *skb, u16 proto)
 
        if (netif_is_l3_slave(skb->dev))
                master = netdev_master_upper_dev_get_rcu(skb->dev);
-       else if (netif_is_l3_master(skb->dev))
+       else if (netif_is_l3_master(skb->dev) ||
+                netif_has_l3_rx_handler(skb->dev))
                master = skb->dev;
 
        if (master && master->l3mdev_ops->l3mdev_l3_rcv)