diff options
Diffstat (limited to 'include/net')
34 files changed, 8 insertions, 38 deletions
diff --git a/include/net/addrconf.h b/include/net/addrconf.h index 750e2508dd9..3d71251b3ec 100644 --- a/include/net/addrconf.h +++ b/include/net/addrconf.h @@ -45,7 +45,6 @@ struct prefix_info { #ifdef __KERNEL__ -#include <linux/config.h> #include <linux/netdevice.h> #include <net/if_inet6.h> #include <net/ipv6.h> diff --git a/include/net/af_unix.h b/include/net/af_unix.h index 427dac94bc7..795f81f9ec7 100644 --- a/include/net/af_unix.h +++ b/include/net/af_unix.h @@ -1,7 +1,6 @@ #ifndef __LINUX_NET_AFUNIX_H #define __LINUX_NET_AFUNIX_H -#include <linux/config.h> #include <linux/socket.h> #include <linux/un.h> #include <linux/mutex.h> diff --git a/include/net/ax25.h b/include/net/ax25.h index 5bd99748705..7cd528e9d66 100644 --- a/include/net/ax25.h +++ b/include/net/ax25.h @@ -6,7 +6,6 @@ #ifndef _AX25_H #define _AX25_H -#include <linux/config.h> #include <linux/ax25.h> #include <linux/spinlock.h> #include <linux/timer.h> diff --git a/include/net/compat.h b/include/net/compat.h index e65cbedb6ab..9859b60280d 100644 --- a/include/net/compat.h +++ b/include/net/compat.h @@ -1,7 +1,6 @@ #ifndef NET_COMPAT_H #define NET_COMPAT_H -#include <linux/config.h> struct sock; diff --git a/include/net/dst.h b/include/net/dst.h index 5161e89017f..36d54fc248b 100644 --- a/include/net/dst.h +++ b/include/net/dst.h @@ -8,7 +8,6 @@ #ifndef _NET_DST_H #define _NET_DST_H -#include <linux/config.h> #include <linux/netdevice.h> #include <linux/rtnetlink.h> #include <linux/rcupdate.h> diff --git a/include/net/icmp.h b/include/net/icmp.h index e7c3f20fbaf..05f8ff7d931 100644 --- a/include/net/icmp.h +++ b/include/net/icmp.h @@ -18,7 +18,6 @@ #ifndef _ICMP_H #define _ICMP_H -#include <linux/config.h> #include <linux/icmp.h> #include <net/inet_sock.h> diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h index d5147770ad4..ecc42864b00 100644 --- a/include/net/ieee80211.h +++ b/include/net/ieee80211.h @@ -968,6 +968,7 @@ enum ieee80211_state { enum { IEEE80211_CH_PASSIVE_ONLY = (1 << 0), + IEEE80211_CH_80211H_RULES = (1 << 1), IEEE80211_CH_B_ONLY = (1 << 2), IEEE80211_CH_NO_IBSS = (1 << 3), IEEE80211_CH_UNIFORM_SPREADING = (1 << 4), @@ -976,10 +977,10 @@ enum { }; struct ieee80211_channel { - u32 freq; + u32 freq; /* in MHz */ u8 channel; u8 flags; - u8 max_power; + u8 max_power; /* in dBm */ }; struct ieee80211_geo { diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h index 59f0c83d55a..bc6a71dce98 100644 --- a/include/net/inet6_hashtables.h +++ b/include/net/inet6_hashtables.h @@ -14,7 +14,6 @@ #ifndef _INET6_HASHTABLES_H #define _INET6_HASHTABLES_H -#include <linux/config.h> #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #include <linux/in6.h> diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h index 135d80fd658..98e0bb3014f 100644 --- a/include/net/inet_hashtables.h +++ b/include/net/inet_hashtables.h @@ -14,7 +14,6 @@ #ifndef _INET_HASHTABLES_H #define _INET_HASHTABLES_H -#include <linux/config.h> #include <linux/interrupt.h> #include <linux/ipv6.h> diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h index 883eb529ef8..1f4a9a60d4c 100644 --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@ -16,7 +16,6 @@ #ifndef _INET_SOCK_H #define _INET_SOCK_H -#include <linux/config.h> #include <linux/string.h> #include <linux/types.h> diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h index e837f98fdb5..600cb543550 100644 --- a/include/net/inet_timewait_sock.h +++ b/include/net/inet_timewait_sock.h @@ -15,7 +15,6 @@ #ifndef _INET_TIMEWAIT_SOCK_ #define _INET_TIMEWAIT_SOCK_ -#include <linux/config.h> #include <linux/list.h> #include <linux/module.h> diff --git a/include/net/ip.h b/include/net/ip.h index ead233c9540..98f90840077 100644 --- a/include/net/ip.h +++ b/include/net/ip.h @@ -22,7 +22,6 @@ #ifndef _IP_H #define _IP_H -#include <linux/config.h> #include <linux/types.h> #include <linux/ip.h> #include <linux/in.h> diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index e000fa2cd5f..a095d1dec7a 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -16,7 +16,6 @@ #ifndef _NET_IP_FIB_H #define _NET_IP_FIB_H -#include <linux/config.h> #include <net/flow.h> #include <linux/seq_file.h> diff --git a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h index 77225735cbd..ac747b64734 100644 --- a/include/net/ip_mp_alg.h +++ b/include/net/ip_mp_alg.h @@ -7,7 +7,6 @@ #ifndef _NET_IP_MP_ALG_H #define _NET_IP_MP_ALG_H -#include <linux/config.h> #include <linux/ip_mp_alg.h> #include <net/flow.h> #include <net/route.h> diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 7d2674fde19..3b57b159b65 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -248,7 +248,6 @@ struct ip_vs_daemon_user { #ifdef __KERNEL__ -#include <linux/config.h> #include <linux/list.h> /* for struct list_head */ #include <linux/spinlock.h> /* for struct rwlock_t */ #include <asm/atomic.h> /* for struct atomic_t */ diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 4abedb8eaec..a8fdf7970b3 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -104,7 +104,6 @@ struct frag_hdr { #ifdef __KERNEL__ -#include <linux/config.h> #include <net/sock.h> /* sysctls */ diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 1880e46ecc9..1cb0607fcbb 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h @@ -26,7 +26,6 @@ #ifndef NET_IRDA_H #define NET_IRDA_H -#include <linux/config.h> #include <linux/skbuff.h> /* struct sk_buff */ #include <linux/kernel.h> #include <linux/if.h> /* sa_family_t in <linux/irda.h> */ diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h index 92c828029cd..0575c59a5c9 100644 --- a/include/net/irda/irda_device.h +++ b/include/net/irda/irda_device.h @@ -39,7 +39,6 @@ #ifndef IRDA_DEVICE_H #define IRDA_DEVICE_H -#include <linux/config.h> #include <linux/tty.h> #include <linux/netdevice.h> #include <linux/spinlock.h> diff --git a/include/net/irda/irlap.h b/include/net/irda/irlap.h index 2127cae1e0a..e77eb88d922 100644 --- a/include/net/irda/irlap.h +++ b/include/net/irda/irlap.h @@ -27,7 +27,6 @@ #ifndef IRLAP_H #define IRLAP_H -#include <linux/config.h> #include <linux/types.h> #include <linux/skbuff.h> #include <linux/netdevice.h> diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h index c0c895d379b..11ecfa58a64 100644 --- a/include/net/irda/irlmp.h +++ b/include/net/irda/irlmp.h @@ -29,7 +29,6 @@ #include <asm/param.h> /* for HZ */ -#include <linux/config.h> #include <linux/types.h> #include <net/irda/irda.h> diff --git a/include/net/irda/irlmp_frame.h b/include/net/irda/irlmp_frame.h index eb3ad158c02..c463f8bca85 100644 --- a/include/net/irda/irlmp_frame.h +++ b/include/net/irda/irlmp_frame.h @@ -26,7 +26,6 @@ #ifndef IRMLP_FRAME_H #define IRMLP_FRAME_H -#include <linux/config.h> #include <linux/skbuff.h> #include <net/irda/discovery.h> diff --git a/include/net/irda/qos.h b/include/net/irda/qos.h index 9ae3d6bc242..cc577dc0a0e 100644 --- a/include/net/irda/qos.h +++ b/include/net/irda/qos.h @@ -31,7 +31,6 @@ #ifndef IRDA_QOS_H #define IRDA_QOS_H -#include <linux/config.h> #include <linux/skbuff.h> #include <net/irda/parameters.h> diff --git a/include/net/ndisc.h b/include/net/ndisc.h index 91fa271a006..d3915dabe6d 100644 --- a/include/net/ndisc.h +++ b/include/net/ndisc.h @@ -37,7 +37,6 @@ enum { #ifdef __KERNEL__ -#include <linux/config.h> #include <linux/compiler.h> #include <linux/icmpv6.h> #include <linux/in6.h> diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index 41111781580..1fbd8193d5f 100644 --- a/include/net/netfilter/nf_conntrack.h +++ b/include/net/netfilter/nf_conntrack.h @@ -15,7 +15,6 @@ #include <linux/netfilter/nf_conntrack_common.h> #ifdef __KERNEL__ -#include <linux/config.h> #include <linux/bitops.h> #include <linux/compiler.h> #include <asm/atomic.h> diff --git a/include/net/pkt_act.h b/include/net/pkt_act.h index b225d8472b7..cf5e4d2e4c2 100644 --- a/include/net/pkt_act.h +++ b/include/net/pkt_act.h @@ -4,7 +4,6 @@ #include <asm/uaccess.h> #include <asm/system.h> #include <linux/bitops.h> -#include <linux/config.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/sched.h> diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index b94d1ad92c4..75b5b9333fc 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h @@ -218,12 +218,13 @@ extern struct qdisc_rate_table *qdisc_get_rtab(struct tc_ratespec *r, struct rtattr *tab); extern void qdisc_put_rtab(struct qdisc_rate_table *tab); -extern int qdisc_restart(struct net_device *dev); +extern void __qdisc_run(struct net_device *dev); static inline void qdisc_run(struct net_device *dev) { - while (!netif_queue_stopped(dev) && qdisc_restart(dev) < 0) - /* NOTHING */; + if (!netif_queue_stopped(dev) && + !test_and_set_bit(__LINK_STATE_QDISC_RUNNING, &dev->state)) + __qdisc_run(dev); } extern int tc_classify(struct sk_buff *skb, struct tcf_proto *tp, diff --git a/include/net/protocol.h b/include/net/protocol.h index 6dc5970612d..bcaee39bd2f 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h @@ -24,7 +24,6 @@ #ifndef _PROTOCOL_H #define _PROTOCOL_H -#include <linux/config.h> #include <linux/in6.h> #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #include <linux/ipv6.h> diff --git a/include/net/raw.h b/include/net/raw.h index d83571fe4c6..e4af5978194 100644 --- a/include/net/raw.h +++ b/include/net/raw.h @@ -17,7 +17,6 @@ #ifndef _RAW_H #define _RAW_H -#include <linux/config.h> #include <net/protocol.h> diff --git a/include/net/red.h b/include/net/red.h index 2ed4358e329..5ccdbb3d472 100644 --- a/include/net/red.h +++ b/include/net/red.h @@ -1,7 +1,6 @@ #ifndef __NET_SCHED_RED_H #define __NET_SCHED_RED_H -#include <linux/config.h> #include <linux/types.h> #include <net/pkt_sched.h> #include <net/inet_ecn.h> diff --git a/include/net/route.h b/include/net/route.h index 98c915abdec..c4a068692dc 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -24,7 +24,6 @@ #ifndef _ROUTE_H #define _ROUTE_H -#include <linux/config.h> #include <net/dst.h> #include <net/inetpeer.h> #include <net/flow.h> diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 7b6ec998671..b0e9108a4e1 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -1,7 +1,6 @@ #ifndef __NET_SCHED_GENERIC_H #define __NET_SCHED_GENERIC_H -#include <linux/config.h> #include <linux/netdevice.h> #include <linux/types.h> #include <linux/rcupdate.h> diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index b2b40f951ae..a9663b49ea5 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -63,7 +63,6 @@ */ -#include <linux/config.h> #ifdef TEST_FRAME #undef CONFIG_PROC_FS @@ -255,7 +254,7 @@ extern int sctp_debug_flag; #define SCTP_DEBUG_PRINTK_IPADDR(whatever...) #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG -#define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr)) +#define SCTP_ASSERT(expr, str, func) #endif /* SCTP_DEBUG */ diff --git a/include/net/sock.h b/include/net/sock.h index 96565ff0de6..d10dfecb6cb 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -40,7 +40,6 @@ #ifndef _SOCK_H #define _SOCK_H -#include <linux/config.h> #include <linux/list.h> #include <linux/timer.h> #include <linux/cache.h> diff --git a/include/net/tcp.h b/include/net/tcp.h index bfc71f954bb..5f4eb5c7968 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -21,7 +21,6 @@ #define TCP_DEBUG 1 #define FASTRETRANS_DEBUG 1 -#include <linux/config.h> #include <linux/list.h> #include <linux/tcp.h> #include <linux/slab.h> |