]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
cnic: remove use of VLAN_TAG_PRESENT
authorMichał Mirosław <mirq-linux@rere.qmqm.pl>
Thu, 8 Nov 2018 17:44:50 +0000 (18:44 +0100)
committerDavid S. Miller <davem@davemloft.net>
Fri, 9 Nov 2018 03:49:31 +0000 (19:49 -0800)
This just removes VLAN_TAG_PRESENT use.  VLAN TCI=0 special meaning is
deeply embedded in the driver code and so is left as is.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/cnic.c

index d83233ae4a15f318ea89acb5da927e71501c2a5e..510dfc1c236bdb164bfaea4476a44f184137972e 100644 (file)
@@ -5731,7 +5731,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,
                if (realdev) {
                        dev = cnic_from_netdev(realdev);
                        if (dev) {
-                               vid |= VLAN_TAG_PRESENT;
+                               vid |= VLAN_CFI_MASK;   /* make non-zero */
                                cnic_rcv_netevent(dev->cnic_priv, event, vid);
                                cnic_put(dev);
                        }