summaryrefslogtreecommitdiff
path: root/net/decnet
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 08:58:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-17 08:58:52 -0700
commitb225ee5bed70254a100896c473e6dd8c2be45c18 (patch)
tree2f044d5898d15edcff858f624618c788d5b58760 /net/decnet
parent2e532d68a2b3e2aa6b19731501222069735c741c (diff)
parent95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (diff)
downloadlinux-3.10-b225ee5bed70254a100896c473e6dd8c2be45c18.tar.gz
linux-3.10-b225ee5bed70254a100896c473e6dd8c2be45c18.tar.bz2
linux-3.10-b225ee5bed70254a100896c473e6dd8c2be45c18.zip
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: net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely) ipv4: Add a missing rcu_assign_pointer() in routing cache. [netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit xen-netfront: Avoid unaligned accesses to IP header lmc: copy_*_user under spinlock [netdrvr] myri10ge, ixgbe: remove broken select INTEL_IOATDMA
Diffstat (limited to 'net/decnet')
-rw-r--r--net/decnet/dn_dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 8008c861302..28e26bd08e2 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -490,9 +490,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
return -EFAULT;
ifr->ifr_name[IFNAMSIZ-1] = 0;
-#ifdef CONFIG_KMOD
dev_load(&init_net, ifr->ifr_name);
-#endif
switch(cmd) {
case SIOCGIFADDR: