Ver código fonte

vlan: Use is_vlan_dev()

Use simplified is_vlan_dev function.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Joonwoo Park 17 anos atrás
pai
commit
26a25239d7
3 arquivos alterados com 3 adições e 4 exclusões
  1. 1 2
      net/8021q/vlan.c
  2. 1 1
      net/8021q/vlan_dev.c
  3. 1 1
      net/8021q/vlanproc.c

+ 1 - 2
net/8021q/vlan.c

@@ -570,8 +570,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
 			goto out;
 			goto out;
 
 
 		err = -EINVAL;
 		err = -EINVAL;
-		if (args.cmd != ADD_VLAN_CMD &&
-		    !(dev->priv_flags & IFF_802_1Q_VLAN))
+		if (args.cmd != ADD_VLAN_CMD && !is_vlan_dev(dev))
 			goto out;
 			goto out;
 	}
 	}
 
 

+ 1 - 1
net/8021q/vlan_dev.c

@@ -694,7 +694,7 @@ static int vlan_dev_init(struct net_device *dev)
 		dev->hard_start_xmit = vlan_dev_hard_start_xmit;
 		dev->hard_start_xmit = vlan_dev_hard_start_xmit;
 	}
 	}
 
 
-	if (real_dev->priv_flags & IFF_802_1Q_VLAN)
+	if (is_vlan_dev(real_dev))
 		subclass = 1;
 		subclass = 1;
 
 
 	lockdep_set_class_and_subclass(&dev->_xmit_lock,
 	lockdep_set_class_and_subclass(&dev->_xmit_lock,

+ 1 - 1
net/8021q/vlanproc.c

@@ -290,7 +290,7 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
 	static const char fmt[] = "%30s %12lu\n";
 	static const char fmt[] = "%30s %12lu\n";
 	int i;
 	int i;
 
 
-	if (!(vlandev->priv_flags & IFF_802_1Q_VLAN))
+	if (!is_vlan_dev(vlandev))
 		return 0;
 		return 0;
 
 
 	seq_printf(seq,
 	seq_printf(seq,