cnic: remove use of VLAN_TAG_PRESENT

osctobe · davem330 · commit f723a1a293de · 2018-11-08T19:49:31.000-08:00
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 &lt;mirq-linux@rere.qmqm.pl&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
@@ -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);
 			}

Original file line number	Diff line number	Diff line change
`@@ -5731,7 +5731,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,`
`5731`	`5731`	`if (realdev) {`
`5732`	`5732`	`dev = cnic_from_netdev(realdev);`
`5733`	`5733`	`if (dev) {`
`5734`		`- vid \|= VLAN_TAG_PRESENT;`
	`5734`	`+ vid \|= VLAN_CFI_MASK; /* make non-zero */`
`5735`	`5735`	`cnic_rcv_netevent(dev->cnic_priv, event, vid);`
`5736`	`5736`	`cnic_put(dev);`
`5737`	`5737`	`}`