diff options
author | Patrick McHardy <kaber@trash.net> | 2008-07-08 03:23:57 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-08 03:23:57 -0700 |
commit | 22d1ba74bbafa96d3f425cc12714d3fe8675183f (patch) | |
tree | 5fdc18001037a667e95229dbc34130b7210e8c8c /net/8021q/vlan.c | |
parent | 7750f403cbe56971336d575b354365190b4e3227 (diff) | |
download | op-kernel-dev-22d1ba74bbafa96d3f425cc12714d3fe8675183f.zip op-kernel-dev-22d1ba74bbafa96d3f425cc12714d3fe8675183f.tar.gz |
vlan: move struct vlan_dev_info to private header
Hide struct vlan_dev_info from drivers to prevent them from growing
more creative ways to use it. Provide accessors for the two drivers
that currently use it.
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.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index 8141e2d..7a2625d 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c @@ -543,7 +543,6 @@ static struct notifier_block vlan_notifier_block __read_mostly = { static int vlan_ioctl_handler(struct net *net, void __user *arg) { int err; - unsigned short vid = 0; struct vlan_ioctl_args args; struct net_device *dev = NULL; @@ -644,8 +643,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg) case GET_VLAN_VID_CMD: err = 0; - vlan_dev_get_vid(dev, &vid); - args.u.VID = vid; + args.u.VID = vlan_dev_vlan_id(dev); if (copy_to_user(arg, &args, sizeof(struct vlan_ioctl_args))) err = -EFAULT; |