24 files changed, 604 insertions, 464 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 0e85ec39b638..1d57835d73f2 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -280,11 +280,16 @@ struct mpath_info {
 *      (0 = no, 1 = yes, -1 = do not change)
 * @use_short_slot_time: Whether the use of short slot time is allowed
 *      (0 = no, 1 = yes, -1 = do not change)
+ * @basic_rates: basic rates in IEEE 802.11 format
+ *      (or NULL for no change)
+ * @basic_rates_len: number of basic rates
 */
 struct bss_parameters {
        int use_cts_prot;
        int use_short_preamble;
        int use_short_slot_time;
+        u8 *basic_rates;
+        u8 basic_rates_len;
 };
 /**
@@ -331,22 +336,59 @@ struct ieee80211_regdomain {
        struct ieee80211_reg_rule reg_rules[];
 };
-#define MHZ_TO_KHZ(freq) (freq * 1000)
+#define MHZ_TO_KHZ(freq) ((freq) * 1000)
-#define KHZ_TO_MHZ(freq) (freq / 1000)
+#define KHZ_TO_MHZ(freq) ((freq) / 1000)
-#define DBI_TO_MBI(gain) (gain * 100)
+#define DBI_TO_MBI(gain) ((gain) * 100)
-#define MBI_TO_DBI(gain) (gain / 100)
+#define MBI_TO_DBI(gain) ((gain) / 100)
-#define DBM_TO_MBM(gain) (gain * 100)
+#define DBM_TO_MBM(gain) ((gain) * 100)
-#define MBM_TO_DBM(gain) (gain / 100)
+#define MBM_TO_DBM(gain) ((gain) / 100)
 #define REG_RULE(start, end, bw, gain, eirp, reg_flags) { \
-        .freq_range.start_freq_khz = (start) * 1000, \
+        .freq_range.start_freq_khz = MHZ_TO_KHZ(start), \
-        .freq_range.end_freq_khz = (end) * 1000, \
+        .freq_range.end_freq_khz = MHZ_TO_KHZ(end), \
-        .freq_range.max_bandwidth_khz = (bw) * 1000, \
+        .freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw), \
-        .power_rule.max_antenna_gain = (gain) * 100, \
+        .power_rule.max_antenna_gain = DBI_TO_MBI(gain), \
-        .power_rule.max_eirp = (eirp) * 100, \
+        .power_rule.max_eirp = DBM_TO_MBM(eirp), \
        .flags = reg_flags, \
        }
+struct mesh_config {
+        /* Timeouts in ms */
+        /* Mesh plink management parameters */
+        u16 dot11MeshRetryTimeout;
+        u16 dot11MeshConfirmTimeout;
+        u16 dot11MeshHoldingTimeout;
+        u16 dot11MeshMaxPeerLinks;
+        u8  dot11MeshMaxRetries;
+        u8  dot11MeshTTL;
+        bool auto_open_plinks;
+        /* HWMP parameters */
+        u8  dot11MeshHWMPmaxPREQretries;
+        u32 path_refresh_time;
+        u16 min_discovery_timeout;
+        u32 dot11MeshHWMPactivePathTimeout;
+        u16 dot11MeshHWMPpreqMinInterval;
+        u16 dot11MeshHWMPnetDiameterTraversalTime;
+};
+/**
+ * struct ieee80211_txq_params - TX queue parameters
+ * @queue: TX queue identifier (NL80211_TXQ_Q_*)
+ * @txop: Maximum burst time in units of 32 usecs, 0 meaning disabled
+ * @cwmin: Minimum contention window [a value of the form 2^n-1 in the range
+ *      1..32767]
+ * @cwmax: Maximum contention window [a value of the form 2^n-1 in the range
+ *      1..32767]
+ * @aifs: Arbitration interframe space [0..255]
+ */
+struct ieee80211_txq_params {
+        enum nl80211_txq_q queue;
+        u16 txop;
+        u16 cwmin;
+        u16 cwmax;
+        u8 aifs;
+};
 /* from net/wireless.h */
 struct wiphy;
@@ -397,9 +439,17 @@ struct wiphy;
 *
 * @change_station: Modify a given station.
 *
+ * @get_mesh_params: Put the current mesh parameters into *params
+ *
+ * @set_mesh_params: Set mesh parameters.
+ *      The mask is a bitfield which tells us which parameters to
+ *      set, and which to leave alone.
+ *
 * @set_mesh_cfg: set mesh parameters (by now, just mesh id)
 *
 * @change_bss: Modify parameters for a given BSS.
+ *
+ * @set_txq_params: Set TX queue parameters
 */
 struct cfg80211_ops {
        int     (*add_virtual_intf)(struct wiphy *wiphy, char *name,
@@ -452,9 +502,17 @@ struct cfg80211_ops {
        int     (*dump_mpath)(struct wiphy *wiphy, struct net_device *dev,
                               int idx, u8 *dst, u8 *next_hop,
                               struct mpath_info *pinfo);
+        int     (*get_mesh_params)(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                struct mesh_config *conf);
+        int     (*set_mesh_params)(struct wiphy *wiphy,
+                                struct net_device *dev,
+                                const struct mesh_config *nconf, u32 mask);
        int     (*change_bss)(struct wiphy *wiphy, struct net_device *dev,
                              struct bss_parameters *params);
+        int     (*set_txq_params)(struct wiphy *wiphy,
+                                  struct ieee80211_txq_params *params);
 };
 #endif /* __NET_CFG80211_H */
diff --git a/include/net/checksum.h b/include/net/checksum.h
index 07602b7fa218..ba55d8b8c87c 100644
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -98,7 +98,7 @@ static inline void csum_replace4(__sum16 *sum, __be32 from, __be32 to)
 {
        __be32 diff[] = { ~from, to };
-        *sum = csum_fold(csum_partial((char *)diff, sizeof(diff), ~csum_unfold(*sum)));
+        *sum = csum_fold(csum_partial(diff, sizeof(diff), ~csum_unfold(*sum)));
 }
 static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to)
diff --git a/include/net/dst.h b/include/net/dst.h
index 8a8b71e5f3f1..6c778799bf10 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -59,8 +59,11 @@ struct dst_entry
        struct neighbour        *neighbour;
        struct hh_cache         *hh;
+#ifdef CONFIG_XFRM
        struct xfrm_state       *xfrm;
+#else
+        void                    *__pad1;
+#endif
        int                     (*input)(struct sk_buff*);
        int                     (*output)(struct sk_buff*);
@@ -70,8 +73,20 @@ struct dst_entry
 #ifdef CONFIG_NET_CLS_ROUTE
        __u32                   tclassid;
+#else
+        __u32                   __pad2;
 #endif
+        /*
+         * Align __refcnt to a 64 bytes alignment
+         * (L1_CACHE_SIZE would be too much)
+         */
+#ifdef CONFIG_64BIT
+        long                    __pad_to_align_refcnt[2];
+#else
+        long                    __pad_to_align_refcnt[1];
+#endif
        /*
         * __refcnt wants to be on a different cache line from
         * input/output/ops or performance tanks badly
@@ -103,7 +118,6 @@ struct dst_ops
        void                    (*link_failure)(struct sk_buff *);
        void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
        int                     (*local_out)(struct sk_buff *skb);
-        int                     entry_size;
        atomic_t                entries;
        struct kmem_cache               *kmem_cachep;
@@ -157,6 +171,11 @@ dst_metric_locked(struct dst_entry *dst, int metric)
 static inline void dst_hold(struct dst_entry * dst)
 {
+        /*
+         * If your kernel compilation stops here, please check
+         * __pad_to_align_refcnt declaration in struct dst_entry
+         */
+        BUILD_BUG_ON(offsetof(struct dst_entry, __refcnt) & 63);
        atomic_inc(&dst->__refcnt);
 }
diff --git a/include/net/ieee80211.h b/include/net/ieee80211.h
index 93a56de3594b..738734a4653b 100644
--- a/include/net/ieee80211.h
+++ b/include/net/ieee80211.h
@@ -28,6 +28,7 @@
 #include <linux/if_ether.h>     /* ETH_ALEN */
 #include <linux/kernel.h>       /* ARRAY_SIZE */
 #include <linux/wireless.h>
+#include <linux/ieee80211.h>
 #define IEEE80211_VERSION "git-1.1.13"
@@ -127,10 +128,6 @@ static inline bool ieee80211_ratelimit_debug(u32 level)
 }
 #endif                          /* CONFIG_IEEE80211_DEBUG */
-/* escape_essid() is intended to be used in debug (and possibly error)
- * messages. It should never be used for passing essid to user space. */
-const char *escape_essid(const char *essid, u8 essid_len);
 /*
 * To use the debug system:
 *
@@ -218,94 +215,6 @@ struct ieee80211_snap_hdr {
 #define WLAN_GET_SEQ_FRAG(seq) ((seq) & IEEE80211_SCTL_FRAG)
 #define WLAN_GET_SEQ_SEQ(seq)  (((seq) & IEEE80211_SCTL_SEQ) >> 4)
-/* Authentication algorithms */
-#define WLAN_AUTH_OPEN 0
-#define WLAN_AUTH_SHARED_KEY 1
-#define WLAN_AUTH_LEAP 2
-#define WLAN_AUTH_CHALLENGE_LEN 128
-#define WLAN_CAPABILITY_ESS (1<<0)
-#define WLAN_CAPABILITY_IBSS (1<<1)
-#define WLAN_CAPABILITY_CF_POLLABLE (1<<2)
-#define WLAN_CAPABILITY_CF_POLL_REQUEST (1<<3)
-#define WLAN_CAPABILITY_PRIVACY (1<<4)
-#define WLAN_CAPABILITY_SHORT_PREAMBLE (1<<5)
-#define WLAN_CAPABILITY_PBCC (1<<6)
-#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)
-#define WLAN_CAPABILITY_SPECTRUM_MGMT (1<<8)
-#define WLAN_CAPABILITY_QOS (1<<9)
-#define WLAN_CAPABILITY_SHORT_SLOT_TIME (1<<10)
-#define WLAN_CAPABILITY_DSSS_OFDM (1<<13)
-/* 802.11g ERP information element */
-#define WLAN_ERP_NON_ERP_PRESENT (1<<0)
-#define WLAN_ERP_USE_PROTECTION (1<<1)
-#define WLAN_ERP_BARKER_PREAMBLE (1<<2)
-/* Status codes */
-enum ieee80211_statuscode {
-        WLAN_STATUS_SUCCESS = 0,
-        WLAN_STATUS_UNSPECIFIED_FAILURE = 1,
-        WLAN_STATUS_CAPS_UNSUPPORTED = 10,
-        WLAN_STATUS_REASSOC_NO_ASSOC = 11,
-        WLAN_STATUS_ASSOC_DENIED_UNSPEC = 12,
-        WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG = 13,
-        WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION = 14,
-        WLAN_STATUS_CHALLENGE_FAIL = 15,
-        WLAN_STATUS_AUTH_TIMEOUT = 16,
-        WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA = 17,
-        WLAN_STATUS_ASSOC_DENIED_RATES = 18,
-        /* 802.11b */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTPREAMBLE = 19,
-        WLAN_STATUS_ASSOC_DENIED_NOPBCC = 20,
-        WLAN_STATUS_ASSOC_DENIED_NOAGILITY = 21,
-        /* 802.11h */
-        WLAN_STATUS_ASSOC_DENIED_NOSPECTRUM = 22,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_POWER = 23,
-        WLAN_STATUS_ASSOC_REJECTED_BAD_SUPP_CHAN = 24,
-        /* 802.11g */
-        WLAN_STATUS_ASSOC_DENIED_NOSHORTTIME = 25,
-        WLAN_STATUS_ASSOC_DENIED_NODSSSOFDM = 26,
-        /* 802.11i */
-        WLAN_STATUS_INVALID_IE = 40,
-        WLAN_STATUS_INVALID_GROUP_CIPHER = 41,
-        WLAN_STATUS_INVALID_PAIRWISE_CIPHER = 42,
-        WLAN_STATUS_INVALID_AKMP = 43,
-        WLAN_STATUS_UNSUPP_RSN_VERSION = 44,
-        WLAN_STATUS_INVALID_RSN_IE_CAP = 45,
-        WLAN_STATUS_CIPHER_SUITE_REJECTED = 46,
-};
-/* Reason codes */
-enum ieee80211_reasoncode {
-        WLAN_REASON_UNSPECIFIED = 1,
-        WLAN_REASON_PREV_AUTH_NOT_VALID = 2,
-        WLAN_REASON_DEAUTH_LEAVING = 3,
-        WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY = 4,
-        WLAN_REASON_DISASSOC_AP_BUSY = 5,
-        WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA = 6,
-        WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA = 7,
-        WLAN_REASON_DISASSOC_STA_HAS_LEFT = 8,
-        WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH = 9,
-        /* 802.11h */
-        WLAN_REASON_DISASSOC_BAD_POWER = 10,
-        WLAN_REASON_DISASSOC_BAD_SUPP_CHAN = 11,
-        /* 802.11i */
-        WLAN_REASON_INVALID_IE = 13,
-        WLAN_REASON_MIC_FAILURE = 14,
-        WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT = 15,
-        WLAN_REASON_GROUP_KEY_HANDSHAKE_TIMEOUT = 16,
-        WLAN_REASON_IE_DIFFERENT = 17,
-        WLAN_REASON_INVALID_GROUP_CIPHER = 18,
-        WLAN_REASON_INVALID_PAIRWISE_CIPHER = 19,
-        WLAN_REASON_INVALID_AKMP = 20,
-        WLAN_REASON_UNSUPP_RSN_VERSION = 21,
-        WLAN_REASON_INVALID_RSN_IE_CAP = 22,
-        WLAN_REASON_IEEE8021X_FAILED = 23,
-        WLAN_REASON_CIPHER_SUITE_REJECTED = 24,
-};
 /* Action categories - 802.11h */
 enum ieee80211_actioncategories {
        WLAN_ACTION_SPECTRUM_MGMT = 0,
@@ -534,15 +443,6 @@ enum ieee80211_mfie {
        MFIE_TYPE_QOS_PARAMETER = 222,
 };
-/* Minimal header; can be used for passing 802.11 frames with sufficient
- * information to determine what type of underlying data type is actually
- * stored in the data. */
-struct ieee80211_hdr {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 payload[0];
-} __attribute__ ((packed));
 struct ieee80211_hdr_1addr {
        __le16 frame_ctl;
        __le16 duration_id;
@@ -590,18 +490,6 @@ struct ieee80211_hdr_3addrqos {
        __le16 qos_ctl;
 } __attribute__ ((packed));
-struct ieee80211_hdr_4addrqos {
-        __le16 frame_ctl;
-        __le16 duration_id;
-        u8 addr1[ETH_ALEN];
-        u8 addr2[ETH_ALEN];
-        u8 addr3[ETH_ALEN];
-        __le16 seq_ctl;
-        u8 addr4[ETH_ALEN];
-        u8 payload[0];
-        __le16 qos_ctl;
-} __attribute__ ((packed));
 struct ieee80211_info_element {
        u8 id;
        u8 len;
@@ -733,7 +621,6 @@ struct ieee80211_txb {
 #define MAX_WPA_IE_LEN 64
-#define NETWORK_EMPTY_ESSID    (1<<0)
 #define NETWORK_HAS_OFDM       (1<<1)
 #define NETWORK_HAS_CCK        (1<<2)
@@ -1135,22 +1022,6 @@ static inline void *ieee80211_priv(struct net_device *dev)
        return ((struct ieee80211_device *)netdev_priv(dev))->priv;
 }
-static inline int ieee80211_is_empty_essid(const char *essid, int essid_len)
-{
-        /* Single white space is for Linksys APs */
-        if (essid_len == 1 && essid[0] == ' ')
-                return 1;
-        /* Otherwise, if the entire essid is 0, we assume it is hidden */
-        while (essid_len) {
-                essid_len--;
-                if (essid[essid_len] != '\0')
-                        return 0;
-        }
-        return 1;
-}
 static inline int ieee80211_is_valid_mode(struct ieee80211_device *ieee,
                                          int mode)
 {
@@ -1208,7 +1079,7 @@ static inline int ieee80211_get_hdrlen(u16 fc)
 static inline u8 *ieee80211_get_payload(struct ieee80211_hdr *hdr)
 {
-        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl))) {
+        switch (ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_control))) {
        case IEEE80211_1ADDR_LEN:
                return ((struct ieee80211_hdr_1addr *)hdr)->payload;
        case IEEE80211_2ADDR_LEN:
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 5cc182f9ecae..62d2dd0d7860 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -41,8 +41,8 @@
 * I'll experiment with dynamic table growth later.
 */
 struct inet_ehash_bucket {
-        struct hlist_head chain;
+        struct hlist_nulls_head chain;
-        struct hlist_head twchain;
+        struct hlist_nulls_head twchain;
 };
 /* There are a few simple rules, which allow for local port reuse by
@@ -77,13 +77,20 @@ struct inet_ehash_bucket {
 * ports are created in O(1) time?  I thought so. ;-)   -DaveM
 */
 struct inet_bind_bucket {
+#ifdef CONFIG_NET_NS
        struct net              *ib_net;
+#endif
        unsigned short          port;
        signed short            fastreuse;
        struct hlist_node       node;
        struct hlist_head       owners;
 };
+static inline struct net *ib_net(struct inet_bind_bucket *ib)
+{
+        return read_pnet(&ib->ib_net);
+}
 #define inet_bind_bucket_for_each(tb, node, head) \
        hlist_for_each_entry(tb, node, head, node)
@@ -92,6 +99,11 @@ struct inet_bind_hashbucket {
        struct hlist_head       chain;
 };
+struct inet_listen_hashbucket {
+        spinlock_t              lock;
+        struct hlist_head       head;
+};
 /* This is for listening sockets, thus all sockets which possess wildcards. */
 #define INET_LHTABLE_SIZE       32      /* Yes, really, this is all you need. */
@@ -116,22 +128,21 @@ struct inet_hashinfo {
        unsigned int                    bhash_size;
        /* Note : 4 bytes padding on 64 bit arches */
-        /* All sockets in TCP_LISTEN state will be in here.  This is the only
+        struct kmem_cache               *bind_bucket_cachep;
-         * table where wildcard'd TCP sockets can exist.  Hash function here
-         * is just local port number.
-         */
-        struct hlist_head               listening_hash[INET_LHTABLE_SIZE];
        /* All the above members are written once at bootup and
         * never written again _or_ are predominantly read-access.
         *
         * Now align to a new cache line as all the following members
-         * are often dirty.
+         * might be often dirty.
+         */
+        /* All sockets in TCP_LISTEN state will be in here.  This is the only
+         * table where wildcard'd TCP sockets can exist.  Hash function here
+         * is just local port number.
         */
-        rwlock_t                        lhash_lock ____cacheline_aligned;
+        struct inet_listen_hashbucket   listening_hash[INET_LHTABLE_SIZE]
-        atomic_t                        lhash_users;
+                                        ____cacheline_aligned_in_smp;
-        wait_queue_head_t               lhash_wait;
-        struct kmem_cache                       *bind_bucket_cachep;
 };
 static inline struct inet_ehash_bucket *inet_ehash_bucket(
@@ -229,26 +240,7 @@ extern void __inet_inherit_port(struct sock *sk, struct sock *child);
 extern void inet_put_port(struct sock *sk);
-extern void inet_listen_wlock(struct inet_hashinfo *hashinfo);
+void inet_hashinfo_init(struct inet_hashinfo *h);
-/*
- * - We may sleep inside this lock.
- * - If sleeping is not required (or called from BH),
- *   use plain read_(un)lock(&inet_hashinfo.lhash_lock).
- */
-static inline void inet_listen_lock(struct inet_hashinfo *hashinfo)
-{
-        /* read_lock synchronizes to candidates to writers */
-        read_lock(&hashinfo->lhash_lock);
-        atomic_inc(&hashinfo->lhash_users);
-        read_unlock(&hashinfo->lhash_lock);
-}
-static inline void inet_listen_unlock(struct inet_hashinfo *hashinfo)
-{
-        if (atomic_dec_and_test(&hashinfo->lhash_users))
-                wake_up(&hashinfo->lhash_wait);
-}
 extern void __inet_hash_nolisten(struct sock *sk);
 extern void inet_hash(struct sock *sk);
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 80e4977631b8..4b8ece22b8e9 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -110,7 +110,7 @@ struct inet_timewait_sock {
 #define tw_state                __tw_common.skc_state
 #define tw_reuse                __tw_common.skc_reuse
 #define tw_bound_dev_if         __tw_common.skc_bound_dev_if
-#define tw_node                 __tw_common.skc_node
+#define tw_node                 __tw_common.skc_nulls_node
 #define tw_bind_node            __tw_common.skc_bind_node
 #define tw_refcnt               __tw_common.skc_refcnt
 #define tw_hash                 __tw_common.skc_hash
@@ -137,10 +137,10 @@ struct inet_timewait_sock {
        struct hlist_node       tw_death_node;
 };
-static inline void inet_twsk_add_node(struct inet_timewait_sock *tw,
+static inline void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
-                                      struct hlist_head *list)
+                                      struct hlist_nulls_head *list)
 {
-        hlist_add_head(&tw->tw_node, list);
+        hlist_nulls_add_head_rcu(&tw->tw_node, list);
 }
 static inline void inet_twsk_add_bind_node(struct inet_timewait_sock *tw,
@@ -175,7 +175,7 @@ static inline int inet_twsk_del_dead_node(struct inet_timewait_sock *tw)
 }
 #define inet_twsk_for_each(tw, node, head) \
-        hlist_for_each_entry(tw, node, head, tw_node)
+        hlist_nulls_for_each_entry(tw, node, head, tw_node)
 #define inet_twsk_for_each_inmate(tw, node, jail) \
        hlist_for_each_entry(tw, node, jail, tw_death_node)
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index fe9fcf73c85e..ab9b003ab671 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -87,12 +87,12 @@ static inline const char *ip_vs_dbg_addr(int af, char *buf, size_t buf_len,
        int len;
 #ifdef CONFIG_IP_VS_IPV6
        if (af == AF_INET6)
-                len = snprintf(&buf[*idx], buf_len - *idx, "[" NIP6_FMT "]",
+                len = snprintf(&buf[*idx], buf_len - *idx, "[%pI6]",
-                               NIP6(addr->in6)) + 1;
+                               &addr->in6) + 1;
        else
 #endif
-                len = snprintf(&buf[*idx], buf_len - *idx, NIPQUAD_FMT,
+                len = snprintf(&buf[*idx], buf_len - *idx, "%pI4",
-                               NIPQUAD(addr->ip)) + 1;
+                               &addr->ip) + 1;
        *idx += len;
        BUG_ON(*idx > buf_len + 1);
@@ -503,9 +503,6 @@ struct ip_vs_scheduler {
        char                    *name;          /* scheduler name */
        atomic_t                refcnt;         /* reference counter */
        struct module           *module;        /* THIS_MODULE/NULL */
-#ifdef CONFIG_IP_VS_IPV6
-        int                     supports_ipv6;  /* scheduler has IPv6 support */
-#endif
        /* scheduler initializing service */
        int (*init_service)(struct ip_vs_service *svc);
@@ -916,7 +913,7 @@ static inline __wsum ip_vs_check_diff4(__be32 old, __be32 new, __wsum oldsum)
 {
        __be32 diff[2] = { ~old, new };
-        return csum_partial((char *) diff, sizeof(diff), oldsum);
+        return csum_partial(diff, sizeof(diff), oldsum);
 }
 #ifdef CONFIG_IP_VS_IPV6
@@ -926,7 +923,7 @@ static inline __wsum ip_vs_check_diff16(const __be32 *old, const __be32 *new,
        __be32 diff[8] = { ~old[3], ~old[2], ~old[1], ~old[0],
                            new[3],  new[2],  new[1],  new[0] };
-        return csum_partial((char *) diff, sizeof(diff), oldsum);
+        return csum_partial(diff, sizeof(diff), oldsum);
 }
 #endif
@@ -934,7 +931,7 @@ static inline __wsum ip_vs_check_diff2(__be16 old, __be16 new, __wsum oldsum)
 {
        __be16 diff[2] = { ~old, new };
-        return csum_partial((char *) diff, sizeof(diff), oldsum);
+        return csum_partial(diff, sizeof(diff), oldsum);
 }
 #endif /* __KERNEL__ */
diff --git a/include/net/lib80211.h b/include/net/lib80211.h
new file mode 100644
index 000000000000..e1558a187ac0
--- /dev/null
+++ b/include/net/lib80211.h
@@ -0,0 +1,18 @@
+/*
+ * lib80211.h -- common bits for IEEE802.11 wireless drivers
+ *
+ * Copyright (c) 2008, John W. Linville <linville@tuxdriver.com>
+ *
+ */
+#ifndef LIB80211_H
+#define LIB80211_H
+#include <linux/ieee80211.h>
+/* print_ssid() is intended to be used in debug (and possibly error)
+ * messages. It should never be used for passing ssid to user space. */
+const char *print_ssid(char *buf, const char *ssid, u8 ssid_len);
+#define DECLARE_SSID_BUF(var) char var[IEEE80211_MAX_SSID_LEN * 4 + 1] __maybe_unused
+#endif /* LIB80211_H */
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 73d81bc6aa75..1b8ed421feaa 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -3,7 +3,7 @@
 *
 * Copyright 2002-2005, Devicescape Software, Inc.
 * Copyright 2006-2007  Jiri Benc <jbenc@suse.cz>
- * Copyright 2007       Johannes Berg <johannes@sipsolutions.net>
+ * Copyright 2007-2008  Johannes Berg <johannes@sipsolutions.net>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
@@ -107,7 +107,7 @@ enum ieee80211_max_queues {
 * The information provided in this structure is required for QoS
 * transmit queue configuration. Cf. IEEE 802.11 7.3.2.29.
 *
- * @aifs: arbitration interface space [0..255]
+ * @aifs: arbitration interframe space [0..255]
 * @cw_min: minimum contention window [a value of the form
 *      2^n-1 in the range 1..32767]
 * @cw_max: maximum contention window [like @cw_min]
@@ -164,6 +164,19 @@ enum ieee80211_bss_change {
 };
 /**
+ * struct ieee80211_bss_ht_conf - BSS's changing HT configuration
+ * @secondary_channel_offset: secondary channel offset, uses
+ *      %IEEE80211_HT_PARAM_CHA_SEC_ values
+ * @width_40_ok: indicates that 40 MHz bandwidth may be used for TX
+ * @operation_mode: HT operation mode (like in &struct ieee80211_ht_info)
+ */
+struct ieee80211_bss_ht_conf {
+        u8 secondary_channel_offset;
+        bool width_40_ok;
+        u16 operation_mode;
+};
+/**
 * struct ieee80211_bss_conf - holds the BSS's changing parameters
 *
 * This structure keeps information about a BSS (and an association
@@ -172,15 +185,17 @@ enum ieee80211_bss_change {
 * @assoc: association status
 * @aid: association ID number, valid only when @assoc is true
 * @use_cts_prot: use CTS protection
- * @use_short_preamble: use 802.11b short preamble
+ * @use_short_preamble: use 802.11b short preamble;
- * @use_short_slot: use short slot time (only relevant for ERP)
+ *      if the hardware cannot handle this it must set the
+ *      IEEE80211_HW_2GHZ_SHORT_PREAMBLE_INCAPABLE hardware flag
+ * @use_short_slot: use short slot time (only relevant for ERP);
+ *      if the hardware cannot handle this it must set the
+ *      IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE hardware flag
 * @dtim_period: num of beacons before the next DTIM, for PSM
 * @timestamp: beacon timestamp
 * @beacon_int: beacon interval
 * @assoc_capability: capabilities taken from assoc resp
- * @assoc_ht: association in HT mode
+ * @ht: BSS's HT configuration
- * @ht_conf: ht capabilities
- * @ht_bss_conf: ht extended capabilities
 * @basic_rates: bitmap of basic rates, each bit stands for an
 *      index into the rate table configured by the driver in
 *      the current band.
@@ -198,10 +213,7 @@ struct ieee80211_bss_conf {
        u16 assoc_capability;
        u64 timestamp;
        u64 basic_rates;
-        /* ht related data */
+        struct ieee80211_bss_ht_conf ht;
-        bool assoc_ht;
-        struct ieee80211_ht_info *ht_conf;
-        struct ieee80211_ht_bss_info *ht_bss_conf;
 };
 /**
@@ -210,29 +222,24 @@ struct ieee80211_bss_conf {
 * These flags are used with the @flags member of &ieee80211_tx_info.
 *
 * @IEEE80211_TX_CTL_REQ_TX_STATUS: request TX status callback for this frame.
- * @IEEE80211_TX_CTL_USE_RTS_CTS: use RTS-CTS before sending frame
+ * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
- * @IEEE80211_TX_CTL_USE_CTS_PROTECT: use CTS protection for the frame (e.g.,
+ *      number to this frame, taking care of not overwriting the fragment
- *      for combined 802.11g / 802.11b networks)
+ *      number and increasing the sequence number only when the
+ *      IEEE80211_TX_CTL_FIRST_FRAGMENT flag is set. mac80211 will properly
+ *      assign sequence numbers to QoS-data frames but cannot do so correctly
+ *      for non-QoS-data and management frames because beacons need them from
+ *      that counter as well and mac80211 cannot guarantee proper sequencing.
+ *      If this flag is set, the driver should instruct the hardware to
+ *      assign a sequence number to the frame or assign one itself. Cf. IEEE
+ *      802.11-2007 7.1.3.4.1 paragraph 3. This flag will always be set for
+ *      beacons and always be clear for frames without a sequence number field.
 * @IEEE80211_TX_CTL_NO_ACK: tell the low level not to wait for an ack
- * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: TBD
 * @IEEE80211_TX_CTL_CLEAR_PS_FILT: clear powersave filter for destination
 *      station
- * @IEEE80211_TX_CTL_REQUEUE: TBD
 * @IEEE80211_TX_CTL_FIRST_FRAGMENT: this is a first fragment of the frame
- * @IEEE80211_TX_CTL_SHORT_PREAMBLE: TBD
- * @IEEE80211_TX_CTL_LONG_RETRY_LIMIT: this frame should be send using the
- *      through set_retry_limit configured long retry value
 * @IEEE80211_TX_CTL_SEND_AFTER_DTIM: send this frame after DTIM beacon
 * @IEEE80211_TX_CTL_AMPDU: this frame should be sent as part of an A-MPDU
- * @IEEE80211_TX_CTL_OFDM_HT: this frame can be sent in HT OFDM rates. number
+ * @IEEE80211_TX_CTL_INJECTED: Frame was injected, internal to mac80211.
- *      of streams when this flag is on can be extracted from antenna_sel_tx,
- *      so if 1 antenna is marked use SISO, 2 antennas marked use MIMO, n
- *      antennas marked use MIMO_n.
- * @IEEE80211_TX_CTL_GREEN_FIELD: use green field protection for this frame
- * @IEEE80211_TX_CTL_40_MHZ_WIDTH: send this frame using 40 Mhz channel width
- * @IEEE80211_TX_CTL_DUP_DATA: duplicate data frame on both 20 Mhz channels
- * @IEEE80211_TX_CTL_SHORT_GI: send this frame using short guard interval
- * @IEEE80211_TX_CTL_INJECTED: TBD
 * @IEEE80211_TX_STAT_TX_FILTERED: The frame was not transmitted
 *      because the destination STA was in powersave mode.
 * @IEEE80211_TX_STAT_ACK: Frame was acknowledged
@@ -240,62 +247,66 @@ struct ieee80211_bss_conf {
 *      is for the whole aggregation.
 * @IEEE80211_TX_STAT_AMPDU_NO_BACK: no block ack was returned,
 *      so consider using block ack request (BAR).
- * @IEEE80211_TX_CTL_ASSIGN_SEQ: The driver has to assign a sequence
+ * @IEEE80211_TX_CTL_RATE_CTRL_PROBE: internal to mac80211, can be
- *      number to this frame, taking care of not overwriting the fragment
+ *      set by rate control algorithms to indicate probe rate, will
- *      number and increasing the sequence number only when the
+ *      be cleared for fragmented frames (except on the last fragment)
- *      IEEE80211_TX_CTL_FIRST_FRAGMENT flags is set. mac80211 will properly
- *      assign sequence numbers to QoS-data frames but cannot do so correctly
- *      for non-QoS-data and management frames because beacons need them from
- *      that counter as well and mac80211 cannot guarantee proper sequencing.
- *      If this flag is set, the driver should instruct the hardware to
- *      assign a sequence number to the frame or assign one itself. Cf. IEEE
- *      802.11-2007 7.1.3.4.1 paragraph 3. This flag will always be set for
- *      beacons always be clear for frames without a sequence number field.
 */
 enum mac80211_tx_control_flags {
        IEEE80211_TX_CTL_REQ_TX_STATUS          = BIT(0),
-        IEEE80211_TX_CTL_USE_RTS_CTS            = BIT(2),
+        IEEE80211_TX_CTL_ASSIGN_SEQ             = BIT(1),
-        IEEE80211_TX_CTL_USE_CTS_PROTECT        = BIT(3),
+        IEEE80211_TX_CTL_NO_ACK                 = BIT(2),
-        IEEE80211_TX_CTL_NO_ACK                 = BIT(4),
+        IEEE80211_TX_CTL_CLEAR_PS_FILT          = BIT(3),
-        IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(5),
+        IEEE80211_TX_CTL_FIRST_FRAGMENT         = BIT(4),
-        IEEE80211_TX_CTL_CLEAR_PS_FILT          = BIT(6),
+        IEEE80211_TX_CTL_SEND_AFTER_DTIM        = BIT(5),
-        IEEE80211_TX_CTL_REQUEUE                = BIT(7),
+        IEEE80211_TX_CTL_AMPDU                  = BIT(6),
-        IEEE80211_TX_CTL_FIRST_FRAGMENT         = BIT(8),
+        IEEE80211_TX_CTL_INJECTED               = BIT(7),
-        IEEE80211_TX_CTL_SHORT_PREAMBLE         = BIT(9),
+        IEEE80211_TX_STAT_TX_FILTERED           = BIT(8),
-        IEEE80211_TX_CTL_LONG_RETRY_LIMIT       = BIT(10),
+        IEEE80211_TX_STAT_ACK                   = BIT(9),
-        IEEE80211_TX_CTL_SEND_AFTER_DTIM        = BIT(12),
+        IEEE80211_TX_STAT_AMPDU                 = BIT(10),
-        IEEE80211_TX_CTL_AMPDU                  = BIT(13),
+        IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(11),
-        IEEE80211_TX_CTL_OFDM_HT                = BIT(14),
+        IEEE80211_TX_CTL_RATE_CTRL_PROBE        = BIT(12),
-        IEEE80211_TX_CTL_GREEN_FIELD            = BIT(15),
+};
-        IEEE80211_TX_CTL_40_MHZ_WIDTH           = BIT(16),
-        IEEE80211_TX_CTL_DUP_DATA               = BIT(17),
+enum mac80211_rate_control_flags {
-        IEEE80211_TX_CTL_SHORT_GI               = BIT(18),
+        IEEE80211_TX_RC_USE_RTS_CTS             = BIT(0),
-        IEEE80211_TX_CTL_INJECTED               = BIT(19),
+        IEEE80211_TX_RC_USE_CTS_PROTECT         = BIT(1),
-        IEEE80211_TX_STAT_TX_FILTERED           = BIT(20),
+        IEEE80211_TX_RC_USE_SHORT_PREAMBLE      = BIT(2),
-        IEEE80211_TX_STAT_ACK                   = BIT(21),
-        IEEE80211_TX_STAT_AMPDU                 = BIT(22),
+        /* rate index is an MCS rate number instead of an index */
-        IEEE80211_TX_STAT_AMPDU_NO_BACK         = BIT(23),
+        IEEE80211_TX_RC_MCS                     = BIT(3),
-        IEEE80211_TX_CTL_ASSIGN_SEQ             = BIT(24),
+        IEEE80211_TX_RC_GREEN_FIELD             = BIT(4),
+        IEEE80211_TX_RC_40_MHZ_WIDTH            = BIT(5),
+        IEEE80211_TX_RC_DUP_DATA                = BIT(6),
+        IEEE80211_TX_RC_SHORT_GI                = BIT(7),
 };
-#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE \
+/* there are 40 bytes if you don't need the rateset to be kept */
-        (sizeof(((struct sk_buff *)0)->cb) - 8)
+#define IEEE80211_TX_INFO_DRIVER_DATA_SIZE 40
-#define IEEE80211_TX_INFO_DRIVER_DATA_PTRS \
-        (IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *))
-/* maximum number of alternate rate retry stages */
+/* if you do need the rateset, then you have less space */
-#define IEEE80211_TX_MAX_ALTRATE        3
+#define IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE 24
+/* maximum number of rate stages */
+#define IEEE80211_TX_MAX_RATES  5
 /**
- * struct ieee80211_tx_altrate - alternate rate selection/status
+ * struct ieee80211_tx_rate - rate selection/status
+ *
+ * @idx: rate index to attempt to send with
+ * @flags: rate control flags (&enum mac80211_rate_control_flags)
+ * @count: number of tries in this rate before going to the next rate
 *
- * @rate_idx: rate index to attempt to send with
+ * A value of -1 for @idx indicates an invalid rate and, if used
- * @limit: number of retries before fallback
+ * in an array of retry rates, that no more rates should be tried.
+ *
+ * When used for transmit status reporting, the driver should
+ * always report the rate along with the flags it used.
 */
-struct ieee80211_tx_altrate {
+struct ieee80211_tx_rate {
-        s8 rate_idx;
+        s8 idx;
-        u8 limit;
+        u8 count;
+        u8 flags;
 };
 /**
@@ -310,15 +321,12 @@ struct ieee80211_tx_altrate {
 * it may be NULL.
 *
 * @flags: transmit info flags, defined above
- * @band: TBD
+ * @band: the band to transmit on (use for checking for races)
- * @tx_rate_idx: TBD
+ * @antenna_sel_tx: antenna to use, 0 for automatic diversity
- * @antenna_sel_tx: TBD
 * @control: union for control data
 * @status: union for status data
 * @driver_data: array of driver_data pointers
 * @retry_count: number of retries
- * @excessive_retries: set to 1 if the frame was retried many times
- *      but not acknowledged
 * @ampdu_ack_len: number of aggregated frames.
 *      relevant only if IEEE80211_TX_STATUS_AMPDU was set.
 * @ampdu_ack_map: block ack bit map for the aggregation.
@@ -329,31 +337,43 @@ struct ieee80211_tx_info {
        /* common information */
        u32 flags;
        u8 band;
-        s8 tx_rate_idx;
        u8 antenna_sel_tx;
-        /* 1 byte hole */
+        /* 2 byte hole */
        union {
                struct {
+                        union {
+                                /* rate control */
+                                struct {
+                                        struct ieee80211_tx_rate rates[
+                                                IEEE80211_TX_MAX_RATES];
+                                        s8 rts_cts_rate_idx;
+                                };
+                                /* only needed before rate control */
+                                unsigned long jiffies;
+                        };
                        /* NB: vif can be NULL for injected frames */
                        struct ieee80211_vif *vif;
                        struct ieee80211_key_conf *hw_key;
                        struct ieee80211_sta *sta;
-                        unsigned long jiffies;
-                        s8 rts_cts_rate_idx;
-                        u8 retry_limit;
-                        struct ieee80211_tx_altrate retries[IEEE80211_TX_MAX_ALTRATE];
                } control;
                struct {
+                        struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];
+                        u8 ampdu_ack_len;
                        u64 ampdu_ack_map;
                        int ack_signal;
-                        struct ieee80211_tx_altrate retries[IEEE80211_TX_MAX_ALTRATE + 1];
+                        /* 8 bytes free */
-                        u8 retry_count;
-                        bool excessive_retries;
-                        u8 ampdu_ack_len;
                } status;
-                void *driver_data[IEEE80211_TX_INFO_DRIVER_DATA_PTRS];
+                struct {
+                        struct ieee80211_tx_rate driver_rates[
+                                IEEE80211_TX_MAX_RATES];
+                        void *rate_driver_data[
+                                IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE / sizeof(void *)];
+                };
+                void *driver_data[
+                        IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)];
        };
 };
@@ -362,6 +382,41 @@ static inline struct ieee80211_tx_info *IEEE80211_SKB_CB(struct sk_buff *skb)
        return (struct ieee80211_tx_info *)skb->cb;
 }
+/**
+ * ieee80211_tx_info_clear_status - clear TX status
+ *
+ * @info: The &struct ieee80211_tx_info to be cleared.
+ *
+ * When the driver passes an skb back to mac80211, it must report
+ * a number of things in TX status. This function clears everything
+ * in the TX status but the rate control information (it does clear
+ * the count since you need to fill that in anyway).
+ *
+ * NOTE: You can only use this function if you do NOT use
+ *       info->driver_data! Use info->rate_driver_data
+ *       instead if you need only the less space that allows.
+ */
+static inline void
+ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
+{
+        int i;
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) !=
+                     offsetof(struct ieee80211_tx_info, control.rates));
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) !=
+                     offsetof(struct ieee80211_tx_info, driver_rates));
+        BUILD_BUG_ON(offsetof(struct ieee80211_tx_info, status.rates) != 8);
+        /* clear the rate counts */
+        for (i = 0; i < IEEE80211_TX_MAX_RATES; i++)
+                info->status.rates[i].count = 0;
+        BUILD_BUG_ON(
+            offsetof(struct ieee80211_tx_info, status.ampdu_ack_len) != 23);
+        memset(&info->status.ampdu_ack_len, 0,
+               sizeof(struct ieee80211_tx_info) -
+               offsetof(struct ieee80211_tx_info, status.ampdu_ack_len));
+}
 /**
 * enum mac80211_rx_flags - receive flags
@@ -434,21 +489,48 @@ struct ieee80211_rx_status {
 *
 * Flags to define PHY configuration options
 *
- * @IEEE80211_CONF_SHORT_SLOT_TIME: use 802.11g short slot time
 * @IEEE80211_CONF_RADIOTAP: add radiotap header at receive time (if supported)
- * @IEEE80211_CONF_SUPPORT_HT_MODE: use 802.11n HT capabilities (if supported)
 * @IEEE80211_CONF_PS: Enable 802.11 power save mode
 */
 enum ieee80211_conf_flags {
-        /*
+        IEEE80211_CONF_RADIOTAP         = (1<<0),
-         * TODO: IEEE80211_CONF_SHORT_SLOT_TIME will be removed once drivers
+        IEEE80211_CONF_PS               = (1<<1),
-         * have been converted to use bss_info_changed() for slot time
+};
-         * configuration
-         */
+/* XXX: remove all this once drivers stop trying to use it */
-        IEEE80211_CONF_SHORT_SLOT_TIME  = (1<<0),
+static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
-        IEEE80211_CONF_RADIOTAP         = (1<<1),
+{
-        IEEE80211_CONF_SUPPORT_HT_MODE  = (1<<2),
+        return 0;
-        IEEE80211_CONF_PS               = (1<<3),
+}
+#define IEEE80211_CONF_SHORT_SLOT_TIME (__IEEE80211_CONF_SHORT_SLOT_TIME())
+struct ieee80211_ht_conf {
+        bool enabled;
+};
+/**
+ * enum ieee80211_conf_changed - denotes which configuration changed
+ *
+ * @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed
+ * @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: the beacon interval changed
+ * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
+ * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
+ * @IEEE80211_CONF_CHANGE_PS: the PS flag changed
+ * @IEEE80211_CONF_CHANGE_POWER: the TX power changed
+ * @IEEE80211_CONF_CHANGE_CHANNEL: the channel changed
+ * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
+ * @IEEE80211_CONF_CHANGE_HT: HT configuration changed
+ */
+enum ieee80211_conf_changed {
+        IEEE80211_CONF_CHANGE_RADIO_ENABLED     = BIT(0),
+        IEEE80211_CONF_CHANGE_BEACON_INTERVAL   = BIT(1),
+        IEEE80211_CONF_CHANGE_LISTEN_INTERVAL   = BIT(2),
+        IEEE80211_CONF_CHANGE_RADIOTAP          = BIT(3),
+        IEEE80211_CONF_CHANGE_PS                = BIT(4),
+        IEEE80211_CONF_CHANGE_POWER             = BIT(5),
+        IEEE80211_CONF_CHANGE_CHANNEL           = BIT(6),
+        IEEE80211_CONF_CHANGE_RETRY_LIMITS      = BIT(7),
+        IEEE80211_CONF_CHANGE_HT                = BIT(8),
 };
 /**
@@ -457,34 +539,31 @@ enum ieee80211_conf_flags {
 * This struct indicates how the driver shall configure the hardware.
 *
 * @radio_enabled: when zero, driver is required to switch off the radio.
- *      TODO make a flag
 * @beacon_int: beacon interval (TODO make interface config)
 * @listen_interval: listen interval in units of beacon interval
 * @flags: configuration flags defined above
 * @power_level: requested transmit power (in dBm)
- * @max_antenna_gain: maximum antenna gain (in dBi)
- * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
- *      1/2: antenna 0/1
- * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
- * @ht_conf: describes current self configuration of 802.11n HT capabilies
- * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
 * @channel: the channel to tune to
+ * @ht: the HT configuration for the device
+ * @long_frame_max_tx_count: Maximum number of transmissions for a "long" frame
+ *    (a frame not RTS protected), called "dot11LongRetryLimit" in 802.11,
+ *    but actually means the number of transmissions not the number of retries
+ * @short_frame_max_tx_count: Maximum number of transmissions for a "short"
+ *    frame, called "dot11ShortRetryLimit" in 802.11, but actually means the
+ *    number of transmissions not the number of retries
 */
 struct ieee80211_conf {
-        int radio_enabled;
        int beacon_int;
-        u16 listen_interval;
        u32 flags;
        int power_level;
-        int max_antenna_gain;
-        u8 antenna_sel_tx;
-        u8 antenna_sel_rx;
-        struct ieee80211_channel *channel;
+        u16 listen_interval;
+        bool radio_enabled;
-        struct ieee80211_ht_info ht_conf;
+        u8 long_frame_max_tx_count, short_frame_max_tx_count;
-        struct ieee80211_ht_bss_info ht_bss_conf;
+        struct ieee80211_channel *channel;
+        struct ieee80211_ht_conf ht;
 };
 /**
@@ -494,11 +573,14 @@ struct ieee80211_conf {
 * use during the life of a virtual interface.
 *
 * @type: type of this virtual interface
+ * @bss_conf: BSS configuration for this interface, either our own
+ *      or the BSS we're associated to
 * @drv_priv: data area for driver use, will always be aligned to
 *      sizeof(void *).
 */
 struct ieee80211_vif {
        enum nl80211_iftype type;
+        struct ieee80211_bss_conf bss_conf;
        /* must be last */
        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
@@ -542,14 +624,12 @@ struct ieee80211_if_init_conf {
 * enum ieee80211_if_conf_change - interface config change flags
 *
 * @IEEE80211_IFCC_BSSID: The BSSID changed.
- * @IEEE80211_IFCC_SSID: The SSID changed.
 * @IEEE80211_IFCC_BEACON: The beacon for this interface changed
 *      (currently AP and MESH only), use ieee80211_beacon_get().
 */
 enum ieee80211_if_conf_change {
        IEEE80211_IFCC_BSSID    = BIT(0),
-        IEEE80211_IFCC_SSID     = BIT(1),
+        IEEE80211_IFCC_BEACON   = BIT(1),
-        IEEE80211_IFCC_BEACON   = BIT(2),
 };
 /**
@@ -557,11 +637,6 @@ enum ieee80211_if_conf_change {
 *
 * @changed: parameters that have changed, see &enum ieee80211_if_conf_change.
 * @bssid: BSSID of the network we are associated to/creating.
- * @ssid: used (together with @ssid_len) by drivers for hardware that
- *      generate beacons independently. The pointer is valid only during the
- *      config_interface() call, so copy the value somewhere if you need
- *      it.
- * @ssid_len: length of the @ssid field.
 *
 * This structure is passed to the config_interface() callback of
 * &struct ieee80211_hw.
@@ -569,8 +644,6 @@ enum ieee80211_if_conf_change {
 struct ieee80211_if_conf {
        u32 changed;
        u8 *bssid;
-        u8 *ssid;
-        size_t ssid_len;
 };
 /**
@@ -677,7 +750,7 @@ enum set_key_cmd {
 * @addr: MAC address
 * @aid: AID we assigned to the station if we're an AP
 * @supp_rates: Bitmap of supported rates (per band)
- * @ht_info: HT capabilities of this STA
+ * @ht_cap: HT capabilities of this STA; restricted to our own TX capabilities
 * @drv_priv: data area for driver use, will always be aligned to
 *      sizeof(void *), size is determined in hw information.
 */
@@ -685,7 +758,7 @@ struct ieee80211_sta {
        u64 supp_rates[IEEE80211_NUM_BANDS];
        u8 addr[ETH_ALEN];
        u16 aid;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
        /* must be last */
        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
@@ -769,6 +842,9 @@ enum ieee80211_tkip_key_type {
 * @IEEE80211_HW_SPECTRUM_MGMT:
 *      Hardware supports spectrum management defined in 802.11h
 *      Measurement, Channel Switch, Quieting, TPC
+ *
+ * @IEEE80211_HW_AMPDU_AGGREGATION:
+ *      Hardware supports 11n A-MPDU aggregation.
 */
 enum ieee80211_hw_flags {
        IEEE80211_HW_RX_INCLUDES_FCS                    = 1<<1,
@@ -780,6 +856,7 @@ enum ieee80211_hw_flags {
        IEEE80211_HW_SIGNAL_DBM                         = 1<<7,
        IEEE80211_HW_NOISE_DBM                          = 1<<8,
        IEEE80211_HW_SPECTRUM_MGMT                      = 1<<9,
+        IEEE80211_HW_AMPDU_AGGREGATION                  = 1<<10,
 };
 /**
@@ -838,8 +915,8 @@ enum ieee80211_hw_flags {
 * @sta_data_size: size (in bytes) of the drv_priv data area
 *      within &struct ieee80211_sta.
 *
- * @max_altrates: maximum number of alternate rate retry stages
+ * @max_rates: maximum number of alternate rate retry stages
- * @max_altrate_tries: maximum number of tries for each stage
+ * @max_rate_tries: maximum number of tries for each stage
 */
 struct ieee80211_hw {
        struct ieee80211_conf conf;
@@ -856,12 +933,10 @@ struct ieee80211_hw {
        u16 ampdu_queues;
        u16 max_listen_interval;
        s8 max_signal;
-        u8 max_altrates;
+        u8 max_rates;
-        u8 max_altrate_tries;
+        u8 max_rate_tries;
 };
-struct ieee80211_hw *wiphy_to_hw(struct wiphy *wiphy);
 /**
 * SET_IEEE80211_DEV - set device for 802.11 hardware
 *
@@ -874,7 +949,7 @@ static inline void SET_IEEE80211_DEV(struct ieee80211_hw *hw, struct device *dev
 }
 /**
- * SET_IEEE80211_PERM_ADDR - set the permanenet MAC address for 802.11 hardware
+ * SET_IEEE80211_PERM_ADDR - set the permanent MAC address for 802.11 hardware
 *
 * @hw: the &struct ieee80211_hw to set the MAC address for
 * @addr: the address to set
@@ -898,9 +973,9 @@ static inline struct ieee80211_rate *
 ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
                      const struct ieee80211_tx_info *c)
 {
-        if (WARN_ON(c->tx_rate_idx < 0))
+        if (WARN_ON(c->control.rates[0].idx < 0))
                return NULL;
-        return &hw->wiphy->bands[c->band]->bitrates[c->tx_rate_idx];
+        return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[0].idx];
 }
 static inline struct ieee80211_rate *
@@ -916,9 +991,9 @@ static inline struct ieee80211_rate *
 ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
                             const struct ieee80211_tx_info *c, int idx)
 {
-        if (c->control.retries[idx].rate_idx < 0)
+        if (c->control.rates[idx + 1].idx < 0)
                return NULL;
-        return &hw->wiphy->bands[c->band]->bitrates[c->control.retries[idx].rate_idx];
+        return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[idx + 1].idx];
 }
 /**
@@ -967,7 +1042,7 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
 * This happens everytime the iv16 wraps around (every 65536 packets). The
 * set_key() call will happen only once for each key (unless the AP did
 * rekeying), it will not include a valid phase 1 key. The valid phase 1 key is
- * provided by udpate_tkip_key only. The trigger that makes mac80211 call this
+ * provided by update_tkip_key only. The trigger that makes mac80211 call this
 * handler is software decryption with wrap around of iv16.
 */
@@ -1060,12 +1135,14 @@ enum ieee80211_filter_flags {
 * @IEEE80211_AMPDU_RX_STOP: stop Rx aggregation
 * @IEEE80211_AMPDU_TX_START: start Tx aggregation
 * @IEEE80211_AMPDU_TX_STOP: stop Tx aggregation
+ * @IEEE80211_AMPDU_TX_RESUME: resume TX aggregation
 */
 enum ieee80211_ampdu_mlme_action {
        IEEE80211_AMPDU_RX_START,
        IEEE80211_AMPDU_RX_STOP,
        IEEE80211_AMPDU_TX_START,
        IEEE80211_AMPDU_TX_STOP,
+        IEEE80211_AMPDU_TX_RESUME,
 };
 /**
@@ -1101,7 +1178,7 @@ enum ieee80211_ampdu_mlme_action {
 *      Must be implemented.
 *
 * @add_interface: Called when a netdevice attached to the hardware is
- *      enabled. Because it is not called for monitor mode devices, @open
+ *      enabled. Because it is not called for monitor mode devices, @start
 *      and @stop must be implemented.
 *      The driver should perform any initialization it needs before
 *      the device can be enabled. The initial configuration for the
@@ -1167,10 +1244,8 @@ enum ieee80211_ampdu_mlme_action {
 *      the device does fragmentation by itself; if this method is assigned then
 *      the stack will not do fragmentation.
 *
- * @set_retry_limit: Configuration of retry limits (if device needs it)
- *
 * @sta_notify: Notifies low level driver about addition or removal
- *      of assocaited station or AP.
+ *      of associated station or AP.
 *
 * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
 *      bursting) for a hardware TX queue.
@@ -1211,7 +1286,7 @@ struct ieee80211_ops {
                             struct ieee80211_if_init_conf *conf);
        void (*remove_interface)(struct ieee80211_hw *hw,
                                 struct ieee80211_if_init_conf *conf);
-        int (*config)(struct ieee80211_hw *hw, struct ieee80211_conf *conf);
+        int (*config)(struct ieee80211_hw *hw, u32 changed);
        int (*config_interface)(struct ieee80211_hw *hw,
                                struct ieee80211_vif *vif,
                                struct ieee80211_if_conf *conf);
@@ -1238,8 +1313,6 @@ struct ieee80211_ops {
                             u32 *iv32, u16 *iv16);
        int (*set_rts_threshold)(struct ieee80211_hw *hw, u32 value);
        int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value);
-        int (*set_retry_limit)(struct ieee80211_hw *hw,
-                               u32 short_retry, u32 long_retr);
        void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                        enum sta_notify_cmd, struct ieee80211_sta *sta);
        int (*conf_tx)(struct ieee80211_hw *hw, u16 queue,
@@ -1472,7 +1545,7 @@ void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
 * the next beacon frame from the 802.11 code. The low-level is responsible
 * for calling this function before beacon data is needed (e.g., based on
 * hardware interrupt). Returned skb is used only once and low-level driver
- * is responsible of freeing it.
+ * is responsible for freeing it.
 */
 struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
                                     struct ieee80211_vif *vif);
@@ -1803,24 +1876,38 @@ struct ieee80211_sta *ieee80211_find_sta(struct ieee80211_hw *hw,
 /* Rate control API */
 /**
- * struct rate_selection - rate information for/from rate control algorithms
+ * struct ieee80211_tx_rate_control - rate control information for/from RC algo
- *
+ *
- * @rate_idx: selected transmission rate index
+ * @hw: The hardware the algorithm is invoked for.
- * @nonerp_idx: Non-ERP rate to use instead if ERP cannot be used
+ * @sband: The band this frame is being transmitted on.
- * @probe_idx: rate for probing (or -1)
+ * @bss_conf: the current BSS configuration
- * @max_rate_idx: maximum rate index that can be used, this is
+ * @reported_rate: The rate control algorithm can fill this in to indicate
- *      input to the algorithm and will be enforced
+ *      which rate should be reported to userspace as the current rate and
- */
+ *      used for rate calculations in the mesh network.
-struct rate_selection {
+ * @rts: whether RTS will be used for this frame because it is longer than the
-        s8 rate_idx, nonerp_idx, probe_idx, max_rate_idx;
+ *      RTS threshold
+ * @short_preamble: whether mac80211 will request short-preamble transmission
+ *      if the selected rate supports it
+ * @max_rate_idx: user-requested maximum rate (not MCS for now)
+ * @skb: the skb that will be transmitted, the control information in it needs
+ *      to be filled in
+ */
+struct ieee80211_tx_rate_control {
+        struct ieee80211_hw *hw;
+        struct ieee80211_supported_band *sband;
+        struct ieee80211_bss_conf *bss_conf;
+        struct sk_buff *skb;
+        struct ieee80211_tx_rate reported_rate;
+        bool rts, short_preamble;
+        u8 max_rate_idx;
 };
 struct rate_control_ops {
        struct module *module;
        const char *name;
        void *(*alloc)(struct ieee80211_hw *hw, struct dentry *debugfsdir);
-        void (*clear)(void *priv);
        void (*free)(void *priv);
        void *(*alloc_sta)(void *priv, struct ieee80211_sta *sta, gfp_t gfp);
@@ -1832,10 +1919,8 @@ struct rate_control_ops {
        void (*tx_status)(void *priv, struct ieee80211_supported_band *sband,
                          struct ieee80211_sta *sta, void *priv_sta,
                          struct sk_buff *skb);
-        void (*get_rate)(void *priv, struct ieee80211_supported_band *sband,
+        void (*get_rate)(void *priv, struct ieee80211_sta *sta, void *priv_sta,
-                         struct ieee80211_sta *sta, void *priv_sta,
+                         struct ieee80211_tx_rate_control *txrc);
-                         struct sk_buff *skb,
-                         struct rate_selection *sel);
        void (*add_sta_debugfs)(void *priv, void *priv_sta,
                                struct dentry *dir);
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 11dd0137c6a5..ce532f2222ce 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -108,6 +108,20 @@ extern void			ndisc_send_redirect(struct sk_buff *skb,
 extern int                      ndisc_mc_map(struct in6_addr *addr, char *buf, struct net_device *dev, int dir);
+extern struct sk_buff           *ndisc_build_skb(struct net_device *dev,
+                                                 const struct in6_addr *daddr,
+                                                 const struct in6_addr *saddr,
+                                                 struct icmp6hdr *icmp6h,
+                                                 const struct in6_addr *target,
+                                                 int llinfo);
+extern void                     ndisc_send_skb(struct sk_buff *skb,
+                                               struct net_device *dev,
+                                               struct neighbour *neigh,
+                                               const struct in6_addr *daddr,
+                                               const struct in6_addr *saddr,
+                                               struct icmp6hdr *icmp6h);
 /*
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index aa4b708654a4..d8d790e56d3d 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -180,9 +180,6 @@ struct neigh_table
        __u32                   hash_rnd;
        unsigned int            hash_chain_gc;
        struct pneigh_entry     **phash_buckets;
-#ifdef CONFIG_PROC_FS
-        struct proc_dir_entry   *pde;
-#endif
 };
 /* flags for neigh_update() */
@@ -223,11 +220,7 @@ extern void			neigh_parms_release(struct neigh_table *tbl, struct neigh_parms *p
 static inline
 struct net                      *neigh_parms_net(const struct neigh_parms *parms)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&parms->net);
-        return parms->net;
-#else
-        return &init_net;
-#endif
 }
 extern unsigned long            neigh_rand_reach_time(unsigned long base);
@@ -244,11 +237,7 @@ extern int			pneigh_delete(struct neigh_table *tbl, struct net *net, const void
 static inline
 struct net                      *pneigh_net(const struct pneigh_entry *pneigh)
 {
-#ifdef CONFIG_NET_NS
+        return read_pnet(&pneigh->net);
-        return pneigh->net;
-#else
-        return &init_net;
-#endif
 }
 extern void neigh_app_ns(struct neighbour *n);
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index 700c53a3c6fa..319557789a40 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -192,6 +192,24 @@ static inline void release_net(struct net *net)
 }
 #endif
+#ifdef CONFIG_NET_NS
+static inline void write_pnet(struct net **pnet, struct net *net)
+{
+        *pnet = net;
+}
+static inline struct net *read_pnet(struct net * const *pnet)
+{
+        return *pnet;
+}
+#else
+#define write_pnet(pnet, net)   do { (void)(net);} while (0)
+#define read_pnet(pnet)         (&init_net)
+#endif
 #define for_each_net(VAR)                               \
        list_for_each_entry(VAR, &net_namespace_list, list)
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index a6874ba22d54..f2f6aa73dc10 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -112,20 +112,20 @@ struct nf_conntrack_tuple_mask
 static inline void nf_ct_dump_tuple_ip(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
-        printk("tuple %p: %u " NIPQUAD_FMT ":%hu -> " NIPQUAD_FMT ":%hu\n",
+        printk("tuple %p: %u %pI4:%hu -> %pI4:%hu\n",
               t, t->dst.protonum,
-               NIPQUAD(t->src.u3.ip), ntohs(t->src.u.all),
+               &t->src.u3.ip, ntohs(t->src.u.all),
-               NIPQUAD(t->dst.u3.ip), ntohs(t->dst.u.all));
+               &t->dst.u3.ip, ntohs(t->dst.u.all));
 #endif
 }
 static inline void nf_ct_dump_tuple_ipv6(const struct nf_conntrack_tuple *t)
 {
 #ifdef DEBUG
-        printk("tuple %p: %u " NIP6_FMT " %hu -> " NIP6_FMT " %hu\n",
+        printk("tuple %p: %u %pI6 %hu -> %pI6 %hu\n",
               t, t->dst.protonum,
-               NIP6(*(struct in6_addr *)t->src.u3.all), ntohs(t->src.u.all),
+               t->src.u3.all, ntohs(t->src.u.all),
-               NIP6(*(struct in6_addr *)t->dst.u3.all), ntohs(t->dst.u.all));
+               t->dst.u3.all, ntohs(t->dst.u.all));
 #endif
 }
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 3643bbb8e585..46b7764f1774 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -233,7 +233,7 @@ extern int		nla_parse(struct nlattr *tb[], int maxtype,
 extern struct nlattr *  nla_find(struct nlattr *head, int len, int attrtype);
 extern size_t           nla_strlcpy(char *dst, const struct nlattr *nla,
                                    size_t dstsize);
-extern int              nla_memcpy(void *dest, struct nlattr *src, int count);
+extern int              nla_memcpy(void *dest, const struct nlattr *src, int count);
 extern int              nla_memcmp(const struct nlattr *nla, const void *data,
                                   size_t size);
 extern int              nla_strcmp(const struct nlattr *nla, const char *str);
@@ -741,7 +741,7 @@ static inline struct nlattr *nla_find_nested(struct nlattr *nla, int attrtype)
 * See nla_parse()
 */
 static inline int nla_parse_nested(struct nlattr *tb[], int maxtype,
-                                   struct nlattr *nla,
+                                   const struct nlattr *nla,
                                   const struct nla_policy *policy)
 {
        return nla_parse(tb, maxtype, nla_data(nla), nla_len(nla), policy);
@@ -875,7 +875,7 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
 * nla_get_u32 - return payload of u32 attribute
 * @nla: u32 netlink attribute
 */
-static inline u32 nla_get_u32(struct nlattr *nla)
+static inline u32 nla_get_u32(const struct nlattr *nla)
 {
        return *(u32 *) nla_data(nla);
 }
@@ -884,7 +884,7 @@ static inline u32 nla_get_u32(struct nlattr *nla)
 * nla_get_be32 - return payload of __be32 attribute
 * @nla: __be32 netlink attribute
 */
-static inline __be32 nla_get_be32(struct nlattr *nla)
+static inline __be32 nla_get_be32(const struct nlattr *nla)
 {
        return *(__be32 *) nla_data(nla);
 }
@@ -893,7 +893,7 @@ static inline __be32 nla_get_be32(struct nlattr *nla)
 * nla_get_u16 - return payload of u16 attribute
 * @nla: u16 netlink attribute
 */
-static inline u16 nla_get_u16(struct nlattr *nla)
+static inline u16 nla_get_u16(const struct nlattr *nla)
 {
        return *(u16 *) nla_data(nla);
 }
@@ -902,7 +902,7 @@ static inline u16 nla_get_u16(struct nlattr *nla)
 * nla_get_be16 - return payload of __be16 attribute
 * @nla: __be16 netlink attribute
 */
-static inline __be16 nla_get_be16(struct nlattr *nla)
+static inline __be16 nla_get_be16(const struct nlattr *nla)
 {
        return *(__be16 *) nla_data(nla);
 }
@@ -911,7 +911,7 @@ static inline __be16 nla_get_be16(struct nlattr *nla)
 * nla_get_le16 - return payload of __le16 attribute
 * @nla: __le16 netlink attribute
 */
-static inline __le16 nla_get_le16(struct nlattr *nla)
+static inline __le16 nla_get_le16(const struct nlattr *nla)
 {
        return *(__le16 *) nla_data(nla);
 }
@@ -920,7 +920,7 @@ static inline __le16 nla_get_le16(struct nlattr *nla)
 * nla_get_u8 - return payload of u8 attribute
 * @nla: u8 netlink attribute
 */
-static inline u8 nla_get_u8(struct nlattr *nla)
+static inline u8 nla_get_u8(const struct nlattr *nla)
 {
        return *(u8 *) nla_data(nla);
 }
@@ -929,7 +929,7 @@ static inline u8 nla_get_u8(struct nlattr *nla)
 * nla_get_u64 - return payload of u64 attribute
 * @nla: u64 netlink attribute
 */
-static inline u64 nla_get_u64(struct nlattr *nla)
+static inline u64 nla_get_u64(const struct nlattr *nla)
 {
        u64 tmp;
@@ -942,7 +942,7 @@ static inline u64 nla_get_u64(struct nlattr *nla)
 * nla_get_flag - return payload of flag attribute
 * @nla: flag netlink attribute
 */
-static inline int nla_get_flag(struct nlattr *nla)
+static inline int nla_get_flag(const struct nlattr *nla)
 {
        return !!nla;
 }
@@ -953,7 +953,7 @@ static inline int nla_get_flag(struct nlattr *nla)
 *
 * Returns the number of milliseconds in jiffies.
 */
-static inline unsigned long nla_get_msecs(struct nlattr *nla)
+static inline unsigned long nla_get_msecs(const struct nlattr *nla)
 {
        u64 msecs = nla_get_u64(nla);
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index ece1c926b5d1..977f482d97a9 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -49,6 +49,8 @@ struct netns_ipv4 {
        int sysctl_icmp_ratelimit;
        int sysctl_icmp_ratemask;
        int sysctl_icmp_errors_use_inbound_ifaddr;
+        int sysctl_rt_cache_rebuild_count;
+        int current_rt_cache_rebuild_count;
        struct timer_list rt_secret_timer;
        atomic_t rt_genid;
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h
index aa9e282db485..d1ca31444644 100644
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
@@ -246,7 +246,7 @@ struct tcf_ematch_ops
 };
 extern int tcf_em_register(struct tcf_ematch_ops *);
-extern int tcf_em_unregister(struct tcf_ematch_ops *);
+extern void tcf_em_unregister(struct tcf_ematch_ops *);
 extern int tcf_em_tree_validate(struct tcf_proto *, struct nlattr *,
                                struct tcf_ematch_tree *);
 extern void tcf_em_tree_destroy(struct tcf_proto *, struct tcf_ematch_tree *);
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 3fe49d808957..f8c47429044a 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -53,7 +53,6 @@ struct Qdisc
        atomic_t                refcnt;
        unsigned long           state;
        struct sk_buff          *gso_skb;
-        struct sk_buff_head     requeue;
        struct sk_buff_head     q;
        struct netdev_queue     *dev_queue;
        struct Qdisc            *next_sched;
@@ -111,7 +110,7 @@ struct Qdisc_ops
        int                     (*enqueue)(struct sk_buff *, struct Qdisc *);
        struct sk_buff *        (*dequeue)(struct Qdisc *);
-        int                     (*requeue)(struct sk_buff *, struct Qdisc *);
+        struct sk_buff *        (*peek)(struct Qdisc *);
        unsigned int            (*drop)(struct Qdisc *);
        int                     (*init)(struct Qdisc *, struct nlattr *arg);
@@ -432,19 +431,38 @@ static inline struct sk_buff *qdisc_dequeue_tail(struct Qdisc *sch)
        return __qdisc_dequeue_tail(sch, &sch->q);
 }
-static inline int __qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch,
+static inline struct sk_buff *qdisc_peek_head(struct Qdisc *sch)
-                                  struct sk_buff_head *list)
 {
-        __skb_queue_head(list, skb);
+        return skb_peek(&sch->q);
-        sch->qstats.backlog += qdisc_pkt_len(skb);
+}
-        sch->qstats.requeues++;
-        return NET_XMIT_SUCCESS;
+/* generic pseudo peek method for non-work-conserving qdisc */
+static inline struct sk_buff *qdisc_peek_dequeued(struct Qdisc *sch)
+{
+        /* we can reuse ->gso_skb because peek isn't called for root qdiscs */
+        if (!sch->gso_skb) {
+                sch->gso_skb = sch->dequeue(sch);
+                if (sch->gso_skb)
+                        /* it's still part of the queue */
+                        sch->q.qlen++;
+        }
+        return sch->gso_skb;
 }
-static inline int qdisc_requeue(struct sk_buff *skb, struct Qdisc *sch)
+/* use instead of qdisc->dequeue() for all qdiscs queried with ->peek() */
+static inline struct sk_buff *qdisc_dequeue_peeked(struct Qdisc *sch)
 {
-        return __qdisc_requeue(skb, sch, &sch->q);
+        struct sk_buff *skb = sch->gso_skb;
+        if (skb) {
+                sch->gso_skb = NULL;
+                sch->q.qlen--;
+        } else {
+                skb = sch->dequeue(sch);
+        }
+        return skb;
 }
 static inline void __qdisc_reset_queue(struct Qdisc *sch,
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index ed71b110edf7..23797506f593 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -285,15 +285,15 @@ extern int sctp_debug_flag;
        if (sctp_debug_flag) { \
                if (saddr->sa.sa_family == AF_INET6) { \
                        printk(KERN_DEBUG \
-                               lead NIP6_FMT trail, \
+                               lead "%pI6" trail, \
                               leadparm, \
-                               NIP6(saddr->v6.sin6_addr), \
+                               &saddr->v6.sin6_addr, \
                               otherparms); \
                } else { \
                        printk(KERN_DEBUG \
-                               lead NIPQUAD_FMT trail, \
+                               lead "%pI4" trail, \
                               leadparm, \
-                               NIPQUAD(saddr->v4.sin_addr.s_addr), \
+                               &saddr->v4.sin_addr.s_addr, \
                               otherparms); \
                } \
        }
diff --git a/include/net/sock.h b/include/net/sock.h
index 2f47107f6d0f..00cd486d362f 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -42,6 +42,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
+#include <linux/list_nulls.h>
 #include <linux/timer.h>
 #include <linux/cache.h>
 #include <linux/module.h>
@@ -52,6 +53,7 @@
 #include <linux/security.h>
 #include <linux/filter.h>
+#include <linux/rculist_nulls.h>
 #include <asm/atomic.h>
 #include <net/dst.h>
@@ -106,6 +108,7 @@ struct net;
 *      @skc_reuse: %SO_REUSEADDR setting
 *      @skc_bound_dev_if: bound device index if != 0
 *      @skc_node: main hash linkage for various protocol lookup tables
+ *      @skc_nulls_node: main hash linkage for UDP/UDP-Lite protocol
 *      @skc_bind_node: bind hash linkage for various protocol lookup tables
 *      @skc_refcnt: reference count
 *      @skc_hash: hash value used with various protocol lookup tables
@@ -120,7 +123,10 @@ struct sock_common {
        volatile unsigned char  skc_state;
        unsigned char           skc_reuse;
        int                     skc_bound_dev_if;
-        struct hlist_node       skc_node;
+        union {
+                struct hlist_node       skc_node;
+                struct hlist_nulls_node skc_nulls_node;
+        };
        struct hlist_node       skc_bind_node;
        atomic_t                skc_refcnt;
        unsigned int            skc_hash;
@@ -206,6 +212,7 @@ struct sock {
 #define sk_reuse                __sk_common.skc_reuse
 #define sk_bound_dev_if         __sk_common.skc_bound_dev_if
 #define sk_node                 __sk_common.skc_node
+#define sk_nulls_node           __sk_common.skc_nulls_node
 #define sk_bind_node            __sk_common.skc_bind_node
 #define sk_refcnt               __sk_common.skc_refcnt
 #define sk_hash                 __sk_common.skc_hash
@@ -229,7 +236,9 @@ struct sock {
        } sk_backlog;
        wait_queue_head_t       *sk_sleep;
        struct dst_entry        *sk_dst_cache;
+#ifdef CONFIG_XFRM
        struct xfrm_policy      *sk_policy[2];
+#endif
        rwlock_t                sk_dst_lock;
        atomic_t                sk_rmem_alloc;
        atomic_t                sk_wmem_alloc;
@@ -237,7 +246,9 @@ struct sock {
        int                     sk_sndbuf;
        struct sk_buff_head     sk_receive_queue;
        struct sk_buff_head     sk_write_queue;
+#ifdef CONFIG_NET_DMA
        struct sk_buff_head     sk_async_wait_queue;
+#endif
        int                     sk_wmem_queued;
        int                     sk_forward_alloc;
        gfp_t                   sk_allocation;
@@ -269,7 +280,9 @@ struct sock {
        struct sk_buff          *sk_send_head;
        __u32                   sk_sndmsg_off;
        int                     sk_write_pending;
+#ifdef CONFIG_SECURITY
        void                    *sk_security;
+#endif
        __u32                   sk_mark;
        /* XXX 4 bytes hole on 64 bit */
        void                    (*sk_state_change)(struct sock *sk);
@@ -294,12 +307,30 @@ static inline struct sock *sk_head(const struct hlist_head *head)
        return hlist_empty(head) ? NULL : __sk_head(head);
 }
+static inline struct sock *__sk_nulls_head(const struct hlist_nulls_head *head)
+{
+        return hlist_nulls_entry(head->first, struct sock, sk_nulls_node);
+}
+static inline struct sock *sk_nulls_head(const struct hlist_nulls_head *head)
+{
+        return hlist_nulls_empty(head) ? NULL : __sk_nulls_head(head);
+}
 static inline struct sock *sk_next(const struct sock *sk)
 {
        return sk->sk_node.next ?
                hlist_entry(sk->sk_node.next, struct sock, sk_node) : NULL;
 }
+static inline struct sock *sk_nulls_next(const struct sock *sk)
+{
+        return (!is_a_nulls(sk->sk_nulls_node.next)) ?
+                hlist_nulls_entry(sk->sk_nulls_node.next,
+                                  struct sock, sk_nulls_node) :
+                NULL;
+}
 static inline int sk_unhashed(const struct sock *sk)
 {
        return hlist_unhashed(&sk->sk_node);
@@ -315,6 +346,11 @@ static __inline__ void sk_node_init(struct hlist_node *node)
        node->pprev = NULL;
 }
+static __inline__ void sk_nulls_node_init(struct hlist_nulls_node *node)
+{
+        node->pprev = NULL;
+}
 static __inline__ void __sk_del_node(struct sock *sk)
 {
        __hlist_del(&sk->sk_node);
@@ -361,6 +397,27 @@ static __inline__ int sk_del_node_init(struct sock *sk)
        return rc;
 }
+static __inline__ int __sk_nulls_del_node_init_rcu(struct sock *sk)
+{
+        if (sk_hashed(sk)) {
+                hlist_nulls_del_init_rcu(&sk->sk_nulls_node);
+                return 1;
+        }
+        return 0;
+}
+static __inline__ int sk_nulls_del_node_init_rcu(struct sock *sk)
+{
+        int rc = __sk_nulls_del_node_init_rcu(sk);
+        if (rc) {
+                /* paranoid for a while -acme */
+                WARN_ON(atomic_read(&sk->sk_refcnt) == 1);
+                __sock_put(sk);
+        }
+        return rc;
+}
 static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
 {
        hlist_add_head(&sk->sk_node, list);
@@ -372,6 +429,17 @@ static __inline__ void sk_add_node(struct sock *sk, struct hlist_head *list)
        __sk_add_node(sk, list);
 }
+static __inline__ void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
+{
+        hlist_nulls_add_head_rcu(&sk->sk_nulls_node, list);
+}
+static __inline__ void sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *list)
+{
+        sock_hold(sk);
+        __sk_nulls_add_node_rcu(sk, list);
+}
 static __inline__ void __sk_del_bind_node(struct sock *sk)
 {
        __hlist_del(&sk->sk_bind_node);
@@ -385,9 +453,16 @@ static __inline__ void sk_add_bind_node(struct sock *sk,
 #define sk_for_each(__sk, node, list) \
        hlist_for_each_entry(__sk, node, list, sk_node)
+#define sk_nulls_for_each(__sk, node, list) \
+        hlist_nulls_for_each_entry(__sk, node, list, sk_nulls_node)
+#define sk_nulls_for_each_rcu(__sk, node, list) \
+        hlist_nulls_for_each_entry_rcu(__sk, node, list, sk_nulls_node)
 #define sk_for_each_from(__sk, node) \
        if (__sk && ({ node = &(__sk)->sk_node; 1; })) \
                hlist_for_each_entry_from(__sk, node, sk_node)
+#define sk_nulls_for_each_from(__sk, node) \
+        if (__sk && ({ node = &(__sk)->sk_nulls_node; 1; })) \
+                hlist_nulls_for_each_entry_from(__sk, node, sk_nulls_node)
 #define sk_for_each_continue(__sk, node) \
        if (__sk && ({ node = &(__sk)->sk_node; 1; })) \
                hlist_for_each_entry_continue(__sk, node, sk_node)
@@ -587,8 +662,9 @@ struct proto {
        int                     *sysctl_rmem;
        int                     max_header;
-        struct kmem_cache               *slab;
+        struct kmem_cache       *slab;
        unsigned int            obj_size;
+        int                     slab_flags;
        atomic_t                *orphan_count;
@@ -597,7 +673,7 @@ struct proto {
        union {
                struct inet_hashinfo    *hashinfo;
-                struct hlist_head       *udp_hash;
+                struct udp_table        *udp_table;
                struct raw_hashinfo     *raw_hash;
        } h;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 438014d57610..8f26b28fb407 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -590,7 +590,6 @@ struct tcp_skb_cb {
 #define TCPCB_EVER_RETRANS      0x80    /* Ever retransmitted frame     */
 #define TCPCB_RETRANS           (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
-        __u16           urg_ptr;        /* Valid w/URG flags is set.    */
        __u32           ack_seq;        /* Sequence number ACK'd        */
 };
diff --git a/include/net/udp.h b/include/net/udp.h
index 1e205095ea68..90e6ce56be65 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -50,8 +50,15 @@ struct udp_skb_cb {
 };
 #define UDP_SKB_CB(__skb)       ((struct udp_skb_cb *)((__skb)->cb))
-extern struct hlist_head udp_hash[UDP_HTABLE_SIZE];
+struct udp_hslot {
-extern rwlock_t udp_hash_lock;
+        struct hlist_nulls_head head;
+        spinlock_t              lock;
+} __attribute__((aligned(2 * sizeof(long))));
+struct udp_table {
+        struct udp_hslot        hash[UDP_HTABLE_SIZE];
+};
+extern struct udp_table udp_table;
+extern void udp_table_init(struct udp_table *);
 /* Note: this must match 'valbool' in sock_setsockopt */
@@ -110,15 +117,7 @@ static inline void udp_lib_hash(struct sock *sk)
        BUG();
 }
-static inline void udp_lib_unhash(struct sock *sk)
+extern void udp_lib_unhash(struct sock *sk);
-{
-        write_lock_bh(&udp_hash_lock);
-        if (sk_del_node_init(sk)) {
-                inet_sk(sk)->num = 0;
-                sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
-        }
-        write_unlock_bh(&udp_hash_lock);
-}
 static inline void udp_lib_close(struct sock *sk, long timeout)
 {
@@ -187,7 +186,7 @@ extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
 struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
-        struct hlist_head       *hashtable;
+        struct udp_table        *udp_table;
        struct file_operations  seq_fops;
        struct seq_operations   seq_ops;
 };
@@ -196,7 +195,7 @@ struct udp_iter_state {
        struct seq_net_private  p;
        sa_family_t             family;
        int                     bucket;
-        struct hlist_head       *hashtable;
+        struct udp_table        *udp_table;
 };
 #ifdef CONFIG_PROC_FS
diff --git a/include/net/udplite.h b/include/net/udplite.h
index b76b2e377af4..afdffe607b24 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -11,7 +11,7 @@
 #define UDPLITE_RECV_CSCOV   11 /* receiver partial coverage (threshold ) */
 extern struct proto             udplite_prot;
-extern struct hlist_head        udplite_hash[UDP_HTABLE_SIZE];
+extern struct udp_table         udplite_table;
 /*
 *      Checksum computation is all in software, hence simpler getfrag.
diff --git a/include/net/wireless.h b/include/net/wireless.h
index 721efb363db7..412351560b76 100644
--- a/include/net/wireless.h
+++ b/include/net/wireless.h
@@ -10,6 +10,7 @@
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
+#include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 /**
@@ -133,23 +134,23 @@ struct ieee80211_rate {
 };
 /**
- * struct ieee80211_ht_info - describing STA's HT capabilities
+ * struct ieee80211_sta_ht_cap - STA's HT capabilities
 *
 * This structure describes most essential parameters needed
 * to describe 802.11n HT capabilities for an STA.
 *
- * @ht_supported: is HT supported by STA, 0: no, 1: yes
+ * @ht_supported: is HT supported by the STA
 * @cap: HT capabilities map as described in 802.11n spec
 * @ampdu_factor: Maximum A-MPDU length factor
 * @ampdu_density: Minimum A-MPDU spacing
- * @supp_mcs_set: Supported MCS set as described in 802.11n spec
+ * @mcs: Supported MCS rates
 */
-struct ieee80211_ht_info {
+struct ieee80211_sta_ht_cap {
        u16 cap; /* use IEEE80211_HT_CAP_ */
-        u8 ht_supported;
+        bool ht_supported;
        u8 ampdu_factor;
        u8 ampdu_density;
-        u8 supp_mcs_set[16];
+        struct ieee80211_mcs_info mcs;
 };
 /**
@@ -173,7 +174,7 @@ struct ieee80211_supported_band {
        enum ieee80211_band band;
        int n_channels;
        int n_bitrates;
-        struct ieee80211_ht_info ht_info;
+        struct ieee80211_sta_ht_cap ht_cap;
 };
 /**
@@ -262,9 +263,9 @@ static inline struct device *wiphy_dev(struct wiphy *wiphy)
 /**
 * wiphy_name - get wiphy name
 */
-static inline char *wiphy_name(struct wiphy *wiphy)
+static inline const char *wiphy_name(struct wiphy *wiphy)
 {
-        return wiphy->dev.bus_id;
+        return dev_name(&wiphy->dev);
 }
 /**
@@ -340,55 +341,36 @@ ieee80211_get_channel(struct wiphy *wiphy, int freq)
 }
 /**
- * __regulatory_hint - hint to the wireless core a regulatory domain
+ * ieee80211_get_response_rate - get basic rate for a given rate
- * @wiphy: if a driver is providing the hint this is the driver's very
- *      own &struct wiphy
- * @alpha2: the ISO/IEC 3166 alpha2 being claimed the regulatory domain
- *      should be in. If @rd is set this should be NULL
- * @rd: a complete regulatory domain, if passed the caller need not worry
- *      about freeing it
 *
- * The Wireless subsystem can use this function to hint to the wireless core
+ * @sband: the band to look for rates in
- * what it believes should be the current regulatory domain by
+ * @basic_rates: bitmap of basic rates
- * giving it an ISO/IEC 3166 alpha2 country code it knows its regulatory
+ * @bitrate: the bitrate for which to find the basic rate
- * domain should be in or by providing a completely build regulatory domain.
- *
- * Returns -EALREADY if *a regulatory domain* has already been set. Note that
- * this could be by another driver. It is safe for drivers to continue if
- * -EALREADY is returned, if drivers are not capable of world roaming they
- * should not register more channels than they support. Right now we only
- * support listening to the first driver hint. If the driver is capable
- * of world roaming but wants to respect its own EEPROM mappings for
- * specific regulatory domains it should register the @reg_notifier callback
- * on the &struct wiphy. Returns 0 if the hint went through fine or through an
- * intersection operation. Otherwise a standard error code is returned.
 *
+ * This function returns the basic rate corresponding to a given
+ * bitrate, that is the next lower bitrate contained in the basic
+ * rate map, which is, for this function, given as a bitmap of
+ * indices of rates in the band's bitrate table.
 */
-extern int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
+struct ieee80211_rate *
-                const char *alpha2, struct ieee80211_regdomain *rd);
+ieee80211_get_response_rate(struct ieee80211_supported_band *sband,
+                            u64 basic_rates, int bitrate);
 /**
 * regulatory_hint - driver hint to the wireless core a regulatory domain
- * @wiphy: the driver's very own &struct wiphy
+ * @wiphy: the wireless device giving the hint (used only for reporting
+ *      conflicts)
 * @alpha2: the ISO/IEC 3166 alpha2 the driver claims its regulatory domain
 *      should be in. If @rd is set this should be NULL. Note that if you
 *      set this to NULL you should still set rd->alpha2 to some accepted
 *      alpha2.
- * @rd: a complete regulatory domain provided by the driver. If passed
- *      the driver does not need to worry about freeing it.
 *
 * Wireless drivers can use this function to hint to the wireless core
 * what it believes should be the current regulatory domain by
 * giving it an ISO/IEC 3166 alpha2 country code it knows its regulatory
 * domain should be in or by providing a completely build regulatory domain.
 * If the driver provides an ISO/IEC 3166 alpha2 userspace will be queried
- * for a regulatory domain structure for the respective country. If
+ * for a regulatory domain structure for the respective country.
- * a regulatory domain is build and passed you should set the alpha2
- * if possible, otherwise set it to the special value of "99" which tells
- * the wireless core it is unknown. If you pass a built regulatory domain
- * and we return non zero you are in charge of kfree()'ing the structure.
- *
- * See __regulatory_hint() documentation for possible return values.
 */
-extern int regulatory_hint(struct wiphy *wiphy,
+extern void regulatory_hint(struct wiphy *wiphy, const char *alpha2);
-                const char *alpha2, struct ieee80211_regdomain *rd);
 #endif /* __NET_WIRELESS_H */
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 11c890ad8ebb..45e11b3631e4 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -467,7 +467,6 @@ struct xfrm_policy_walk {
 struct xfrm_policy
 {
-        struct xfrm_policy      *next;
        struct hlist_node       bydst;
        struct hlist_node       byidx;
@@ -882,6 +881,7 @@ struct xfrm_dst
        u32 path_cookie;
 };
+#ifdef CONFIG_XFRM
 static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
 {
        dst_release(xdst->route);
@@ -894,6 +894,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)
        xdst->partner = NULL;
 #endif
 }
+#endif
 extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
@@ -1536,9 +1537,11 @@ static inline void xfrm_states_delete(struct xfrm_state **states, int n)
 }
 #endif
+#ifdef CONFIG_XFRM
 static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb)
 {
        return skb->sp->xvec[skb->sp->len - 1];
 }
+#endif
 #endif  /* _NET_XFRM_H */