diff options
| author | Joonwoo Park <joonwpark81@gmail.com> | 2008-07-08 12:22:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-08 12:22:16 +0200 |
| commit | 26a25239d7a660cc7162e2463b48b40d544364d0 (patch) | |
| tree | 1448f1721042dbbac1ff2f1fd4ba2bcb965f96ee /net/8021q | |
| parent | vlan: fix network_header/mac_header adjustments (diff) | |
| download | linux-26a25239d7a660cc7162e2463b48b40d544364d0.tar.xz linux-26a25239d7a660cc7162e2463b48b40d544364d0.zip | |
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>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan.c | 3 | ||||
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 | ||||
| -rw-r--r-- | net/8021q/vlanproc.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index b529110c9355..8141e2dc510b 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -570,8 +570,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) goto out; 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; } diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 4a8525927c27..88f318a9601d 100644 --- a/net/8021q/vlan_dev.c +++ b/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; } - if (real_dev->priv_flags & IFF_802_1Q_VLAN) + if (is_vlan_dev(real_dev)) subclass = 1; lockdep_set_class_and_subclass(&dev->_xmit_lock, diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c index 08b54b593d56..6073a888b6f9 100644 --- a/net/8021q/vlanproc.c +++ b/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"; int i; - if (!(vlandev->priv_flags & IFF_802_1Q_VLAN)) + if (!is_vlan_dev(vlandev)) return 0; seq_printf(seq, |