diff options
Diffstat (limited to 'net/8021q/vlan.c')
-rw-r--r-- | net/8021q/vlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c index d0d36fdedbe..a9ced0a6f4c 100644 --- a/net/8021q/vlan.c +++ b/net/8021q/vlan.c | |||
@@ -51,7 +51,7 @@ static char vlan_copyright[] = "Ben Greear <greearb@candelatech.com>"; | |||
51 | static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>"; | 51 | static char vlan_buggyright[] = "David S. Miller <davem@redhat.com>"; |
52 | 52 | ||
53 | static int vlan_device_event(struct notifier_block *, unsigned long, void *); | 53 | static int vlan_device_event(struct notifier_block *, unsigned long, void *); |
54 | static int vlan_ioctl_handler(void __user *); | 54 | static int vlan_ioctl_handler(struct net *net, void __user *); |
55 | static int unregister_vlan_dev(struct net_device *, unsigned short ); | 55 | static int unregister_vlan_dev(struct net_device *, unsigned short ); |
56 | 56 | ||
57 | static struct notifier_block vlan_notifier_block = { | 57 | static struct notifier_block vlan_notifier_block = { |
@@ -697,7 +697,7 @@ out: | |||
697 | * o execute requested action or pass command to the device driver | 697 | * o execute requested action or pass command to the device driver |
698 | * arg is really a struct vlan_ioctl_args __user *. | 698 | * arg is really a struct vlan_ioctl_args __user *. |
699 | */ | 699 | */ |
700 | static int vlan_ioctl_handler(void __user *arg) | 700 | static int vlan_ioctl_handler(struct net *net, void __user *arg) |
701 | { | 701 | { |
702 | int err; | 702 | int err; |
703 | unsigned short vid = 0; | 703 | unsigned short vid = 0; |
@@ -726,7 +726,7 @@ static int vlan_ioctl_handler(void __user *arg) | |||
726 | case GET_VLAN_REALDEV_NAME_CMD: | 726 | case GET_VLAN_REALDEV_NAME_CMD: |
727 | case GET_VLAN_VID_CMD: | 727 | case GET_VLAN_VID_CMD: |
728 | err = -ENODEV; | 728 | err = -ENODEV; |
729 | dev = __dev_get_by_name(args.device1); | 729 | dev = __dev_get_by_name(&init_net, args.device1); |
730 | if (!dev) | 730 | if (!dev) |
731 | goto out; | 731 | goto out; |
732 | 732 | ||