diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 11:58:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-17 11:58:52 -0400 |
| commit | b225ee5bed70254a100896c473e6dd8c2be45c18 (patch) | |
| tree | 2f044d5898d15edcff858f624618c788d5b58760 /net/decnet | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
| parent | 95a5afca4a8d2e1cb77e1d4bc6ff9f718dc32f7a (diff) | |
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.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 8008c8613027..28e26bd08e24 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) | |||
| 490 | return -EFAULT; | 490 | return -EFAULT; |
| 491 | ifr->ifr_name[IFNAMSIZ-1] = 0; | 491 | ifr->ifr_name[IFNAMSIZ-1] = 0; |
| 492 | 492 | ||
| 493 | #ifdef CONFIG_KMOD | ||
| 494 | dev_load(&init_net, ifr->ifr_name); | 493 | dev_load(&init_net, ifr->ifr_name); |
| 495 | #endif | ||
| 496 | 494 | ||
| 497 | switch(cmd) { | 495 | switch(cmd) { |
| 498 | case SIOCGIFADDR: | 496 | case SIOCGIFADDR: |