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

[kvmfornfv.git] / kernel / net / 8021q / vlan_core.c

diff --git a/kernel/net/8021q/vlan_core.c b/kernel/net/8021q/vlan_core.c
index 61bf2a0..e2ed698 100644 (file)
--- a/kernel/net/8021q/vlan_core.c
+++ b/kernel/net/8021q/vlan_core.c
@@ -30,7 +30,9 @@ bool vlan_do_receive(struct sk_buff **skbp)
                        skb->pkt_type = PACKET_HOST;
        }
 
-       if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR)) {
+       if (!(vlan_dev_priv(vlan_dev)->flags & VLAN_FLAG_REORDER_HDR) &&
+           !netif_is_macvlan_port(vlan_dev) &&
+           !netif_is_bridge_port(vlan_dev)) {
                unsigned int offset = skb->data - skb_mac_header(skb);
 
                /*
@@ -206,7 +208,10 @@ static int __vlan_vid_add(struct vlan_info *vlan_info, __be16 proto, u16 vid,
                return -ENOMEM;
 
        if (vlan_hw_filter_capable(dev, vid_info)) {
-               err =  ops->ndo_vlan_rx_add_vid(dev, proto, vid);
+               if (netif_device_present(dev))
+                       err = ops->ndo_vlan_rx_add_vid(dev, proto, vid);
+               else
+                       err = -ENODEV;
                if (err) {
                        kfree(vid_info);
                        return err;
@@ -264,7 +269,10 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,
        int err;
 
        if (vlan_hw_filter_capable(dev, vid_info)) {
-               err = ops->ndo_vlan_rx_kill_vid(dev, proto, vid);
+               if (netif_device_present(dev))
+                       err = ops->ndo_vlan_rx_kill_vid(dev, proto, vid);
+               else
+                       err = -ENODEV;
                if (err) {
                        pr_warn("failed to kill vid %04x/%d for device %s\n",
                                proto, vid, dev->name);