mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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
This commit is contained in:
commit
b225ee5bed
28 changed files with 96 additions and 89 deletions
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in a new issue