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/sched/sch_api.c | |
| 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/sched/sch_api.c')
| -rw-r--r-- | net/sched/sch_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 1122c952aa99..b16ad2972c6b 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
| @@ -764,7 +764,7 @@ qdisc_create(struct net_device *dev, struct netdev_queue *dev_queue, | |||
| 764 | struct qdisc_size_table *stab; | 764 | struct qdisc_size_table *stab; |
| 765 | 765 | ||
| 766 | ops = qdisc_lookup_ops(kind); | 766 | ops = qdisc_lookup_ops(kind); |
| 767 | #ifdef CONFIG_KMOD | 767 | #ifdef CONFIG_MODULES |
| 768 | if (ops == NULL && kind != NULL) { | 768 | if (ops == NULL && kind != NULL) { |
| 769 | char name[IFNAMSIZ]; | 769 | char name[IFNAMSIZ]; |
| 770 | if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) { | 770 | if (nla_strlcpy(name, kind, IFNAMSIZ) < IFNAMSIZ) { |