1 files changed, 13 insertions, 9 deletions

diff --git a/net/socket.c b/net/socket.c
index a714c6d4e4a1..bc16eee4dc80 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -791,9 +791,9 @@ static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
  */
 
 static DEFINE_MUTEX(br_ioctl_mutex);
-static int (*br_ioctl_hook) (unsigned int cmd, void __user *arg) = NULL;
+static int (*br_ioctl_hook) (struct net *, unsigned int cmd, void __user *arg) = NULL;
 
-void brioctl_set(int (*hook) (unsigned int, void __user *))
+void brioctl_set(int (*hook) (struct net *, unsigned int, void __user *))
 {
         mutex_lock(&br_ioctl_mutex);
         br_ioctl_hook = hook;
@@ -803,9 +803,9 @@ void brioctl_set(int (*hook) (unsigned int, void __user *))
 EXPORT_SYMBOL(brioctl_set);
 
 static DEFINE_MUTEX(vlan_ioctl_mutex);
-static int (*vlan_ioctl_hook) (void __user *arg);
+static int (*vlan_ioctl_hook) (struct net *, void __user *arg);
 
-void vlan_ioctl_set(int (*hook) (void __user *))
+void vlan_ioctl_set(int (*hook) (struct net *, void __user *))
 {
         mutex_lock(&vlan_ioctl_mutex);
         vlan_ioctl_hook = hook;
@@ -834,16 +834,20 @@ EXPORT_SYMBOL(dlci_ioctl_set);
 static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 {
         struct socket *sock;
+        struct sock *sk;
         void __user *argp = (void __user *)arg;
         int pid, err;
+        struct net *net;
 
         sock = file->private_data;
+        sk = sock->sk;
+        net = sk->sk_net;
         if (cmd >= SIOCDEVPRIVATE && cmd <= (SIOCDEVPRIVATE + 15)) {
-                err = dev_ioctl(cmd, argp);
+                err = dev_ioctl(net, cmd, argp);
         } else
 #ifdef CONFIG_WIRELESS_EXT
         if (cmd >= SIOCIWFIRST && cmd <= SIOCIWLAST) {
-                err = dev_ioctl(cmd, argp);
+                err = dev_ioctl(net, cmd, argp);
         } else
 #endif                          /* CONFIG_WIRELESS_EXT */
                 switch (cmd) {
@@ -869,7 +873,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 
                         mutex_lock(&br_ioctl_mutex);
                         if (br_ioctl_hook)
-                                err = br_ioctl_hook(cmd, argp);
+                                err = br_ioctl_hook(net, cmd, argp);
                         mutex_unlock(&br_ioctl_mutex);
                         break;
                 case SIOCGIFVLAN:
@@ -880,7 +884,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
 
                         mutex_lock(&vlan_ioctl_mutex);
                         if (vlan_ioctl_hook)
-                                err = vlan_ioctl_hook(argp);
+                                err = vlan_ioctl_hook(net, argp);
                         mutex_unlock(&vlan_ioctl_mutex);
                         break;
                 case SIOCADDDLCI:
@@ -903,7 +907,7 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                          * to the NIC driver.
                          */
                         if (err == -ENOIOCTLCMD)
-                                err = dev_ioctl(cmd, argp);
+                                err = dev_ioctl(net, cmd, argp);
                         break;
                 }
         return err;