aboutsummaryrefslogtreecommitdiffstats
path: root/net/8021q/vlan.c
diff options
context:
space:
mode:
authorJoonwoo Park <joonwpark81@gmail.com>2008-07-08 06:22:16 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-08 06:22:16 -0400
commit26a25239d7a660cc7162e2463b48b40d544364d0 (patch)
tree1448f1721042dbbac1ff2f1fd4ba2bcb965f96ee /net/8021q/vlan.c
parentacc81e1465d29e0284008770cc4b8bc90bd93bd7 (diff)
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/vlan.c')
-rw-r--r--net/8021q/vlan.c3
1 files changed, 1 insertions, 2 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)
570 goto out; 570 goto out;
571 571
572 err = -EINVAL; 572 err = -EINVAL;
573 if (args.cmd != ADD_VLAN_CMD && 573 if (args.cmd != ADD_VLAN_CMD && !is_vlan_dev(dev))
574 !(dev->priv_flags & IFF_802_1Q_VLAN))
575 goto out; 574 goto out;
576 } 575 }
577 576