Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  sch_htb: fix "too many events" situation
  connector: convert to single-threaded workqueue
  [ATM]: When proc_create() fails, do some error handling work and return -ENOMEM.
  [SUNGEM]: Fix NAPI assertion failure.
  BNX2X: prevent ethtool from setting port type
  [9P] net/9p/trans_fd.c: remove unused variable
  [IPV6] net/ipv6/ndisc.c: remove unused variable
  [IPV4] fib_trie: fix warning from rcu_assign_poinger
  [TCP]: Let skbs grow over a page on fast peers
  [DLCI]: Fix tiny race between module unload and sock_ioctl.
  [SCTP]: Fix build warnings with IPV6 disabled.
  [IPV4]: Fix null dereference in ip_defrag

1 files changed, 3 insertions, 4 deletions

diff --git a/net/socket.c b/net/socket.c
index b6d35cd72a50..9d3fbfbc8535 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -909,11 +909,10 @@ static long sock_ioctl(struct file *file, unsigned cmd, unsigned long arg)
                         if (!dlci_ioctl_hook)
                                 request_module("dlci");
 
-                        if (dlci_ioctl_hook) {
-                                mutex_lock(&dlci_ioctl_mutex);
+                        mutex_lock(&dlci_ioctl_mutex);
+                        if (dlci_ioctl_hook)
                                 err = dlci_ioctl_hook(cmd, argp);
-                                mutex_unlock(&dlci_ioctl_mutex);
-                        }
+                        mutex_unlock(&dlci_ioctl_mutex);
                         break;
                 default:
                         err = sock->ops->ioctl(sock, cmd, arg);