diff options
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/Makefile | 2 | ||||
| -rw-r--r-- | net/core/dev.c | 6 | ||||
| -rw-r--r-- | net/core/netfilter.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/net/core/Makefile b/net/core/Makefile index 2f8e73b7bbab..ffbb63e471a4 100644 --- a/net/core/Makefile +++ b/net/core/Makefile @@ -19,5 +19,3 @@ obj-$(CONFIG_NET_DIVERT) += dv.o obj-$(CONFIG_NET_PROFILE) += profile.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o obj-$(CONFIG_NET_RADIO) += wireless.o -# Ugly. I wish all wireless drivers were moved in drivers/net/wireless -obj-$(CONFIG_NET_PCMCIA_RADIO) += wireless.o diff --git a/net/core/dev.c b/net/core/dev.c index 5535abdd4c3a..f7f9cd622e89 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -107,10 +107,10 @@ #include <linux/kmod.h> #include <linux/module.h> #include <linux/kallsyms.h> -#if defined(CONFIG_NET_RADIO) || defined(CONFIG_NET_PCMCIA_RADIO) +#ifdef CONFIG_NET_RADIO #include <linux/wireless.h> /* Note : will define WIRELESS_EXT */ #include <net/iw_handler.h> -#endif /* CONFIG_NET_RADIO || CONFIG_NET_PCMCIA_RADIO */ +#endif /* CONFIG_NET_RADIO */ #ifdef CONFIG_PLIP extern int plip_init(void); #endif @@ -1215,7 +1215,7 @@ static void get_sample_stats(int cpu) #ifdef OFFLINE_SAMPLE static void sample_queue(unsigned long dummy) { -/* 10 ms 0r 1ms -- i dont care -- JHS */ +/* 10 ms 0r 1ms -- i don't care -- JHS */ int next_tick = 1; int cpu = smp_processor_id(); diff --git a/net/core/netfilter.c b/net/core/netfilter.c index 5cfc8f9be6af..a69f8cea7351 100644 --- a/net/core/netfilter.c +++ b/net/core/netfilter.c @@ -606,7 +606,7 @@ int ip_route_me_harder(struct sk_buff **pskb) struct net_device *dev_src = NULL; int err; - /* accomodate ip_route_output_slow(), which expects the key src to be + /* accommodate ip_route_output_slow(), which expects the key src to be 0 or a local address; however some non-standard hacks like ipt_REJECT.c:send_reset() can cause packets with foreign saddr to be appear on the NF_IP_LOCAL_OUT hook -MB */ |