Patched in Tegra support.

155 files changed, 2931 insertions, 10048 deletions

diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
index 7184853ca36..a6326ef8ade 100644
--- a/include/net/9p/9p.h
+++ b/include/net/9p/9p.h
@@ -63,16 +63,33 @@ enum p9_debug_flags {
 
 #ifdef CONFIG_NET_9P_DEBUG
 extern unsigned int p9_debug_level;
-__printf(3, 4)
-void _p9_debug(enum p9_debug_flags level, const char *func,
-               const char *fmt, ...);
-#define p9_debug(level, fmt, ...)                       \
-        _p9_debug(level, __func__, fmt, ##__VA_ARGS__)
+
+#define P9_DPRINTK(level, format, arg...) \
+do {  \
+        if ((p9_debug_level & level) == level) {\
+                if (level == P9_DEBUG_9P) \
+                        printk(KERN_NOTICE "(%8.8d) " \
+                        format , task_pid_nr(current) , ## arg); \
+                else \
+                        printk(KERN_NOTICE "-- %s (%d): " \
+                        format , __func__, task_pid_nr(current) , ## arg); \
+        } \
+} while (0)
+
+#define P9_DUMP_PKT(way, pdu) p9pdu_dump(way, pdu)
+
 #else
-#define p9_debug(level, fmt, ...)                       \
-        no_printk(fmt, ##__VA_ARGS__)
+#define P9_DPRINTK(level, format, arg...)  do { } while (0)
+#define P9_DUMP_PKT(way, pdu) do { } while (0)
 #endif
 
+
+#define P9_EPRINTK(level, format, arg...) \
+do { \
+        printk(level "9p: %s (%d): " \
+                format , __func__, task_pid_nr(current), ## arg); \
+} while (0)
+
 /**
  * enum p9_msg_t - 9P message types
  * @P9_TLERROR: not used
@@ -342,9 +359,6 @@ enum p9_qid_t {
 /* Room for readdir header */
 #define P9_READDIRHDRSZ 24
 
-/* size of header for zero copy read/write */
-#define P9_ZC_HDR_SZ 4096
-
 /**
  * struct p9_qid - file system entity information
  * @type: 8-bit type &p9_qid_t
@@ -541,6 +555,10 @@ struct p9_rstatfs {
  * @tag: transaction id of the request
  * @offset: used by marshalling routines to track current position in buffer
  * @capacity: used by marshalling routines to track total malloc'd capacity
+ * @pubuf: Payload user buffer given by the caller
+ * @pkbuf: Payload kernel buffer given by the caller
+ * @pbuf_size: pubuf/pkbuf(only one will be !NULL) size to be read/write.
+ * @private: For transport layer's use.
  * @sdata: payload
  *
  * &p9_fcall represents the structure for all 9P RPC
@@ -557,6 +575,10 @@ struct p9_fcall {
 
         size_t offset;
         size_t capacity;
+        char __user *pubuf;
+        char *pkbuf;
+        size_t pbuf_size;
+        void *private;
 
         u8 *sdata;
 };
diff --git a/include/net/9p/client.h b/include/net/9p/client.h
index fc9b90b0c05..55ce72ce986 100644
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
@@ -151,7 +151,7 @@ struct p9_req_t {
 
 struct p9_client {
         spinlock_t lock; /* protect client structure */
-        unsigned int msize;
+        int msize;
         unsigned char proto_version;
         struct p9_trans_module *trans_mod;
         enum p9_trans_status status;
@@ -240,8 +240,8 @@ int p9_client_read(struct p9_fid *fid, char *data, char __user *udata,
 int p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
                                                         u64 offset, u32 count);
 int p9_client_readdir(struct p9_fid *fid, char *data, u32 count, u64 offset);
-int p9dirent_read(struct p9_client *clnt, char *buf, int len,
-                  struct p9_dirent *dirent);
+int p9dirent_read(char *buf, int len, struct p9_dirent *dirent,
+                                                        int proto_version);
 struct p9_wstat *p9_client_stat(struct p9_fid *fid);
 int p9_client_wstat(struct p9_fid *fid, struct p9_wstat *wst);
 int p9_client_setattr(struct p9_fid *fid, struct p9_iattr_dotl *attr);
@@ -259,7 +259,7 @@ struct p9_req_t *p9_tag_lookup(struct p9_client *, u16);
 void p9_client_cb(struct p9_client *c, struct p9_req_t *req);
 
 int p9_parse_header(struct p9_fcall *, int32_t *, int8_t *, int16_t *, int);
-int p9stat_read(struct p9_client *, char *, int, struct p9_wstat *);
+int p9stat_read(char *, int, struct p9_wstat *, int);
 void p9stat_free(struct p9_wstat *);
 
 int p9_is_proto_dotu(struct p9_client *clnt);
diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
index adcbb20f651..83531ebeee9 100644
--- a/include/net/9p/transport.h
+++ b/include/net/9p/transport.h
@@ -26,6 +26,13 @@
 #ifndef NET_9P_TRANSPORT_H
 #define NET_9P_TRANSPORT_H
 
+#define P9_TRANS_PREF_PAYLOAD_MASK 0x1
+
+/* Default. Add Payload to PDU before sending it down to transport layer */
+#define P9_TRANS_PREF_PAYLOAD_DEF  0x0
+/* Send pay load separately to transport layer along with PDU.*/
+#define P9_TRANS_PREF_PAYLOAD_SEP  0x1
+
 /**
  * struct p9_trans_module - transport module interface
  * @list: used to maintain a list of currently available transports
@@ -49,14 +56,13 @@ struct p9_trans_module {
         struct list_head list;
         char *name;             /* name of transport */
         int maxsize;            /* max message size of transport */
+        int pref;               /* Preferences of this transport */
         int def;                /* this transport should be default */
         struct module *owner;
         int (*create)(struct p9_client *, const char *, char *);
         void (*close) (struct p9_client *);
         int (*request) (struct p9_client *, struct p9_req_t *req);
         int (*cancel) (struct p9_client *, struct p9_req_t *req);
-        int (*zc_request)(struct p9_client *, struct p9_req_t *,
-                          char *, char *, int , int, int, int);
 };
 
 void v9fs_register_trans(struct p9_trans_module *m);
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index df4ef945338..cbc6bb0a683 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -46,8 +46,7 @@ struct prefix_info {
 #include <net/if_inet6.h>
 #include <net/ipv6.h>
 
-#define IN6_ADDR_HSIZE_SHIFT    4
-#define IN6_ADDR_HSIZE          (1 << IN6_ADDR_HSIZE_SHIFT)
+#define IN6_ADDR_HSIZE          16
 
 extern int                      addrconf_init(void);
 extern void                     addrconf_cleanup(void);
@@ -78,7 +77,7 @@ extern struct inet6_ifaddr      *ipv6_get_ifaddr(struct net *net,
                                                  int strict);
 
 extern int                      ipv6_dev_get_saddr(struct net *net,
-                                               const struct net_device *dev,
+                                               struct net_device *dev,
                                                const struct in6_addr *daddr,
                                                unsigned int srcprefs,
                                                struct in6_addr *saddr);
@@ -93,7 +92,7 @@ extern void			addrconf_leave_solict(struct inet6_dev *idev,
                                         const struct in6_addr *addr);
 
 static inline unsigned long addrconf_timeout_fixup(u32 timeout,
-                                                   unsigned int unit)
+                                                    unsigned unit)
 {
         if (timeout == 0xffffffff)
                 return ~0UL;
@@ -132,9 +131,9 @@ extern int ipv6_sock_mc_join(struct sock *sk, int ifindex,
 extern int ipv6_sock_mc_drop(struct sock *sk, int ifindex,
                              const struct in6_addr *addr);
 extern void ipv6_sock_mc_close(struct sock *sk);
-extern bool inet6_mc_check(struct sock *sk,
-                           const struct in6_addr *mc_addr,
-                           const struct in6_addr *src_addr);
+extern int inet6_mc_check(struct sock *sk,
+                          const struct in6_addr *mc_addr,
+                          const struct in6_addr *src_addr);
 
 extern int ipv6_dev_mc_inc(struct net_device *dev, const struct in6_addr *addr);
 extern int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr);
@@ -147,13 +146,12 @@ extern void ipv6_mc_init_dev(struct inet6_dev *idev);
 extern void ipv6_mc_destroy_dev(struct inet6_dev *idev);
 extern void addrconf_dad_failure(struct inet6_ifaddr *ifp);
 
-extern bool ipv6_chk_mcast_addr(struct net_device *dev,
-                                const struct in6_addr *group,
-                                const struct in6_addr *src_addr);
-extern bool ipv6_is_mld(struct sk_buff *skb, int nexthdr);
+extern int ipv6_chk_mcast_addr(struct net_device *dev,
+                               const struct in6_addr *group,
+                               const struct in6_addr *src_addr);
+extern int ipv6_is_mld(struct sk_buff *skb, int nexthdr);
 
-extern void addrconf_prefix_rcv(struct net_device *dev,
-                                u8 *opt, int len, bool sllao);
+extern void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len);
 
 /*
  *      anycast prototypes (anycast.c)
@@ -161,20 +159,18 @@ extern void addrconf_prefix_rcv(struct net_device *dev,
 extern int ipv6_sock_ac_join(struct sock *sk,int ifindex, const struct in6_addr *addr);
 extern int ipv6_sock_ac_drop(struct sock *sk,int ifindex, const struct in6_addr *addr);
 extern void ipv6_sock_ac_close(struct sock *sk);
+extern int inet6_ac_check(struct sock *sk, const struct in6_addr *addr, int ifindex);
 
 extern int ipv6_dev_ac_inc(struct net_device *dev, const struct in6_addr *addr);
 extern int __ipv6_dev_ac_dec(struct inet6_dev *idev, const struct in6_addr *addr);
-extern bool ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
-                                const struct in6_addr *addr);
+extern int ipv6_chk_acast_addr(struct net *net, struct net_device *dev,
+                               const struct in6_addr *addr);
 
 
 /* Device notifier */
 extern int register_inet6addr_notifier(struct notifier_block *nb);
 extern int unregister_inet6addr_notifier(struct notifier_block *nb);
 
-extern void inet6_netconf_notify_devconf(struct net *net, int type, int ifindex,
-                                         struct ipv6_devconf *devconf);
-
 /**
  * __in6_dev_get - get inet6_dev pointer from netdevice
  * @dev: network device
diff --git a/include/net/af_unix.h b/include/net/af_unix.h
index 0a996a3517e..91ab5b01678 100644
--- a/include/net/af_unix.h
+++ b/include/net/af_unix.h
@@ -11,19 +11,15 @@ extern void unix_notinflight(struct file *fp);
 extern void unix_gc(void);
 extern void wait_for_unix_gc(void);
 extern struct sock *unix_get_socket(struct file *filp);
-extern struct sock *unix_peer_get(struct sock *);
 
 #define UNIX_HASH_SIZE  256
-#define UNIX_HASH_BITS  8
 
 extern unsigned int unix_tot_inflight;
-extern spinlock_t unix_table_lock;
-extern struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE];
 
 struct unix_address {
         atomic_t        refcnt;
         int             len;
-        unsigned int    hash;
+        unsigned        hash;
         struct sockaddr_un name[0];
 };
 
@@ -50,9 +46,11 @@ struct unix_sock {
         /* WARNING: sk has to be the first member */
         struct sock             sk;
         struct unix_address     *addr;
-        struct path             path;
+        struct dentry           *dentry;
+        struct vfsmount         *mnt;
         struct mutex            readlock;
         struct sock             *peer;
+        struct sock             *other;
         struct list_head        link;
         atomic_long_t           inflight;
         spinlock_t              lock;
@@ -65,9 +63,6 @@ struct unix_sock {
 
 #define peer_wait peer_wq.wait
 
-long unix_inq_len(struct sock *sk);
-long unix_outq_len(struct sock *sk);
-
 #ifdef CONFIG_SYSCTL
 extern int unix_sysctl_register(struct net *net);
 extern void unix_sysctl_unregister(struct net *net);
diff --git a/include/net/arp.h b/include/net/arp.h
index b630dae0341..4979af8b155 100644
--- a/include/net/arp.h
+++ b/include/net/arp.h
@@ -3,7 +3,6 @@
 #define _ARP_H
 
 #include <linux/if_arp.h>
-#include <linux/hash.h>
 #include <net/neighbour.h>
 
 
@@ -11,36 +10,29 @@ extern struct neigh_table arp_tbl;
 
 static inline u32 arp_hashfn(u32 key, const struct net_device *dev, u32 hash_rnd)
 {
-        u32 val = key ^ hash32_ptr(dev);
+        u32 val = key ^ dev->ifindex;
 
         return val * hash_rnd;
 }
 
-static inline struct neighbour *__ipv4_neigh_lookup_noref(struct net_device *dev, u32 key)
+static inline struct neighbour *__ipv4_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, u32 key)
 {
-        struct neigh_hash_table *nht = rcu_dereference_bh(arp_tbl.nht);
+        struct neigh_hash_table *nht;
         struct neighbour *n;
         u32 hash_val;
 
-        hash_val = arp_hashfn(key, dev, nht->hash_rnd[0]) >> (32 - nht->hash_shift);
+        rcu_read_lock_bh();
+        nht = rcu_dereference_bh(tbl->nht);
+        hash_val = arp_hashfn(key, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
         for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
              n != NULL;
              n = rcu_dereference_bh(n->next)) {
-                if (n->dev == dev && *(u32 *)n->primary_key == key)
-                        return n;
+                if (n->dev == dev && *(u32 *)n->primary_key == key) {
+                        if (!atomic_inc_not_zero(&n->refcnt))
+                                n = NULL;
+                        break;
+                }
         }
-
-        return NULL;
-}
-
-static inline struct neighbour *__ipv4_neigh_lookup(struct net_device *dev, u32 key)
-{
-        struct neighbour *n;
-
-        rcu_read_lock_bh();
-        n = __ipv4_neigh_lookup_noref(dev, key);
-        if (n && !atomic_inc_not_zero(&n->refcnt))
-                n = NULL;
         rcu_read_unlock_bh();
 
         return n;
diff --git a/include/net/atmclip.h b/include/net/atmclip.h
index 5865924d4aa..497ef6444a7 100644
--- a/include/net/atmclip.h
+++ b/include/net/atmclip.h
@@ -15,6 +15,7 @@
 
 
 #define CLIP_VCC(vcc) ((struct clip_vcc *) ((vcc)->user_back))
+#define NEIGH2ENTRY(neigh) ((struct atmarp_entry *) (neigh)->primary_key)
 
 struct sk_buff;
 
@@ -35,18 +36,24 @@ struct clip_vcc {
 
 
 struct atmarp_entry {
+        __be32          ip;             /* IP address */
         struct clip_vcc *vccs;          /* active VCCs; NULL if resolution is
                                            pending */
         unsigned long   expires;        /* entry expiration time */
         struct neighbour *neigh;        /* neighbour back-pointer */
 };
 
+
 #define PRIV(dev) ((struct clip_priv *) netdev_priv(dev))
 
+
 struct clip_priv {
         int number;                     /* for convenience ... */
         spinlock_t xoff_lock;           /* ensures that pop is atomic (SMP) */
         struct net_device *next;        /* next CLIP interface */
 };
 
+
+extern struct neigh_table *clip_tbl_hook;
+
 #endif
diff --git a/include/net/ax25.h b/include/net/ax25.h
index 53539acbd81..94e09d361bb 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -157,7 +157,7 @@ enum {
 typedef struct ax25_uid_assoc {
         struct hlist_node       uid_node;
         atomic_t                refcount;
-        kuid_t                  uid;
+        uid_t                   uid;
         ax25_address            call;
 } ax25_uid_assoc;
 
@@ -215,7 +215,7 @@ typedef struct ax25_dev {
         struct ax25_dev         *next;
         struct net_device       *dev;
         struct net_device       *forward;
-        struct ctl_table_header *sysheader;
+        struct ctl_table        *systable;
         int                     values[AX25_MAX_VALUES];
 #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
         ax25_dama_info          dama;
@@ -434,18 +434,18 @@ extern unsigned long ax25_display_timer(struct timer_list *);
 
 /* ax25_uid.c */
 extern int  ax25_uid_policy;
-extern ax25_uid_assoc *ax25_findbyuid(kuid_t);
+extern ax25_uid_assoc *ax25_findbyuid(uid_t);
 extern int __must_check ax25_uid_ioctl(int, struct sockaddr_ax25 *);
 extern const struct file_operations ax25_uid_fops;
 extern void ax25_uid_free(void);
 
 /* sysctl_net_ax25.c */
 #ifdef CONFIG_SYSCTL
-extern int ax25_register_dev_sysctl(ax25_dev *ax25_dev);
-extern void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev);
+extern void ax25_register_sysctl(void);
+extern void ax25_unregister_sysctl(void);
 #else
-static inline int ax25_register_dev_sysctl(ax25_dev *ax25_dev) { return 0; }
-static inline void ax25_unregister_dev_sysctl(ax25_dev *ax25_dev) {}
+static inline void ax25_register_sysctl(void) {};
+static inline void ax25_unregister_sysctl(void) {};
 #endif /* CONFIG_SYSCTL */
 
 #endif
diff --git a/include/net/bluetooth/a2mp.h b/include/net/bluetooth/a2mp.h
deleted file mode 100644
index 42f21766c53..00000000000
--- a/include/net/bluetooth/a2mp.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
-   Copyright (c) 2010,2011 Code Aurora Forum.  All rights reserved.
-   Copyright (c) 2011,2012 Intel Corp.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 and
-   only version 2 as published by the Free Software Foundation.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-*/
-
-#ifndef __A2MP_H
-#define __A2MP_H
-
-#include <net/bluetooth/l2cap.h>
-
-#define A2MP_FEAT_EXT   0x8000
-
-enum amp_mgr_state {
-        READ_LOC_AMP_INFO,
-        READ_LOC_AMP_ASSOC,
-        READ_LOC_AMP_ASSOC_FINAL,
-};
-
-struct amp_mgr {
-        struct list_head        list;
-        struct l2cap_conn       *l2cap_conn;
-        struct l2cap_chan       *a2mp_chan;
-        struct l2cap_chan       *bredr_chan;
-        struct kref             kref;
-        __u8                    ident;
-        __u8                    handle;
-        enum amp_mgr_state      state;
-        unsigned long           flags;
-
-        struct list_head        amp_ctrls;
-        struct mutex            amp_ctrls_lock;
-};
-
-struct a2mp_cmd {
-        __u8    code;
-        __u8    ident;
-        __le16  len;
-        __u8    data[0];
-} __packed;
-
-/* A2MP command codes */
-#define A2MP_COMMAND_REJ         0x01
-struct a2mp_cmd_rej {
-        __le16  reason;
-        __u8    data[0];
-} __packed;
-
-#define A2MP_DISCOVER_REQ        0x02
-struct a2mp_discov_req {
-        __le16  mtu;
-        __le16  ext_feat;
-} __packed;
-
-struct a2mp_cl {
-        __u8    id;
-        __u8    type;
-        __u8    status;
-} __packed;
-
-#define A2MP_DISCOVER_RSP        0x03
-struct a2mp_discov_rsp {
-        __le16     mtu;
-        __le16     ext_feat;
-        struct a2mp_cl cl[0];
-} __packed;
-
-#define A2MP_CHANGE_NOTIFY       0x04
-#define A2MP_CHANGE_RSP          0x05
-
-#define A2MP_GETINFO_REQ         0x06
-struct a2mp_info_req {
-        __u8       id;
-} __packed;
-
-#define A2MP_GETINFO_RSP         0x07
-struct a2mp_info_rsp {
-        __u8    id;
-        __u8    status;
-        __le32  total_bw;
-        __le32  max_bw;
-        __le32  min_latency;
-        __le16  pal_cap;
-        __le16  assoc_size;
-} __packed;
-
-#define A2MP_GETAMPASSOC_REQ     0x08
-struct a2mp_amp_assoc_req {
-        __u8    id;
-} __packed;
-
-#define A2MP_GETAMPASSOC_RSP     0x09
-struct a2mp_amp_assoc_rsp {
-        __u8    id;
-        __u8    status;
-        __u8    amp_assoc[0];
-} __packed;
-
-#define A2MP_CREATEPHYSLINK_REQ  0x0A
-#define A2MP_DISCONNPHYSLINK_REQ 0x0C
-struct a2mp_physlink_req {
-        __u8    local_id;
-        __u8    remote_id;
-        __u8    amp_assoc[0];
-} __packed;
-
-#define A2MP_CREATEPHYSLINK_RSP  0x0B
-#define A2MP_DISCONNPHYSLINK_RSP 0x0D
-struct a2mp_physlink_rsp {
-        __u8    local_id;
-        __u8    remote_id;
-        __u8    status;
-} __packed;
-
-/* A2MP response status */
-#define A2MP_STATUS_SUCCESS                     0x00
-#define A2MP_STATUS_INVALID_CTRL_ID             0x01
-#define A2MP_STATUS_UNABLE_START_LINK_CREATION  0x02
-#define A2MP_STATUS_NO_PHYSICAL_LINK_EXISTS     0x02
-#define A2MP_STATUS_COLLISION_OCCURED           0x03
-#define A2MP_STATUS_DISCONN_REQ_RECVD           0x04
-#define A2MP_STATUS_PHYS_LINK_EXISTS            0x05
-#define A2MP_STATUS_SECURITY_VIOLATION          0x06
-
-extern struct list_head amp_mgr_list;
-extern struct mutex amp_mgr_list_lock;
-
-struct amp_mgr *amp_mgr_get(struct amp_mgr *mgr);
-int amp_mgr_put(struct amp_mgr *mgr);
-u8 __next_ident(struct amp_mgr *mgr);
-struct l2cap_chan *a2mp_channel_create(struct l2cap_conn *conn,
-                                       struct sk_buff *skb);
-struct amp_mgr *amp_mgr_lookup_by_state(u8 state);
-void a2mp_send(struct amp_mgr *mgr, u8 code, u8 ident, u16 len, void *data);
-void a2mp_discover_amp(struct l2cap_chan *chan);
-void a2mp_send_getinfo_rsp(struct hci_dev *hdev);
-void a2mp_send_getampassoc_rsp(struct hci_dev *hdev, u8 status);
-void a2mp_send_create_phy_link_req(struct hci_dev *hdev, u8 status);
-
-#endif /* __A2MP_H */
diff --git a/include/net/bluetooth/amp.h b/include/net/bluetooth/amp.h
deleted file mode 100644
index 7ea3db77ba8..00000000000
--- a/include/net/bluetooth/amp.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-   Copyright (c) 2011,2012 Intel Corp.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License version 2 and
-   only version 2 as published by the Free Software Foundation.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-*/
-
-#ifndef __AMP_H
-#define __AMP_H
-
-struct amp_ctrl {
-        struct list_head        list;
-        struct kref             kref;
-        __u8                    id;
-        __u16                   assoc_len_so_far;
-        __u16                   assoc_rem_len;
-        __u16                   assoc_len;
-        __u8                    *assoc;
-};
-
-int amp_ctrl_put(struct amp_ctrl *ctrl);
-void amp_ctrl_get(struct amp_ctrl *ctrl);
-struct amp_ctrl *amp_ctrl_add(struct amp_mgr *mgr, u8 id);
-struct amp_ctrl *amp_ctrl_lookup(struct amp_mgr *mgr, u8 id);
-void amp_ctrl_list_flush(struct amp_mgr *mgr);
-
-struct hci_conn *phylink_add(struct hci_dev *hdev, struct amp_mgr *mgr,
-                             u8 remote_id, bool out);
-
-int phylink_gen_key(struct hci_conn *hcon, u8 *data, u8 *len, u8 *type);
-
-void amp_read_loc_info(struct hci_dev *hdev, struct amp_mgr *mgr);
-void amp_read_loc_assoc_frag(struct hci_dev *hdev, u8 phy_handle);
-void amp_read_loc_assoc(struct hci_dev *hdev, struct amp_mgr *mgr);
-void amp_read_loc_assoc_final_data(struct hci_dev *hdev,
-                                   struct hci_conn *hcon);
-void amp_create_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,
-                        struct hci_conn *hcon);
-void amp_accept_phylink(struct hci_dev *hdev, struct amp_mgr *mgr,
-                        struct hci_conn *hcon);
-void amp_write_remote_assoc(struct hci_dev *hdev, u8 handle);
-void amp_write_rem_assoc_continue(struct hci_dev *hdev, u8 handle);
-void amp_physical_cfm(struct hci_conn *bredr_hcon, struct hci_conn *hs_hcon);
-void amp_create_logical_link(struct l2cap_chan *chan);
-void amp_disconnect_logical_link(struct hci_chan *hchan);
-void amp_destroy_logical_link(struct hci_chan *hchan, u8 reason);
-
-#endif /* __AMP_H */
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 2554b3f5222..e727555d4ee 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -1,4 +1,4 @@
-/*
+/* 
    BlueZ - Bluetooth protocol stack for Linux
    Copyright (C) 2000-2001 Qualcomm Incorporated
 
@@ -12,33 +12,30 @@
    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
    IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
    SOFTWARE IS DISCLAIMED.
 */
 
 #ifndef __BLUETOOTH_H
 #define __BLUETOOTH_H
 
+#include <asm/types.h>
+#include <asm/byteorder.h>
+#include <linux/list.h>
 #include <linux/poll.h>
 #include <net/sock.h>
-#include <linux/seq_file.h>
 
 #ifndef AF_BLUETOOTH
 #define AF_BLUETOOTH    31
 #define PF_BLUETOOTH    AF_BLUETOOTH
 #endif
 
-/* Bluetooth versions */
-#define BLUETOOTH_VER_1_1       1
-#define BLUETOOTH_VER_1_2       2
-#define BLUETOOTH_VER_2_0       3
-
 /* Reserv for core and drivers use */
 #define BT_SKB_RESERVE  8
 
@@ -80,41 +77,12 @@ struct bt_power {
 #define BT_POWER_FORCE_ACTIVE_OFF 0
 #define BT_POWER_FORCE_ACTIVE_ON  1
 
-#define BT_CHANNEL_POLICY       10
-
-/* BR/EDR only (default policy)
- *   AMP controllers cannot be used.
- *   Channel move requests from the remote device are denied.
- *   If the L2CAP channel is currently using AMP, move the channel to BR/EDR.
- */
-#define BT_CHANNEL_POLICY_BREDR_ONLY            0
-
-/* BR/EDR Preferred
- *   Allow use of AMP controllers.
- *   If the L2CAP channel is currently on AMP, move it to BR/EDR.
- *   Channel move requests from the remote device are allowed.
- */
-#define BT_CHANNEL_POLICY_BREDR_PREFERRED       1
-
-/* AMP Preferred
- *   Allow use of AMP controllers
- *   If the L2CAP channel is currently on BR/EDR and AMP controller
- *     resources are available, initiate a channel move to AMP.
- *   Channel move requests from the remote device are allowed.
- *   If the L2CAP socket has not been connected yet, try to create
- *     and configure the channel directly on an AMP controller rather
- *     than BR/EDR.
- */
-#define BT_CHANNEL_POLICY_AMP_PREFERRED         2
-
-__printf(1, 2)
-int bt_info(const char *fmt, ...);
-__printf(1, 2)
-int bt_err(const char *fmt, ...);
-
-#define BT_INFO(fmt, ...)       bt_info(fmt "\n", ##__VA_ARGS__)
-#define BT_ERR(fmt, ...)        bt_err(fmt "\n", ##__VA_ARGS__)
-#define BT_DBG(fmt, ...)        pr_debug(fmt "\n", ##__VA_ARGS__)
+__attribute__((format (printf, 2, 3)))
+int bt_printk(const char *level, const char *fmt, ...);
+
+#define BT_INFO(fmt, arg...)   bt_printk(KERN_INFO, pr_fmt(fmt), ##arg)
+#define BT_ERR(fmt, arg...)    bt_printk(KERN_ERR, pr_fmt(fmt), ##arg)
+#define BT_DBG(fmt, arg...)    pr_debug(fmt "\n", ##arg)
 
 /* Connection and socket states */
 enum {
@@ -129,45 +97,13 @@ enum {
         BT_CLOSED
 };
 
-/* If unused will be removed by compiler */
-static inline const char *state_to_string(int state)
-{
-        switch (state) {
-        case BT_CONNECTED:
-                return "BT_CONNECTED";
-        case BT_OPEN:
-                return "BT_OPEN";
-        case BT_BOUND:
-                return "BT_BOUND";
-        case BT_LISTEN:
-                return "BT_LISTEN";
-        case BT_CONNECT:
-                return "BT_CONNECT";
-        case BT_CONNECT2:
-                return "BT_CONNECT2";
-        case BT_CONFIG:
-                return "BT_CONFIG";
-        case BT_DISCONN:
-                return "BT_DISCONN";
-        case BT_CLOSED:
-                return "BT_CLOSED";
-        }
-
-        return "invalid state";
-}
-
 /* BD Address */
 typedef struct {
         __u8 b[6];
 } __packed bdaddr_t;
 
-/* BD Address type */
-#define BDADDR_BREDR            0x00
-#define BDADDR_LE_PUBLIC        0x01
-#define BDADDR_LE_RANDOM        0x02
-
-#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0} })
-#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff} })
+#define BDADDR_ANY   (&(bdaddr_t) {{0, 0, 0, 0, 0, 0}})
+#define BDADDR_LOCAL (&(bdaddr_t) {{0, 0, 0, 0xff, 0xff, 0xff}})
 
 /* Copy, swap, convert BD Address */
 static inline int bacmp(bdaddr_t *ba1, bdaddr_t *ba2)
@@ -180,6 +116,8 @@ static inline void bacpy(bdaddr_t *dst, bdaddr_t *src)
 }
 
 void baswap(bdaddr_t *dst, bdaddr_t *src);
+char *batostr(bdaddr_t *ba);
+bdaddr_t *strtoba(char *str);
 
 /* Common socket structures and functions */
 
@@ -191,21 +129,12 @@ struct bt_sock {
         bdaddr_t    dst;
         struct list_head accept_q;
         struct sock *parent;
-        unsigned long flags;
-};
-
-enum {
-        BT_SK_DEFER_SETUP,
-        BT_SK_SUSPEND,
+        u32 defer_setup;
 };
 
 struct bt_sock_list {
         struct hlist_head head;
         rwlock_t          lock;
-#ifdef CONFIG_PROC_FS
-        struct file_operations   fops;
-        int (* custom_seq_show)(struct seq_file *, void *);
-#endif
 };
 
 int  bt_sock_register(int proto, const struct net_proto_family *ops);
@@ -216,7 +145,7 @@ int  bt_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
                                 struct msghdr *msg, size_t len, int flags);
 int  bt_sock_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         struct msghdr *msg, size_t len, int flags);
-uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);
+uint bt_sock_poll(struct file * file, struct socket *sock, poll_table *wait);
 int  bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);
 int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);
 
@@ -225,24 +154,15 @@ void bt_accept_unlink(struct sock *sk);
 struct sock *bt_accept_dequeue(struct sock *parent, struct socket *newsock);
 
 /* Skb helpers */
-struct l2cap_ctrl {
-        unsigned int    sframe:1,
-                        poll:1,
-                        final:1,
-                        fcs:1,
-                        sar:2,
-                        super:2;
-        __u16           reqseq;
-        __u16           txseq;
-        __u8            retries;
-};
-
 struct bt_skb_cb {
         __u8 pkt_type;
         __u8 incoming;
         __u16 expect;
+        __u8 tx_seq;
+        __u8 retries;
+        __u8 sar;
+        unsigned short channel;
         __u8 force_active;
-        struct l2cap_ctrl control;
 };
 #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))
 
@@ -250,8 +170,7 @@ static inline struct sk_buff *bt_skb_alloc(unsigned int len, gfp_t how)
 {
         struct sk_buff *skb;
 
-        skb = alloc_skb(len + BT_SKB_RESERVE, how);
-        if (skb) {
+        if ((skb = alloc_skb(len + BT_SKB_RESERVE, how))) {
                 skb_reserve(skb, BT_SKB_RESERVE);
                 bt_cb(skb)->incoming  = 0;
         }
@@ -263,11 +182,12 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk,
 {
         struct sk_buff *skb;
 
-        skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err);
-        if (skb) {
+        release_sock(sk);
+        if ((skb = sock_alloc_send_skb(sk, len + BT_SKB_RESERVE, nb, err))) {
                 skb_reserve(skb, BT_SKB_RESERVE);
                 bt_cb(skb)->incoming  = 0;
         }
+        lock_sock(sk);
 
         if (!skb && *err)
                 return NULL;
@@ -296,19 +216,34 @@ extern void hci_sock_cleanup(void);
 extern int bt_sysfs_init(void);
 extern void bt_sysfs_cleanup(void);
 
-extern int  bt_procfs_init(struct module* module, struct net *net, const char *name,
-                           struct bt_sock_list* sk_list,
-                           int (* seq_show)(struct seq_file *, void *));
-extern void bt_procfs_cleanup(struct net *net, const char *name);
-
 extern struct dentry *bt_debugfs;
 
+#ifdef CONFIG_BT_L2CAP
 int l2cap_init(void);
 void l2cap_exit(void);
+#else
+static inline int l2cap_init(void)
+{
+        return 0;
+}
 
+static inline void l2cap_exit(void)
+{
+}
+#endif
+
+#ifdef CONFIG_BT_SCO
 int sco_init(void);
 void sco_exit(void);
+#else
+static inline int sco_init(void)
+{
+        return 0;
+}
 
-void bt_sock_reclassify_lock(struct sock *sk, int proto);
+static inline void sco_exit(void)
+{
+}
+#endif
 
 #endif /* __BLUETOOTH_H */
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 45eee08157b..915d7ae527b 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -30,11 +30,6 @@
 #define HCI_MAX_EVENT_SIZE      260
 #define HCI_MAX_FRAME_SIZE      (HCI_MAX_ACL_SIZE + 4)
 
-#define HCI_LINK_KEY_SIZE       16
-#define HCI_AMP_LINK_KEY_SIZE   (2 * HCI_LINK_KEY_SIZE)
-
-#define HCI_MAX_AMP_ASSOC_SIZE  672
-
 /* HCI dev events */
 #define HCI_DEV_REG                     1
 #define HCI_DEV_UNREG                   2
@@ -42,6 +37,7 @@
 #define HCI_DEV_DOWN                    4
 #define HCI_DEV_SUSPEND                 5
 #define HCI_DEV_RESUME                  6
+#define HCI_DEV_WRITE                   7
 
 /* HCI notify events */
 #define HCI_NOTIFY_CONN_ADD             1
@@ -61,21 +57,9 @@
 #define HCI_BREDR       0x00
 #define HCI_AMP         0x01
 
-/* First BR/EDR Controller shall have ID = 0 */
-#define HCI_BREDR_ID    0
-
-/* AMP controller status */
-#define AMP_CTRL_POWERED_DOWN                   0x00
-#define AMP_CTRL_BLUETOOTH_ONLY                 0x01
-#define AMP_CTRL_NO_CAPACITY                    0x02
-#define AMP_CTRL_LOW_CAPACITY                   0x03
-#define AMP_CTRL_MEDIUM_CAPACITY                0x04
-#define AMP_CTRL_HIGH_CAPACITY                  0x05
-#define AMP_CTRL_FULL_CAPACITY                  0x06
-
 /* HCI device quirks */
 enum {
-        HCI_QUIRK_RESET_ON_CLOSE,
+        HCI_QUIRK_NO_RESET,
         HCI_QUIRK_RAW_DEVICE,
         HCI_QUIRK_FIXUP_BUFFER_SIZE
 };
@@ -94,14 +78,6 @@ enum {
 
         HCI_RAW,
 
-        HCI_RESET,
-};
-
-/*
- * BR/EDR and/or LE controller flags: the flags defined here should represent
- * states from the controller.
- */
-enum {
         HCI_SETUP,
         HCI_AUTO_OFF,
         HCI_MGMT,
@@ -109,18 +85,8 @@ enum {
         HCI_SERVICE_CACHE,
         HCI_LINK_KEYS,
         HCI_DEBUG_KEYS,
-        HCI_UNREGISTER,
-
-        HCI_LE_SCAN,
-        HCI_SSP_ENABLED,
-        HCI_HS_ENABLED,
-        HCI_LE_ENABLED,
-        HCI_LE_PERIPHERAL,
-        HCI_CONNECTABLE,
-        HCI_DISCOVERABLE,
-        HCI_LINK_SECURITY,
-        HCI_PENDING_CLASS,
-        HCI_PERIODIC_INQ,
+
+        HCI_RESET,
 };
 
 /* HCI ioctl defines */
@@ -151,12 +117,12 @@ enum {
 #define HCIINQUIRY      _IOR('H', 240, int)
 
 /* HCI timeouts */
-#define HCI_DISCONN_TIMEOUT     msecs_to_jiffies(2000)  /* 2 seconds */
-#define HCI_PAIRING_TIMEOUT     msecs_to_jiffies(60000) /* 60 seconds */
-#define HCI_INIT_TIMEOUT        msecs_to_jiffies(10000) /* 10 seconds */
-#define HCI_CMD_TIMEOUT         msecs_to_jiffies(2000)  /* 2 seconds */
-#define HCI_ACL_TX_TIMEOUT      msecs_to_jiffies(45000) /* 45 seconds */
-#define HCI_AUTO_OFF_TIMEOUT    msecs_to_jiffies(2000)  /* 2 seconds */
+#define HCI_CONNECT_TIMEOUT     (40000) /* 40 seconds */
+#define HCI_DISCONN_TIMEOUT     (2000)  /* 2 seconds */
+#define HCI_PAIRING_TIMEOUT     (60000) /* 60 seconds */
+#define HCI_IDLE_TIMEOUT        (6000)  /* 6 seconds */
+#define HCI_INIT_TIMEOUT        (10000) /* 10 seconds */
+#define HCI_CMD_TIMEOUT         (1000)  /* 1 seconds */
 
 /* HCI data types */
 #define HCI_COMMAND_PKT         0x01
@@ -192,14 +158,15 @@ enum {
 #define ESCO_2EV5       0x0100
 #define ESCO_3EV5       0x0200
 
-#define SCO_ESCO_MASK  (ESCO_HV1 | ESCO_HV2 | ESCO_HV3)
-#define EDR_ESCO_MASK  (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
+#define SCO_ESCO_MASK   (ESCO_HV1 | ESCO_HV2 | ESCO_HV3)
+#define EDR_ESCO_MASK   (ESCO_2EV3 | ESCO_3EV3 | ESCO_2EV5 | ESCO_3EV5)
+#define ALL_ESCO_MASK   (SCO_ESCO_MASK | ESCO_EV3 | ESCO_EV4 | ESCO_EV5 | \
+                        EDR_ESCO_MASK)
 
 /* ACL flags */
 #define ACL_START_NO_FLUSH      0x00
 #define ACL_CONT                0x01
 #define ACL_START               0x02
-#define ACL_COMPLETE            0x03
 #define ACL_ACTIVE_BCAST        0x04
 #define ACL_PICO_BCAST          0x08
 
@@ -209,7 +176,6 @@ enum {
 #define ESCO_LINK       0x02
 /* Low Energy links do not have defined link type. Use invented one */
 #define LE_LINK         0x80
-#define AMP_LINK        0x81
 
 /* LMP features */
 #define LMP_3SLOT       0x01
@@ -239,7 +205,6 @@ enum {
 
 #define LMP_EV4         0x01
 #define LMP_EV5         0x02
-#define LMP_NO_BREDR    0x20
 #define LMP_LE          0x40
 
 #define LMP_SNIFF_SUBR  0x02
@@ -258,9 +223,7 @@ enum {
 #define LMP_EXTFEATURES 0x80
 
 /* Extended LMP features */
-#define LMP_HOST_SSP            0x01
-#define LMP_HOST_LE             0x02
-#define LMP_HOST_LE_BREDR       0x04
+#define LMP_HOST_LE     0x02
 
 /* Connection modes */
 #define HCI_CM_ACTIVE   0x0000
@@ -299,51 +262,10 @@ enum {
 #define HCI_LK_UNAUTH_COMBINATION       0x04
 #define HCI_LK_AUTH_COMBINATION         0x05
 #define HCI_LK_CHANGED_COMBINATION      0x06
-/* The spec doesn't define types for SMP keys, the _MASTER suffix is implied */
-#define HCI_SMP_STK                     0x80
-#define HCI_SMP_STK_SLAVE               0x81
-#define HCI_SMP_LTK                     0x82
-#define HCI_SMP_LTK_SLAVE               0x83
-
-/* ---- HCI Error Codes ---- */
-#define HCI_ERROR_AUTH_FAILURE          0x05
-#define HCI_ERROR_CONNECTION_TIMEOUT    0x08
-#define HCI_ERROR_REJ_BAD_ADDR          0x0f
-#define HCI_ERROR_REMOTE_USER_TERM      0x13
-#define HCI_ERROR_REMOTE_LOW_RESOURCES  0x14
-#define HCI_ERROR_REMOTE_POWER_OFF      0x15
-#define HCI_ERROR_LOCAL_HOST_TERM       0x16
-#define HCI_ERROR_PAIRING_NOT_ALLOWED   0x18
-
-/* Flow control modes */
-#define HCI_FLOW_CTL_MODE_PACKET_BASED  0x00
-#define HCI_FLOW_CTL_MODE_BLOCK_BASED   0x01
-
-/* The core spec defines 127 as the "not available" value */
-#define HCI_TX_POWER_INVALID    127
-
-/* Extended Inquiry Response field types */
-#define EIR_FLAGS               0x01 /* flags */
-#define EIR_UUID16_SOME         0x02 /* 16-bit UUID, more available */
-#define EIR_UUID16_ALL          0x03 /* 16-bit UUID, all listed */
-#define EIR_UUID32_SOME         0x04 /* 32-bit UUID, more available */
-#define EIR_UUID32_ALL          0x05 /* 32-bit UUID, all listed */
-#define EIR_UUID128_SOME        0x06 /* 128-bit UUID, more available */
-#define EIR_UUID128_ALL         0x07 /* 128-bit UUID, all listed */
-#define EIR_NAME_SHORT          0x08 /* shortened local name */
-#define EIR_NAME_COMPLETE       0x09 /* complete local name */
-#define EIR_TX_POWER            0x0A /* transmit power level */
-#define EIR_CLASS_OF_DEV        0x0D /* Class of Device */
-#define EIR_SSP_HASH_C          0x0E /* Simple Pairing Hash C */
-#define EIR_SSP_RAND_R          0x0F /* Simple Pairing Randomizer R */
-#define EIR_DEVICE_ID           0x10 /* device ID */
-
-/* Low Energy Advertising Flags */
-#define LE_AD_LIMITED           0x01 /* Limited Discoverable */
-#define LE_AD_GENERAL           0x02 /* General Discoverable */
-#define LE_AD_NO_BREDR          0x04 /* BR/EDR not supported */
-#define LE_AD_SIM_LE_BREDR_CTRL 0x08 /* Simultaneous LE & BR/EDR Controller */
-#define LE_AD_SIM_LE_BREDR_HOST 0x10 /* Simultaneous LE & BR/EDR Host */
+/* The spec doesn't define types for SMP keys */
+#define HCI_LK_SMP_LTK                  0x81
+#define HCI_LK_SMP_IRK                  0x82
+#define HCI_LK_SMP_CSRK                 0x83
 
 /* -----  HCI Commands ---- */
 #define HCI_OP_NOP                      0x0000
@@ -357,8 +279,6 @@ struct hci_cp_inquiry {
 
 #define HCI_OP_INQUIRY_CANCEL           0x0402
 
-#define HCI_OP_PERIODIC_INQ             0x0403
-
 #define HCI_OP_EXIT_PERIODIC_INQ        0x0404
 
 #define HCI_OP_CREATE_CONN              0x0405
@@ -403,7 +323,7 @@ struct hci_cp_reject_conn_req {
 #define HCI_OP_LINK_KEY_REPLY           0x040b
 struct hci_cp_link_key_reply {
         bdaddr_t bdaddr;
-        __u8     link_key[HCI_LINK_KEY_SIZE];
+        __u8     link_key[16];
 } __packed;
 
 #define HCI_OP_LINK_KEY_NEG_REPLY       0x040c
@@ -529,14 +449,6 @@ struct hci_rp_user_confirm_reply {
 
 #define HCI_OP_USER_CONFIRM_NEG_REPLY   0x042d
 
-#define HCI_OP_USER_PASSKEY_REPLY               0x042e
-struct hci_cp_user_passkey_reply {
-        bdaddr_t bdaddr;
-        __le32  passkey;
-} __packed;
-
-#define HCI_OP_USER_PASSKEY_NEG_REPLY   0x042f
-
 #define HCI_OP_REMOTE_OOB_DATA_REPLY    0x0430
 struct hci_cp_remote_oob_data_reply {
         bdaddr_t bdaddr;
@@ -555,62 +467,6 @@ struct hci_cp_io_capability_neg_reply {
         __u8     reason;
 } __packed;
 
-#define HCI_OP_CREATE_PHY_LINK          0x0435
-struct hci_cp_create_phy_link {
-        __u8     phy_handle;
-        __u8     key_len;
-        __u8     key_type;
-        __u8     key[HCI_AMP_LINK_KEY_SIZE];
-} __packed;
-
-#define HCI_OP_ACCEPT_PHY_LINK          0x0436
-struct hci_cp_accept_phy_link {
-        __u8     phy_handle;
-        __u8     key_len;
-        __u8     key_type;
-        __u8     key[HCI_AMP_LINK_KEY_SIZE];
-} __packed;
-
-#define HCI_OP_DISCONN_PHY_LINK         0x0437
-struct hci_cp_disconn_phy_link {
-        __u8     phy_handle;
-        __u8     reason;
-} __packed;
-
-struct ext_flow_spec {
-        __u8       id;
-        __u8       stype;
-        __le16     msdu;
-        __le32     sdu_itime;
-        __le32     acc_lat;
-        __le32     flush_to;
-} __packed;
-
-#define HCI_OP_CREATE_LOGICAL_LINK      0x0438
-#define HCI_OP_ACCEPT_LOGICAL_LINK      0x0439
-struct hci_cp_create_accept_logical_link {
-        __u8                  phy_handle;
-        struct ext_flow_spec  tx_flow_spec;
-        struct ext_flow_spec  rx_flow_spec;
-} __packed;
-
-#define HCI_OP_DISCONN_LOGICAL_LINK     0x043a
-struct hci_cp_disconn_logical_link {
-        __le16   log_handle;
-} __packed;
-
-#define HCI_OP_LOGICAL_LINK_CANCEL      0x043b
-struct hci_cp_logical_link_cancel {
-        __u8     phy_handle;
-        __u8     flow_spec_id;
-} __packed;
-
-struct hci_rp_logical_link_cancel {
-        __u8     status;
-        __u8     phy_handle;
-        __u8     flow_spec_id;
-} __packed;
-
 #define HCI_OP_SNIFF_MODE               0x0803
 struct hci_cp_sniff_mode {
         __le16   handle;
@@ -785,8 +641,8 @@ struct hci_cp_host_buffer_size {
 
 #define HCI_OP_WRITE_EIR                0x0c52
 struct hci_cp_write_eir {
-        __u8    fec;
-        __u8    data[HCI_MAX_EIR_LENGTH];
+        uint8_t         fec;
+        uint8_t         data[HCI_MAX_EIR_LENGTH];
 } __packed;
 
 #define HCI_OP_READ_SSP_MODE            0x0c55
@@ -808,21 +664,11 @@ struct hci_rp_read_local_oob_data {
 } __packed;
 
 #define HCI_OP_READ_INQ_RSP_TX_POWER    0x0c58
-struct hci_rp_read_inq_rsp_tx_power {
-        __u8     status;
-        __s8     tx_power;
-} __packed;
-
-#define HCI_OP_READ_FLOW_CONTROL_MODE   0x0c66
-struct hci_rp_read_flow_control_mode {
-        __u8     status;
-        __u8     mode;
-} __packed;
 
 #define HCI_OP_WRITE_LE_HOST_SUPPORTED  0x0c6d
 struct hci_cp_write_le_host_supported {
-        __u8    le;
-        __u8    simul;
+        __u8 le;
+        __u8 simul;
 } __packed;
 
 #define HCI_OP_READ_LOCAL_VERSION       0x1001
@@ -873,64 +719,6 @@ struct hci_rp_read_bd_addr {
         bdaddr_t bdaddr;
 } __packed;
 
-#define HCI_OP_READ_DATA_BLOCK_SIZE     0x100a
-struct hci_rp_read_data_block_size {
-        __u8     status;
-        __le16   max_acl_len;
-        __le16   block_len;
-        __le16   num_blocks;
-} __packed;
-
-#define HCI_OP_WRITE_PAGE_SCAN_ACTIVITY 0x0c1c
-struct hci_cp_write_page_scan_activity {
-        __le16   interval;
-        __le16   window;
-} __packed;
-
-#define HCI_OP_WRITE_PAGE_SCAN_TYPE     0x0c47
-        #define PAGE_SCAN_TYPE_STANDARD         0x00
-        #define PAGE_SCAN_TYPE_INTERLACED       0x01
-
-#define HCI_OP_READ_LOCAL_AMP_INFO      0x1409
-struct hci_rp_read_local_amp_info {
-        __u8     status;
-        __u8     amp_status;
-        __le32   total_bw;
-        __le32   max_bw;
-        __le32   min_latency;
-        __le32   max_pdu;
-        __u8     amp_type;
-        __le16   pal_cap;
-        __le16   max_assoc_size;
-        __le32   max_flush_to;
-        __le32   be_flush_to;
-} __packed;
-
-#define HCI_OP_READ_LOCAL_AMP_ASSOC     0x140a
-struct hci_cp_read_local_amp_assoc {
-        __u8     phy_handle;
-        __le16   len_so_far;
-        __le16   max_len;
-} __packed;
-struct hci_rp_read_local_amp_assoc {
-        __u8     status;
-        __u8     phy_handle;
-        __le16   rem_len;
-        __u8     frag[0];
-} __packed;
-
-#define HCI_OP_WRITE_REMOTE_AMP_ASSOC   0x140b
-struct hci_cp_write_remote_amp_assoc {
-        __u8     phy_handle;
-        __le16   len_so_far;
-        __le16   rem_len;
-        __u8     frag[0];
-} __packed;
-struct hci_rp_write_remote_amp_assoc {
-        __u8     status;
-        __u8     phy_handle;
-} __packed;
-
 #define HCI_OP_LE_SET_EVENT_MASK        0x2001
 struct hci_cp_le_set_event_mask {
         __u8     mask[8];
@@ -943,34 +731,6 @@ struct hci_rp_le_read_buffer_size {
         __u8     le_max_pkt;
 } __packed;
 
-#define HCI_OP_LE_READ_ADV_TX_POWER     0x2007
-struct hci_rp_le_read_adv_tx_power {
-        __u8    status;
-        __s8    tx_power;
-} __packed;
-
-#define HCI_MAX_AD_LENGTH               31
-
-#define HCI_OP_LE_SET_ADV_DATA          0x2008
-struct hci_cp_le_set_adv_data {
-        __u8    length;
-        __u8    data[HCI_MAX_AD_LENGTH];
-} __packed;
-
-#define HCI_OP_LE_SET_ADV_ENABLE        0x200a
-
-#define HCI_OP_LE_SET_SCAN_PARAM        0x200b
-struct hci_cp_le_set_scan_param {
-        __u8    type;
-        __le16  interval;
-        __le16  window;
-        __u8    own_address_type;
-        __u8    filter_policy;
-} __packed;
-
-#define LE_SCANNING_DISABLED            0x00
-#define LE_SCANNING_ENABLED             0x01
-
 #define HCI_OP_LE_SET_SCAN_ENABLE       0x200c
 struct hci_cp_le_set_scan_enable {
         __u8     enable;
@@ -1146,14 +906,9 @@ struct hci_ev_role_change {
 } __packed;
 
 #define HCI_EV_NUM_COMP_PKTS            0x13
-struct hci_comp_pkts_info {
-        __le16   handle;
-        __le16   count;
-} __packed;
-
 struct hci_ev_num_comp_pkts {
         __u8     num_hndl;
-        struct hci_comp_pkts_info handles[0];
+        /* variable length part */
 } __packed;
 
 #define HCI_EV_MODE_CHANGE              0x14
@@ -1177,7 +932,7 @@ struct hci_ev_link_key_req {
 #define HCI_EV_LINK_KEY_NOTIFY          0x18
 struct hci_ev_link_key_notify {
         bdaddr_t bdaddr;
-        __u8     link_key[HCI_LINK_KEY_SIZE];
+        __u8     link_key[16];
         __u8     key_type;
 } __packed;
 
@@ -1273,12 +1028,6 @@ struct extended_inquiry_info {
         __u8     data[240];
 } __packed;
 
-#define HCI_EV_KEY_REFRESH_COMPLETE     0x30
-struct hci_ev_key_refresh_complete {
-        __u8    status;
-        __le16  handle;
-} __packed;
-
 #define HCI_EV_IO_CAPA_REQUEST          0x31
 struct hci_ev_io_capa_request {
         bdaddr_t bdaddr;
@@ -1298,11 +1047,6 @@ struct hci_ev_user_confirm_req {
         __le32          passkey;
 } __packed;
 
-#define HCI_EV_USER_PASSKEY_REQUEST     0x34
-struct hci_ev_user_passkey_req {
-        bdaddr_t        bdaddr;
-} __packed;
-
 #define HCI_EV_REMOTE_OOB_DATA_REQUEST  0x35
 struct hci_ev_remote_oob_data_request {
         bdaddr_t bdaddr;
@@ -1314,24 +1058,6 @@ struct hci_ev_simple_pair_complete {
         bdaddr_t bdaddr;
 } __packed;
 
-#define HCI_EV_USER_PASSKEY_NOTIFY      0x3b
-struct hci_ev_user_passkey_notify {
-        bdaddr_t        bdaddr;
-        __le32          passkey;
-} __packed;
-
-#define HCI_KEYPRESS_STARTED            0
-#define HCI_KEYPRESS_ENTERED            1
-#define HCI_KEYPRESS_ERASED             2
-#define HCI_KEYPRESS_CLEARED            3
-#define HCI_KEYPRESS_COMPLETED          4
-
-#define HCI_EV_KEYPRESS_NOTIFY          0x3c
-struct hci_ev_keypress_notify {
-        bdaddr_t        bdaddr;
-        __u8            type;
-} __packed;
-
 #define HCI_EV_REMOTE_HOST_FEATURES     0x3d
 struct hci_ev_remote_host_features {
         bdaddr_t bdaddr;
@@ -1343,55 +1069,7 @@ struct hci_ev_le_meta {
         __u8     subevent;
 } __packed;
 
-#define HCI_EV_PHY_LINK_COMPLETE        0x40
-struct hci_ev_phy_link_complete {
-        __u8     status;
-        __u8     phy_handle;
-} __packed;
-
-#define HCI_EV_CHANNEL_SELECTED         0x41
-struct hci_ev_channel_selected {
-        __u8     phy_handle;
-} __packed;
-
-#define HCI_EV_DISCONN_PHY_LINK_COMPLETE        0x42
-struct hci_ev_disconn_phy_link_complete {
-        __u8     status;
-        __u8     phy_handle;
-        __u8     reason;
-} __packed;
-
-#define HCI_EV_LOGICAL_LINK_COMPLETE            0x45
-struct hci_ev_logical_link_complete {
-        __u8     status;
-        __le16   handle;
-        __u8     phy_handle;
-        __u8     flow_spec_id;
-} __packed;
-
-#define HCI_EV_DISCONN_LOGICAL_LINK_COMPLETE    0x46
-struct hci_ev_disconn_logical_link_complete {
-        __u8     status;
-        __le16   handle;
-        __u8     reason;
-} __packed;
-
-#define HCI_EV_NUM_COMP_BLOCKS          0x48
-struct hci_comp_blocks_info {
-        __le16   handle;
-        __le16   pkts;
-        __le16   blocks;
-} __packed;
-
-struct hci_ev_num_comp_blocks {
-        __le16   num_blocks;
-        __u8     num_hndl;
-        struct hci_comp_blocks_info handles[0];
-} __packed;
-
 /* Low energy meta events */
-#define LE_CONN_ROLE_MASTER     0x00
-
 #define HCI_EV_LE_CONN_COMPLETE         0x01
 struct hci_ev_le_conn_complete {
         __u8     status;
@@ -1478,6 +1156,7 @@ struct hci_sco_hdr {
         __u8    dlen;
 } __packed;
 
+#include <linux/skbuff.h>
 static inline struct hci_event_hdr *hci_event_hdr(const struct sk_buff *skb)
 {
         return (struct hci_event_hdr *) skb->data;
@@ -1494,12 +1173,12 @@ static inline struct hci_sco_hdr *hci_sco_hdr(const struct sk_buff *skb)
 }
 
 /* Command opcode pack/unpack */
-#define hci_opcode_pack(ogf, ocf)       ((__u16) ((ocf & 0x03ff)|(ogf << 10)))
+#define hci_opcode_pack(ogf, ocf)       (__u16) ((ocf & 0x03ff)|(ogf << 10))
 #define hci_opcode_ogf(op)              (op >> 10)
 #define hci_opcode_ocf(op)              (op & 0x03ff)
 
 /* ACL handle and flags pack/unpack */
-#define hci_handle_pack(h, f)   ((__u16) ((h & 0x0fff)|(f << 12)))
+#define hci_handle_pack(h, f)   (__u16) ((h & 0x0fff)|(f << 12))
 #define hci_handle(h)           (h & 0x0fff)
 #define hci_flags(h)            (h >> 12)
 
@@ -1522,8 +1201,7 @@ struct sockaddr_hci {
 #define HCI_DEV_NONE    0xffff
 
 #define HCI_CHANNEL_RAW         0
-#define HCI_CHANNEL_MONITOR     2
-#define HCI_CHANNEL_CONTROL     3
+#define HCI_CHANNEL_CONTROL     1
 
 struct hci_filter {
         unsigned long type_mask;
@@ -1586,6 +1264,9 @@ struct hci_conn_info {
         __u8     out;
         __u16    state;
         __u32    link_mode;
+        __u32    mtu;
+        __u32    cnt;
+        __u32    pkts;
 };
 
 struct hci_dev_req {
@@ -1624,6 +1305,4 @@ struct hci_inquiry_req {
 };
 #define IREQ_CACHE_FLUSH 0x0001
 
-extern bool enable_hs;
-
 #endif /* __HCI_H */
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 014a2eaa538..626f8b0a679 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -25,10 +25,12 @@
 #ifndef __HCI_CORE_H
 #define __HCI_CORE_H
 
+#include <linux/interrupt.h>
 #include <net/bluetooth/hci.h>
 
-/* HCI priority */
-#define HCI_PRIO_MAX    7
+/* HCI upper protocols */
+#define HCI_PROTO_L2CAP 0
+#define HCI_PROTO_SCO   1
 
 /* HCI Core structures */
 struct inquiry_data {
@@ -43,37 +45,21 @@ struct inquiry_data {
 };
 
 struct inquiry_entry {
-        struct list_head        all;            /* inq_cache.all */
-        struct list_head        list;           /* unknown or resolve */
-        enum {
-                NAME_NOT_KNOWN,
-                NAME_NEEDED,
-                NAME_PENDING,
-                NAME_KNOWN,
-        } name_state;
+        struct inquiry_entry    *next;
         __u32                   timestamp;
         struct inquiry_data     data;
 };
 
-struct discovery_state {
-        int                     type;
-        enum {
-                DISCOVERY_STOPPED,
-                DISCOVERY_STARTING,
-                DISCOVERY_FINDING,
-                DISCOVERY_RESOLVING,
-                DISCOVERY_STOPPING,
-        } state;
-        struct list_head        all;    /* All devices found during inquiry */
-        struct list_head        unknown;        /* Name state not known */
-        struct list_head        resolve;        /* Name needs to be resolved */
+struct inquiry_cache {
+        spinlock_t              lock;
         __u32                   timestamp;
+        struct inquiry_entry    *list;
 };
 
 struct hci_conn_hash {
         struct list_head list;
+        spinlock_t       lock;
         unsigned int     acl_num;
-        unsigned int     amp_num;
         unsigned int     sco_num;
         unsigned int     le_num;
 };
@@ -89,24 +75,28 @@ struct bt_uuid {
         u8 svc_hint;
 };
 
-struct smp_ltk {
-        struct list_head list;
-        bdaddr_t bdaddr;
-        u8 bdaddr_type;
-        u8 authenticated;
-        u8 type;
-        u8 enc_size;
+struct key_master_id {
         __le16 ediv;
         u8 rand[8];
+} __packed;
+
+struct link_key_data {
+        bdaddr_t bdaddr;
+        u8 type;
         u8 val[16];
+        u8 pin_len;
+        u8 dlen;
+        u8 data[0];
 } __packed;
 
 struct link_key {
         struct list_head list;
         bdaddr_t bdaddr;
         u8 type;
-        u8 val[HCI_LINK_KEY_SIZE];
+        u8 val[16];
         u8 pin_len;
+        u8 dlen;
+        u8 data[0];
 };
 
 struct oob_data {
@@ -116,27 +106,17 @@ struct oob_data {
         u8 randomizer[16];
 };
 
-struct le_scan_params {
-        u8 type;
-        u16 interval;
-        u16 window;
-        int timeout;
-};
-
-#define HCI_MAX_SHORT_NAME_LENGTH       10
-
-struct amp_assoc {
-        __u16   len;
-        __u16   offset;
-        __u16   rem_len;
-        __u16   len_so_far;
-        __u8    data[HCI_MAX_AMP_ASSOC_SIZE];
+struct adv_entry {
+        struct list_head list;
+        bdaddr_t bdaddr;
+        u8 bdaddr_type;
 };
 
 #define NUM_REASSEMBLY 4
 struct hci_dev {
         struct list_head list;
-        struct mutex    lock;
+        spinlock_t      lock;
+        atomic_t        refcnt;
 
         char            name[8];
         unsigned long   flags;
@@ -145,26 +125,21 @@ struct hci_dev {
         __u8            dev_type;
         bdaddr_t        bdaddr;
         __u8            dev_name[HCI_MAX_NAME_LENGTH];
-        __u8            short_name[HCI_MAX_SHORT_NAME_LENGTH];
         __u8            eir[HCI_MAX_EIR_LENGTH];
         __u8            dev_class[3];
         __u8            major_class;
         __u8            minor_class;
         __u8            features[8];
-        __u8            host_features[8];
+        __u8            extfeatures[8];
         __u8            commands[64];
+        __u8            ssp_mode;
         __u8            hci_ver;
         __u16           hci_rev;
         __u8            lmp_ver;
         __u16           manufacturer;
-        __u16           lmp_subver;
+        __le16          lmp_subver;
         __u16           voice_setting;
         __u8            io_capability;
-        __s8            inq_tx_power;
-        __u16           devid_source;
-        __u16           devid_vendor;
-        __u16           devid_product;
-        __u16           devid_version;
 
         __u16           pkt_type;
         __u16           esco_type;
@@ -175,21 +150,6 @@ struct hci_dev {
         __u16           sniff_min_interval;
         __u16           sniff_max_interval;
 
-        __u8            amp_status;
-        __u32           amp_total_bw;
-        __u32           amp_max_bw;
-        __u32           amp_min_latency;
-        __u32           amp_max_pdu;
-        __u8            amp_type;
-        __u16           amp_pal_cap;
-        __u16           amp_assoc_size;
-        __u32           amp_max_flush_to;
-        __u32           amp_be_flush_to;
-
-        struct amp_assoc        loc_assoc;
-
-        __u8            flow_ctl_mode;
-
         unsigned int    auto_accept_delay;
 
         unsigned long   quirks;
@@ -206,11 +166,6 @@ struct hci_dev {
         unsigned int    sco_pkts;
         unsigned int    le_pkts;
 
-        __u16           block_len;
-        __u16           block_mtu;
-        __u16           num_blocks;
-        __u16           block_cnt;
-
         unsigned long   acl_last_tx;
         unsigned long   sco_last_tx;
         unsigned long   le_last_tx;
@@ -218,18 +173,13 @@ struct hci_dev {
         struct workqueue_struct *workqueue;
 
         struct work_struct      power_on;
-        struct delayed_work     power_off;
-
-        __u16                   discov_timeout;
-        struct delayed_work     discov_off;
-
-        struct delayed_work     service_cache;
+        struct work_struct      power_off;
+        struct timer_list       off_timer;
 
         struct timer_list       cmd_timer;
-
-        struct work_struct      rx_work;
-        struct work_struct      cmd_work;
-        struct work_struct      tx_work;
+        struct tasklet_struct   cmd_task;
+        struct tasklet_struct   rx_task;
+        struct tasklet_struct   tx_task;
 
         struct sk_buff_head     rx_q;
         struct sk_buff_head     raw_q;
@@ -245,9 +195,9 @@ struct hci_dev {
 
         __u16                   init_last_cmd;
 
-        struct list_head        mgmt_pending;
+        struct crypto_blkcipher *tfm;
 
-        struct discovery_state  discovery;
+        struct inquiry_cache    inq_cache;
         struct hci_conn_hash    conn_hash;
         struct list_head        blacklist;
 
@@ -255,43 +205,38 @@ struct hci_dev {
 
         struct list_head        link_keys;
 
-        struct list_head        long_term_keys;
-
         struct list_head        remote_oob_data;
 
+        struct list_head        adv_entries;
+        struct timer_list       adv_timer;
+
         struct hci_dev_stats    stat;
 
         struct sk_buff_head     driver_init;
 
+        void                    *driver_data;
+        void                    *core_data;
+
         atomic_t                promisc;
 
         struct dentry           *debugfs;
 
+        struct device           *parent;
         struct device           dev;
 
         struct rfkill           *rfkill;
 
-        unsigned long           dev_flags;
-
-        struct delayed_work     le_scan_disable;
-
-        struct work_struct      le_scan;
-        struct le_scan_params   le_scan_params;
-
-        __s8                    adv_tx_power;
-        __u8                    adv_data[HCI_MAX_AD_LENGTH];
-        __u8                    adv_data_len;
+        struct module           *owner;
 
         int (*open)(struct hci_dev *hdev);
         int (*close)(struct hci_dev *hdev);
         int (*flush)(struct hci_dev *hdev);
         int (*send)(struct sk_buff *skb);
+        void (*destruct)(struct hci_dev *hdev);
         void (*notify)(struct hci_dev *hdev, unsigned int evt);
         int (*ioctl)(struct hci_dev *hdev, unsigned int cmd, unsigned long arg);
 };
 
-#define HCI_PHY_HANDLE(handle)  (handle & 0xff)
-
 struct hci_conn {
         struct list_head list;
 
@@ -303,10 +248,11 @@ struct hci_conn {
         __u16           state;
         __u8            mode;
         __u8            type;
-        bool            out;
+        __u8            out;
         __u8            attempt;
         __u8            dev_class[3];
         __u8            features[8];
+        __u8            ssp_mode;
         __u16           interval;
         __u16           pkt_type;
         __u16           link_policy;
@@ -318,33 +264,31 @@ struct hci_conn {
         __u8            pin_length;
         __u8            enc_key_size;
         __u8            io_capability;
-        __u32           passkey_notify;
-        __u8            passkey_entered;
+        __u8            power_save;
         __u16           disc_timeout;
-        unsigned long   flags;
+        unsigned long   pend;
 
         __u8            remote_cap;
+        __u8            remote_oob;
         __u8            remote_auth;
-        __u8            remote_id;
-        bool            flush_key;
 
         unsigned int    sent;
 
         struct sk_buff_head data_q;
-        struct list_head chan_list;
 
-        struct delayed_work disc_work;
+        struct timer_list disc_timer;
         struct timer_list idle_timer;
         struct timer_list auto_accept_timer;
 
+        struct work_struct work_add;
+        struct work_struct work_del;
+
         struct device   dev;
         atomic_t        devref;
 
         struct hci_dev  *hdev;
         void            *l2cap_data;
         void            *sco_data;
-        void            *smp_conn;
-        struct amp_mgr  *amp_mgr;
 
         struct hci_conn *link;
 
@@ -353,58 +297,37 @@ struct hci_conn {
         void (*disconn_cfm_cb)  (struct hci_conn *conn, u8 reason);
 };
 
-struct hci_chan {
-        struct list_head list;
-        __u16 handle;
-        struct hci_conn *conn;
-        struct sk_buff_head data_q;
-        unsigned int    sent;
-        __u8            state;
-};
-
+extern struct hci_proto *hci_proto[];
 extern struct list_head hci_dev_list;
 extern struct list_head hci_cb_list;
 extern rwlock_t hci_dev_list_lock;
 extern rwlock_t hci_cb_list_lock;
 
-/* ----- HCI interface to upper protocols ----- */
-extern int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
-extern void l2cap_connect_cfm(struct hci_conn *hcon, u8 status);
-extern int l2cap_disconn_ind(struct hci_conn *hcon);
-extern void l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason);
-extern int l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt);
-extern int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb,
-                              u16 flags);
-
-extern int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags);
-extern void sco_connect_cfm(struct hci_conn *hcon, __u8 status);
-extern void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason);
-extern int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);
-
 /* ----- Inquiry cache ----- */
 #define INQUIRY_CACHE_AGE_MAX   (HZ*30)   /* 30 seconds */
 #define INQUIRY_ENTRY_AGE_MAX   (HZ*60)   /* 60 seconds */
 
-static inline void discovery_init(struct hci_dev *hdev)
+#define inquiry_cache_lock(c)           spin_lock(&c->lock)
+#define inquiry_cache_unlock(c)         spin_unlock(&c->lock)
+#define inquiry_cache_lock_bh(c)        spin_lock_bh(&c->lock)
+#define inquiry_cache_unlock_bh(c)      spin_unlock_bh(&c->lock)
+
+static inline void inquiry_cache_init(struct hci_dev *hdev)
 {
-        hdev->discovery.state = DISCOVERY_STOPPED;
-        INIT_LIST_HEAD(&hdev->discovery.all);
-        INIT_LIST_HEAD(&hdev->discovery.unknown);
-        INIT_LIST_HEAD(&hdev->discovery.resolve);
+        struct inquiry_cache *c = &hdev->inq_cache;
+        spin_lock_init(&c->lock);
+        c->list = NULL;
 }
 
-bool hci_discovery_active(struct hci_dev *hdev);
-
-void hci_discovery_set_state(struct hci_dev *hdev, int state);
-
 static inline int inquiry_cache_empty(struct hci_dev *hdev)
 {
-        return list_empty(&hdev->discovery.all);
+        struct inquiry_cache *c = &hdev->inq_cache;
+        return c->list == NULL;
 }
 
 static inline long inquiry_cache_age(struct hci_dev *hdev)
 {
-        struct discovery_state *c = &hdev->discovery;
+        struct inquiry_cache *c = &hdev->inq_cache;
         return jiffies - c->timestamp;
 }
 
@@ -414,16 +337,8 @@ static inline long inquiry_entry_age(struct inquiry_entry *e)
 }
 
 struct inquiry_entry *hci_inquiry_cache_lookup(struct hci_dev *hdev,
-                                               bdaddr_t *bdaddr);
-struct inquiry_entry *hci_inquiry_cache_lookup_unknown(struct hci_dev *hdev,
-                                                       bdaddr_t *bdaddr);
-struct inquiry_entry *hci_inquiry_cache_lookup_resolve(struct hci_dev *hdev,
-                                                       bdaddr_t *bdaddr,
-                                                       int state);
-void hci_inquiry_cache_update_resolve(struct hci_dev *hdev,
-                                      struct inquiry_entry *ie);
-bool hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data,
-                              bool name_known, bool *ssp);
+                                                        bdaddr_t *bdaddr);
+void hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data);
 
 /* ----- HCI Connections ----- */
 enum {
@@ -433,31 +348,25 @@ enum {
         HCI_CONN_RSWITCH_PEND,
         HCI_CONN_MODE_CHANGE_PEND,
         HCI_CONN_SCO_SETUP_PEND,
-        HCI_CONN_LE_SMP_PEND,
-        HCI_CONN_MGMT_CONNECTED,
-        HCI_CONN_SSP_ENABLED,
-        HCI_CONN_POWER_SAVE,
-        HCI_CONN_REMOTE_OOB,
 };
 
-static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
+static inline void hci_conn_hash_init(struct hci_dev *hdev)
 {
-        struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
-               test_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
+        struct hci_conn_hash *h = &hdev->conn_hash;
+        INIT_LIST_HEAD(&h->list);
+        spin_lock_init(&h->lock);
+        h->acl_num = 0;
+        h->sco_num = 0;
 }
 
 static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
-        list_add_rcu(&c->list, &h->list);
+        list_add(&c->list, &h->list);
         switch (c->type) {
         case ACL_LINK:
                 h->acl_num++;
                 break;
-        case AMP_LINK:
-                h->amp_num++;
-                break;
         case LE_LINK:
                 h->le_num++;
                 break;
@@ -471,17 +380,11 @@ static inline void hci_conn_hash_add(struct hci_dev *hdev, struct hci_conn *c)
 static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
-
-        list_del_rcu(&c->list);
-        synchronize_rcu();
-
+        list_del(&c->list);
         switch (c->type) {
         case ACL_LINK:
                 h->acl_num--;
                 break;
-        case AMP_LINK:
-                h->amp_num--;
-                break;
         case LE_LINK:
                 h->le_num--;
                 break;
@@ -492,40 +395,18 @@ static inline void hci_conn_hash_del(struct hci_dev *hdev, struct hci_conn *c)
         }
 }
 
-static inline unsigned int hci_conn_num(struct hci_dev *hdev, __u8 type)
-{
-        struct hci_conn_hash *h = &hdev->conn_hash;
-        switch (type) {
-        case ACL_LINK:
-                return h->acl_num;
-        case AMP_LINK:
-                return h->amp_num;
-        case LE_LINK:
-                return h->le_num;
-        case SCO_LINK:
-        case ESCO_LINK:
-                return h->sco_num;
-        default:
-                return 0;
-        }
-}
-
 static inline struct hci_conn *hci_conn_hash_lookup_handle(struct hci_dev *hdev,
                                                                 __u16 handle)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
+        struct list_head *p;
         struct hci_conn  *c;
 
-        rcu_read_lock();
-
-        list_for_each_entry_rcu(c, &h->list, list) {
-                if (c->handle == handle) {
-                        rcu_read_unlock();
+        list_for_each(p, &h->list) {
+                c = list_entry(p, struct hci_conn, list);
+                if (c->handle == handle)
                         return c;
-                }
         }
-        rcu_read_unlock();
-
         return NULL;
 }
 
@@ -533,19 +414,14 @@ static inline struct hci_conn *hci_conn_hash_lookup_ba(struct hci_dev *hdev,
                                                         __u8 type, bdaddr_t *ba)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
+        struct list_head *p;
         struct hci_conn  *c;
 
-        rcu_read_lock();
-
-        list_for_each_entry_rcu(c, &h->list, list) {
-                if (c->type == type && !bacmp(&c->dst, ba)) {
-                        rcu_read_unlock();
+        list_for_each(p, &h->list) {
+                c = list_entry(p, struct hci_conn, list);
+                if (c->type == type && !bacmp(&c->dst, ba))
                         return c;
-                }
         }
-
-        rcu_read_unlock();
-
         return NULL;
 }
 
@@ -553,39 +429,32 @@ static inline struct hci_conn *hci_conn_hash_lookup_state(struct hci_dev *hdev,
                                                         __u8 type, __u16 state)
 {
         struct hci_conn_hash *h = &hdev->conn_hash;
+        struct list_head *p;
         struct hci_conn  *c;
 
-        rcu_read_lock();
-
-        list_for_each_entry_rcu(c, &h->list, list) {
-                if (c->type == type && c->state == state) {
-                        rcu_read_unlock();
+        list_for_each(p, &h->list) {
+                c = list_entry(p, struct hci_conn, list);
+                if (c->type == type && c->state == state)
                         return c;
-                }
         }
-
-        rcu_read_unlock();
-
         return NULL;
 }
 
+void hci_acl_connect(struct hci_conn *conn);
 void hci_acl_disconn(struct hci_conn *conn, __u8 reason);
+void hci_add_sco(struct hci_conn *conn, __u16 handle);
 void hci_setup_sync(struct hci_conn *conn, __u16 handle);
 void hci_sco_setup(struct hci_conn *conn, __u8 status);
 
-struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst);
+struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type,
+                                        __u16 pkt_type, bdaddr_t *dst);
 int hci_conn_del(struct hci_conn *conn);
 void hci_conn_hash_flush(struct hci_dev *hdev);
 void hci_conn_check_pending(struct hci_dev *hdev);
-void hci_conn_accept(struct hci_conn *conn, int mask);
-
-struct hci_chan *hci_chan_create(struct hci_conn *conn);
-void hci_chan_del(struct hci_chan *chan);
-void hci_chan_list_flush(struct hci_conn *conn);
-struct hci_chan *hci_chan_lookup_handle(struct hci_dev *hdev, __u16 handle);
 
-struct hci_conn *hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst,
-                             __u8 dst_type, __u8 sec_level, __u8 auth_type);
+struct hci_conn *hci_connect(struct hci_dev *hdev, int type,
+                                                __u16 pkt_type, bdaddr_t *dst,
+                                                __u8 sec_level, __u8 auth_type);
 int hci_conn_check_link_mode(struct hci_conn *conn);
 int hci_conn_check_secure(struct hci_conn *conn, __u8 sec_level);
 int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type);
@@ -593,107 +462,75 @@ int hci_conn_change_link_key(struct hci_conn *conn);
 int hci_conn_switch_role(struct hci_conn *conn, __u8 role);
 
 void hci_conn_enter_active_mode(struct hci_conn *conn, __u8 force_active);
+void hci_conn_enter_sniff_mode(struct hci_conn *conn);
 
 void hci_conn_hold_device(struct hci_conn *conn);
 void hci_conn_put_device(struct hci_conn *conn);
 
 static inline void hci_conn_hold(struct hci_conn *conn)
 {
-        BT_DBG("hcon %p orig refcnt %d", conn, atomic_read(&conn->refcnt));
-
         atomic_inc(&conn->refcnt);
-        cancel_delayed_work(&conn->disc_work);
+        del_timer(&conn->disc_timer);
 }
 
 static inline void hci_conn_put(struct hci_conn *conn)
 {
-        BT_DBG("hcon %p orig refcnt %d", conn, atomic_read(&conn->refcnt));
-
         if (atomic_dec_and_test(&conn->refcnt)) {
                 unsigned long timeo;
-
-                switch (conn->type) {
-                case ACL_LINK:
-                case LE_LINK:
+                if (conn->type == ACL_LINK) {
                         del_timer(&conn->idle_timer);
                         if (conn->state == BT_CONNECTED) {
-                                timeo = conn->disc_timeout;
+                                timeo = msecs_to_jiffies(conn->disc_timeout);
                                 if (!conn->out)
-                                        timeo *= 2;
+                                        timeo *= 20;
                         } else {
                                 timeo = msecs_to_jiffies(10);
                         }
-                        break;
-
-                case AMP_LINK:
-                        timeo = conn->disc_timeout;
-                        break;
-
-                default:
+                } else {
                         timeo = msecs_to_jiffies(10);
-                        break;
                 }
-
-                cancel_delayed_work(&conn->disc_work);
-                queue_delayed_work(conn->hdev->workqueue,
-                                   &conn->disc_work, timeo);
+                mod_timer(&conn->disc_timer, jiffies + timeo);
         }
 }
 
 /* ----- HCI Devices ----- */
-static inline void hci_dev_put(struct hci_dev *d)
+static inline void __hci_dev_put(struct hci_dev *d)
 {
-        BT_DBG("%s orig refcnt %d", d->name,
-               atomic_read(&d->dev.kobj.kref.refcount));
-
-        put_device(&d->dev);
+        if (atomic_dec_and_test(&d->refcnt))
+                d->destruct(d);
 }
 
-static inline struct hci_dev *hci_dev_hold(struct hci_dev *d)
+static inline void hci_dev_put(struct hci_dev *d)
 {
-        BT_DBG("%s orig refcnt %d", d->name,
-               atomic_read(&d->dev.kobj.kref.refcount));
-
-        get_device(&d->dev);
-        return d;
+        __hci_dev_put(d);
+        module_put(d->owner);
 }
 
-#define hci_dev_lock(d)         mutex_lock(&d->lock)
-#define hci_dev_unlock(d)       mutex_unlock(&d->lock)
-
-#define to_hci_dev(d) container_of(d, struct hci_dev, dev)
-#define to_hci_conn(c) container_of(c, struct hci_conn, dev)
-
-static inline void *hci_get_drvdata(struct hci_dev *hdev)
+static inline struct hci_dev *__hci_dev_hold(struct hci_dev *d)
 {
-        return dev_get_drvdata(&hdev->dev);
+        atomic_inc(&d->refcnt);
+        return d;
 }
 
-static inline void hci_set_drvdata(struct hci_dev *hdev, void *data)
+static inline struct hci_dev *hci_dev_hold(struct hci_dev *d)
 {
-        dev_set_drvdata(&hdev->dev, data);
+        if (try_module_get(d->owner))
+                return __hci_dev_hold(d);
+        return NULL;
 }
 
-/* hci_dev_list shall be locked */
-static inline uint8_t __hci_num_ctrl(void)
-{
-        uint8_t count = 0;
-        struct list_head *p;
-
-        list_for_each(p, &hci_dev_list) {
-                count++;
-        }
-
-        return count;
-}
+#define hci_dev_lock(d)         spin_lock(&d->lock)
+#define hci_dev_unlock(d)       spin_unlock(&d->lock)
+#define hci_dev_lock_bh(d)      spin_lock_bh(&d->lock)
+#define hci_dev_unlock_bh(d)    spin_unlock_bh(&d->lock)
 
 struct hci_dev *hci_dev_get(int index);
-struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src);
+struct hci_dev *hci_get_route(bdaddr_t *src, bdaddr_t *dst);
 
 struct hci_dev *hci_alloc_dev(void);
 void hci_free_dev(struct hci_dev *hdev);
 int hci_register_dev(struct hci_dev *hdev);
-void hci_unregister_dev(struct hci_dev *hdev);
+int hci_unregister_dev(struct hci_dev *hdev);
 int hci_suspend_dev(struct hci_dev *hdev);
 int hci_resume_dev(struct hci_dev *hdev);
 int hci_dev_open(__u16 dev);
@@ -708,26 +545,22 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg);
 int hci_get_auth_info(struct hci_dev *hdev, void __user *arg);
 int hci_inquiry(void __user *arg);
 
-struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev,
-                                         bdaddr_t *bdaddr);
+struct bdaddr_list *hci_blacklist_lookup(struct hci_dev *hdev, bdaddr_t *bdaddr);
 int hci_blacklist_clear(struct hci_dev *hdev);
-int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
+int hci_blacklist_add(struct hci_dev *hdev, bdaddr_t *bdaddr);
+int hci_blacklist_del(struct hci_dev *hdev, bdaddr_t *bdaddr);
 
 int hci_uuids_clear(struct hci_dev *hdev);
 
 int hci_link_keys_clear(struct hci_dev *hdev);
 struct link_key *hci_find_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
 int hci_add_link_key(struct hci_dev *hdev, struct hci_conn *conn, int new_key,
-                     bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);
-struct smp_ltk *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8]);
-int hci_add_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 addr_type, u8 type,
-                int new_key, u8 authenticated, u8 tk[16], u8 enc_size,
-                __le16 ediv, u8 rand[8]);
-struct smp_ltk *hci_find_ltk_by_addr(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                     u8 addr_type);
-int hci_remove_ltk(struct hci_dev *hdev, bdaddr_t *bdaddr);
-int hci_smp_ltks_clear(struct hci_dev *hdev);
+                        bdaddr_t *bdaddr, u8 *val, u8 type, u8 pin_len);
+struct link_key *hci_find_ltk(struct hci_dev *hdev, __le16 ediv, u8 rand[8]);
+struct link_key *hci_find_link_key_type(struct hci_dev *hdev,
+                                        bdaddr_t *bdaddr, u8 type);
+int hci_add_ltk(struct hci_dev *hdev, int new_key, bdaddr_t *bdaddr,
+                        u8 key_size, __le16 ediv, u8 rand[8], u8 ltk[16]);
 int hci_remove_link_key(struct hci_dev *hdev, bdaddr_t *bdaddr);
 
 int hci_remote_oob_data_clear(struct hci_dev *hdev);
@@ -737,7 +570,13 @@ int hci_add_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 *hash,
                                                                 u8 *randomizer);
 int hci_remove_remote_oob_data(struct hci_dev *hdev, bdaddr_t *bdaddr);
 
-int hci_update_ad(struct hci_dev *hdev);
+#define ADV_CLEAR_TIMEOUT (3*60*HZ) /* Three minutes */
+int hci_adv_entries_clear(struct hci_dev *hdev);
+struct adv_entry *hci_find_adv_entry(struct hci_dev *hdev, bdaddr_t *bdaddr);
+int hci_add_adv_entry(struct hci_dev *hdev,
+                                        struct hci_ev_le_advertising_info *ev);
+
+void hci_del_off_timer(struct hci_dev *hdev);
 
 void hci_event_packet(struct hci_dev *hdev, struct sk_buff *skb);
 
@@ -745,93 +584,75 @@ int hci_recv_frame(struct sk_buff *skb);
 int hci_recv_fragment(struct hci_dev *hdev, int type, void *data, int count);
 int hci_recv_stream_fragment(struct hci_dev *hdev, void *data, int count);
 
-void hci_init_sysfs(struct hci_dev *hdev);
-int hci_add_sysfs(struct hci_dev *hdev);
-void hci_del_sysfs(struct hci_dev *hdev);
+int hci_register_sysfs(struct hci_dev *hdev);
+void hci_unregister_sysfs(struct hci_dev *hdev);
 void hci_conn_init_sysfs(struct hci_conn *conn);
 void hci_conn_add_sysfs(struct hci_conn *conn);
 void hci_conn_del_sysfs(struct hci_conn *conn);
 
-#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->dev.parent = (pdev))
+#define SET_HCIDEV_DEV(hdev, pdev) ((hdev)->parent = (pdev))
 
 /* ----- LMP capabilities ----- */
-#define lmp_encrypt_capable(dev)   ((dev)->features[0] & LMP_ENCRYPT)
 #define lmp_rswitch_capable(dev)   ((dev)->features[0] & LMP_RSWITCH)
-#define lmp_hold_capable(dev)      ((dev)->features[0] & LMP_HOLD)
+#define lmp_encrypt_capable(dev)   ((dev)->features[0] & LMP_ENCRYPT)
 #define lmp_sniff_capable(dev)     ((dev)->features[0] & LMP_SNIFF)
-#define lmp_park_capable(dev)      ((dev)->features[1] & LMP_PARK)
-#define lmp_inq_rssi_capable(dev)  ((dev)->features[3] & LMP_RSSI_INQ)
-#define lmp_esco_capable(dev)      ((dev)->features[3] & LMP_ESCO)
-#define lmp_bredr_capable(dev)     (!((dev)->features[4] & LMP_NO_BREDR))
-#define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)
 #define lmp_sniffsubr_capable(dev) ((dev)->features[5] & LMP_SNIFF_SUBR)
-#define lmp_pause_enc_capable(dev) ((dev)->features[5] & LMP_PAUSE_ENC)
-#define lmp_ext_inq_capable(dev)   ((dev)->features[6] & LMP_EXT_INQ)
-#define lmp_le_br_capable(dev)     !!((dev)->features[6] & LMP_SIMUL_LE_BR)
+#define lmp_esco_capable(dev)      ((dev)->features[3] & LMP_ESCO)
 #define lmp_ssp_capable(dev)       ((dev)->features[6] & LMP_SIMPLE_PAIR)
 #define lmp_no_flush_capable(dev)  ((dev)->features[6] & LMP_NO_FLUSH)
-#define lmp_lsto_capable(dev)      ((dev)->features[7] & LMP_LSTO)
-#define lmp_inq_tx_pwr_capable(dev) ((dev)->features[7] & LMP_INQ_TX_PWR)
-#define lmp_ext_feat_capable(dev)  ((dev)->features[7] & LMP_EXTFEATURES)
+#define lmp_le_capable(dev)        ((dev)->features[4] & LMP_LE)
 
 /* ----- Extended LMP capabilities ----- */
-#define lmp_host_ssp_capable(dev)  ((dev)->host_features[0] & LMP_HOST_SSP)
-#define lmp_host_le_capable(dev)   !!((dev)->host_features[0] & LMP_HOST_LE)
-#define lmp_host_le_br_capable(dev) !!((dev)->host_features[0] & LMP_HOST_LE_BREDR)
-
-/* returns true if at least one AMP active */
-static inline bool hci_amp_capable(void)
-{
-        struct hci_dev *hdev;
-        bool ret = false;
-
-        read_lock(&hci_dev_list_lock);
-        list_for_each_entry(hdev, &hci_dev_list, list)
-                if (hdev->amp_type == HCI_AMP &&
-                    test_bit(HCI_UP, &hdev->flags))
-                        ret = true;
-        read_unlock(&hci_dev_list_lock);
-
-        return ret;
-}
+#define lmp_host_le_capable(dev)   ((dev)->extfeatures[0] & LMP_HOST_LE)
 
 /* ----- HCI protocols ----- */
-#define HCI_PROTO_DEFER             0x01
+struct hci_proto {
+        char            *name;
+        unsigned int    id;
+        unsigned long   flags;
+
+        void            *priv;
+
+        int (*connect_ind)      (struct hci_dev *hdev, bdaddr_t *bdaddr,
+                                                                __u8 type);
+        int (*connect_cfm)      (struct hci_conn *conn, __u8 status);
+        int (*disconn_ind)      (struct hci_conn *conn);
+        int (*disconn_cfm)      (struct hci_conn *conn, __u8 reason);
+        int (*recv_acldata)     (struct hci_conn *conn, struct sk_buff *skb,
+                                                                __u16 flags);
+        int (*recv_scodata)     (struct hci_conn *conn, struct sk_buff *skb);
+        int (*security_cfm)     (struct hci_conn *conn, __u8 status,
+                                                                __u8 encrypt);
+};
 
 static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                        __u8 type, __u8 *flags)
+                                                                __u8 type)
 {
-        switch (type) {
-        case ACL_LINK:
-                return l2cap_connect_ind(hdev, bdaddr);
+        register struct hci_proto *hp;
+        int mask = 0;
 
-        case SCO_LINK:
-        case ESCO_LINK:
-                return sco_connect_ind(hdev, bdaddr, flags);
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->connect_ind)
+                mask |= hp->connect_ind(hdev, bdaddr, type);
 
-        default:
-                BT_ERR("unknown link type %d", type);
-                return -EINVAL;
-        }
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->connect_ind)
+                mask |= hp->connect_ind(hdev, bdaddr, type);
+
+        return mask;
 }
 
 static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status)
 {
-        switch (conn->type) {
-        case ACL_LINK:
-        case LE_LINK:
-                l2cap_connect_cfm(conn, status);
-                break;
+        register struct hci_proto *hp;
 
-        case SCO_LINK:
-        case ESCO_LINK:
-                sco_connect_cfm(conn, status);
-                break;
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->connect_cfm)
+                hp->connect_cfm(conn, status);
 
-        default:
-                BT_ERR("unknown link type %d", conn->type);
-                break;
-        }
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->connect_cfm)
+                hp->connect_cfm(conn, status);
 
         if (conn->connect_cfm_cb)
                 conn->connect_cfm_cb(conn, status);
@@ -839,33 +660,31 @@ static inline void hci_proto_connect_cfm(struct hci_conn *conn, __u8 status)
 
 static inline int hci_proto_disconn_ind(struct hci_conn *conn)
 {
-        if (conn->type != ACL_LINK && conn->type != LE_LINK)
-                return HCI_ERROR_REMOTE_USER_TERM;
+        register struct hci_proto *hp;
+        int reason = 0x13;
+
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->disconn_ind)
+                reason = hp->disconn_ind(conn);
+
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->disconn_ind)
+                reason = hp->disconn_ind(conn);
 
-        return l2cap_disconn_ind(conn);
+        return reason;
 }
 
 static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason)
 {
-        switch (conn->type) {
-        case ACL_LINK:
-        case LE_LINK:
-                l2cap_disconn_cfm(conn, reason);
-                break;
-
-        case SCO_LINK:
-        case ESCO_LINK:
-                sco_disconn_cfm(conn, reason);
-                break;
+        register struct hci_proto *hp;
 
-        /* L2CAP would be handled for BREDR chan */
-        case AMP_LINK:
-                break;
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->disconn_cfm)
+                hp->disconn_cfm(conn, reason);
 
-        default:
-                BT_ERR("unknown link type %d", conn->type);
-                break;
-        }
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->disconn_cfm)
+                hp->disconn_cfm(conn, reason);
 
         if (conn->disconn_cfm_cb)
                 conn->disconn_cfm_cb(conn, reason);
@@ -873,16 +692,21 @@ static inline void hci_proto_disconn_cfm(struct hci_conn *conn, __u8 reason)
 
 static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
 {
+        register struct hci_proto *hp;
         __u8 encrypt;
 
-        if (conn->type != ACL_LINK && conn->type != LE_LINK)
-                return;
-
-        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))
+        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
                 return;
 
         encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
-        l2cap_security_cfm(conn, status, encrypt);
+
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
+
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 
         if (conn->security_cfm_cb)
                 conn->security_cfm_cb(conn, status);
@@ -891,15 +715,23 @@ static inline void hci_proto_auth_cfm(struct hci_conn *conn, __u8 status)
 static inline void hci_proto_encrypt_cfm(struct hci_conn *conn, __u8 status,
                                                                 __u8 encrypt)
 {
-        if (conn->type != ACL_LINK && conn->type != LE_LINK)
-                return;
+        register struct hci_proto *hp;
+
+        hp = hci_proto[HCI_PROTO_L2CAP];
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 
-        l2cap_security_cfm(conn, status, encrypt);
+        hp = hci_proto[HCI_PROTO_SCO];
+        if (hp && hp->security_cfm)
+                hp->security_cfm(conn, status, encrypt);
 
         if (conn->security_cfm_cb)
                 conn->security_cfm_cb(conn, status);
 }
 
+int hci_register_proto(struct hci_proto *hproto);
+int hci_unregister_proto(struct hci_proto *hproto);
+
 /* ----- HCI callbacks ----- */
 struct hci_cb {
         struct list_head list;
@@ -914,28 +746,29 @@ struct hci_cb {
 
 static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
 {
-        struct hci_cb *cb;
+        struct list_head *p;
         __u8 encrypt;
 
         hci_proto_auth_cfm(conn, status);
 
-        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->flags))
+        if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
                 return;
 
         encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
 
-        read_lock(&hci_cb_list_lock);
-        list_for_each_entry(cb, &hci_cb_list, list) {
+        read_lock_bh(&hci_cb_list_lock);
+        list_for_each(p, &hci_cb_list) {
+                struct hci_cb *cb = list_entry(p, struct hci_cb, list);
                 if (cb->security_cfm)
                         cb->security_cfm(conn, status, encrypt);
         }
-        read_unlock(&hci_cb_list_lock);
+        read_unlock_bh(&hci_cb_list_lock);
 }
 
 static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
                                                                 __u8 encrypt)
 {
-        struct hci_cb *cb;
+        struct list_head *p;
 
         if (conn->sec_level == BT_SECURITY_SDP)
                 conn->sec_level = BT_SECURITY_LOW;
@@ -945,180 +778,88 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
 
         hci_proto_encrypt_cfm(conn, status, encrypt);
 
-        read_lock(&hci_cb_list_lock);
-        list_for_each_entry(cb, &hci_cb_list, list) {
+        read_lock_bh(&hci_cb_list_lock);
+        list_for_each(p, &hci_cb_list) {
+                struct hci_cb *cb = list_entry(p, struct hci_cb, list);
                 if (cb->security_cfm)
                         cb->security_cfm(conn, status, encrypt);
         }
-        read_unlock(&hci_cb_list_lock);
+        read_unlock_bh(&hci_cb_list_lock);
 }
 
 static inline void hci_key_change_cfm(struct hci_conn *conn, __u8 status)
 {
-        struct hci_cb *cb;
+        struct list_head *p;
 
-        read_lock(&hci_cb_list_lock);
-        list_for_each_entry(cb, &hci_cb_list, list) {
+        read_lock_bh(&hci_cb_list_lock);
+        list_for_each(p, &hci_cb_list) {
+                struct hci_cb *cb = list_entry(p, struct hci_cb, list);
                 if (cb->key_change_cfm)
                         cb->key_change_cfm(conn, status);
         }
-        read_unlock(&hci_cb_list_lock);
+        read_unlock_bh(&hci_cb_list_lock);
 }
 
 static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
                                                                 __u8 role)
 {
-        struct hci_cb *cb;
+        struct list_head *p;
 
-        read_lock(&hci_cb_list_lock);
-        list_for_each_entry(cb, &hci_cb_list, list) {
+        read_lock_bh(&hci_cb_list_lock);
+        list_for_each(p, &hci_cb_list) {
+                struct hci_cb *cb = list_entry(p, struct hci_cb, list);
                 if (cb->role_switch_cfm)
                         cb->role_switch_cfm(conn, status, role);
         }
-        read_unlock(&hci_cb_list_lock);
-}
-
-static inline bool eir_has_data_type(u8 *data, size_t data_len, u8 type)
-{
-        size_t parsed = 0;
-
-        if (data_len < 2)
-                return false;
-
-        while (parsed < data_len - 1) {
-                u8 field_len = data[0];
-
-                if (field_len == 0)
-                        break;
-
-                parsed += field_len + 1;
-
-                if (parsed > data_len)
-                        break;
-
-                if (data[1] == type)
-                        return true;
-
-                data += field_len + 1;
-        }
-
-        return false;
-}
-
-static inline size_t eir_get_length(u8 *eir, size_t eir_len)
-{
-        size_t parsed = 0;
-
-        while (parsed < eir_len) {
-                u8 field_len = eir[0];
-
-                if (field_len == 0)
-                        return parsed;
-
-                parsed += field_len + 1;
-                eir += field_len + 1;
-        }
-
-        return eir_len;
-}
-
-static inline u16 eir_append_data(u8 *eir, u16 eir_len, u8 type, u8 *data,
-                                  u8 data_len)
-{
-        eir[eir_len++] = sizeof(type) + data_len;
-        eir[eir_len++] = type;
-        memcpy(&eir[eir_len], data, data_len);
-        eir_len += data_len;
-
-        return eir_len;
+        read_unlock_bh(&hci_cb_list_lock);
 }
 
 int hci_register_cb(struct hci_cb *hcb);
 int hci_unregister_cb(struct hci_cb *hcb);
 
+int hci_register_notifier(struct notifier_block *nb);
+int hci_unregister_notifier(struct notifier_block *nb);
+
 int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);
-void hci_send_acl(struct hci_chan *chan, struct sk_buff *skb, __u16 flags);
+void hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags);
 void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb);
 
 void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);
 
-/* ----- HCI Sockets ----- */
-void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);
-void hci_send_to_control(struct sk_buff *skb, struct sock *skip_sk);
-void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb);
+void hci_si_event(struct hci_dev *hdev, int type, int dlen, void *data);
 
-void hci_sock_dev_event(struct hci_dev *hdev, int event);
+/* ----- HCI Sockets ----- */
+void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb,
+                                                        struct sock *skip_sk);
 
 /* Management interface */
-#define DISCOV_TYPE_BREDR               (BIT(BDADDR_BREDR))
-#define DISCOV_TYPE_LE                  (BIT(BDADDR_LE_PUBLIC) | \
-                                         BIT(BDADDR_LE_RANDOM))
-#define DISCOV_TYPE_INTERLEAVED         (BIT(BDADDR_BREDR) | \
-                                         BIT(BDADDR_LE_PUBLIC) | \
-                                         BIT(BDADDR_LE_RANDOM))
-
 int mgmt_control(struct sock *sk, struct msghdr *msg, size_t len);
-int mgmt_index_added(struct hci_dev *hdev);
-int mgmt_index_removed(struct hci_dev *hdev);
-int mgmt_powered(struct hci_dev *hdev, u8 powered);
-int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable);
-int mgmt_connectable(struct hci_dev *hdev, u8 connectable);
-int mgmt_write_scan_failed(struct hci_dev *hdev, u8 scan, u8 status);
-int mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
-                      bool persistent);
-int mgmt_device_connected(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                          u8 addr_type, u32 flags, u8 *name, u8 name_len,
-                          u8 *dev_class);
-int mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                             u8 link_type, u8 addr_type, u8 reason);
-int mgmt_disconnect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                           u8 link_type, u8 addr_type, u8 status);
-int mgmt_connect_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                        u8 addr_type, u8 status);
-int mgmt_pin_code_request(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 secure);
-int mgmt_pin_code_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                 u8 status);
-int mgmt_pin_code_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                     u8 status);
-int mgmt_user_confirm_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                              u8 link_type, u8 addr_type, __le32 value,
-                              u8 confirm_hint);
-int mgmt_user_confirm_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                     u8 link_type, u8 addr_type, u8 status);
-int mgmt_user_confirm_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                         u8 link_type, u8 addr_type, u8 status);
-int mgmt_user_passkey_request(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                              u8 link_type, u8 addr_type);
-int mgmt_user_passkey_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                     u8 link_type, u8 addr_type, u8 status);
-int mgmt_user_passkey_neg_reply_complete(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                                         u8 link_type, u8 addr_type, u8 status);
-int mgmt_user_passkey_notify(struct hci_dev *hdev, bdaddr_t *bdaddr,
-                             u8 link_type, u8 addr_type, u32 passkey,
-                             u8 entered);
-int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                     u8 addr_type, u8 status);
-int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status);
-int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);
-int mgmt_set_class_of_dev_complete(struct hci_dev *hdev, u8 *dev_class,
-                                   u8 status);
-int mgmt_set_local_name_complete(struct hci_dev *hdev, u8 *name, u8 status);
-int mgmt_read_local_oob_data_reply_complete(struct hci_dev *hdev, u8 *hash,
-                                            u8 *randomizer, u8 status);
-int mgmt_le_enable_complete(struct hci_dev *hdev, u8 enable, u8 status);
-int mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                      u8 addr_type, u8 *dev_class, s8 rssi, u8 cfm_name,
-                      u8 ssp, u8 *eir, u16 eir_len);
-int mgmt_remote_name(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
-                     u8 addr_type, s8 rssi, u8 *name, u8 name_len);
-int mgmt_start_discovery_failed(struct hci_dev *hdev, u8 status);
-int mgmt_stop_discovery_failed(struct hci_dev *hdev, u8 status);
-int mgmt_discovering(struct hci_dev *hdev, u8 discovering);
-int mgmt_interleaved_discovery(struct hci_dev *hdev);
-int mgmt_device_blocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-int mgmt_device_unblocked(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 type);
-bool mgmt_valid_hdev(struct hci_dev *hdev);
-int mgmt_new_ltk(struct hci_dev *hdev, struct smp_ltk *key, u8 persistent);
+int mgmt_index_added(u16 index);
+int mgmt_index_removed(u16 index);
+int mgmt_powered(u16 index, u8 powered);
+int mgmt_discoverable(u16 index, u8 discoverable);
+int mgmt_connectable(u16 index, u8 connectable);
+int mgmt_new_key(u16 index, struct link_key *key, u8 persistent);
+int mgmt_connected(u16 index, bdaddr_t *bdaddr);
+int mgmt_disconnected(u16 index, bdaddr_t *bdaddr);
+int mgmt_disconnect_failed(u16 index);
+int mgmt_connect_failed(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_pin_code_request(u16 index, bdaddr_t *bdaddr, u8 secure);
+int mgmt_pin_code_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_pin_code_neg_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_user_confirm_request(u16 index, bdaddr_t *bdaddr, __le32 value,
+                                                        u8 confirm_hint);
+int mgmt_user_confirm_reply_complete(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_user_confirm_neg_reply_complete(u16 index, bdaddr_t *bdaddr,
+                                                                u8 status);
+int mgmt_auth_failed(u16 index, bdaddr_t *bdaddr, u8 status);
+int mgmt_set_local_name_complete(u16 index, u8 *name, u8 status);
+int mgmt_read_local_oob_data_reply_complete(u16 index, u8 *hash, u8 *randomizer,
+                                                                u8 status);
+int mgmt_device_found(u16 index, bdaddr_t *bdaddr, u8 *dev_class, s8 rssi,
+                                                                u8 *eir);
+int mgmt_remote_name(u16 index, bdaddr_t *bdaddr, u8 *name);
+int mgmt_discovering(u16 index, u8 discovering);
 
 /* HCI info for socket */
 #define hci_pi(sk) ((struct hci_pinfo *) sk)
@@ -1154,12 +895,7 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
                                         u16 latency, u16 to_multiplier);
 void hci_le_start_enc(struct hci_conn *conn, __le16 ediv, __u8 rand[8],
                                                         __u8 ltk[16]);
-int hci_do_inquiry(struct hci_dev *hdev, u8 length);
-int hci_cancel_inquiry(struct hci_dev *hdev);
-int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
-                int timeout);
-int hci_cancel_le_scan(struct hci_dev *hdev);
-
-u8 bdaddr_to_le(u8 bdaddr_type);
+void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16]);
+void hci_le_ltk_neg_reply(struct hci_conn *conn);
 
 #endif /* __HCI_CORE_H */
diff --git a/include/net/bluetooth/hci_mon.h b/include/net/bluetooth/hci_mon.h
deleted file mode 100644
index 77d1e576418..00000000000
--- a/include/net/bluetooth/hci_mon.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-   BlueZ - Bluetooth protocol stack for Linux
-
-   Copyright (C) 2011-2012  Intel Corporation
-
-   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
-   published by the Free Software Foundation;
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-   IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS
-   SOFTWARE IS DISCLAIMED.
-*/
-
-#ifndef __HCI_MON_H
-#define __HCI_MON_H
-
-struct hci_mon_hdr {
-        __le16  opcode;
-        __le16  index;
-        __le16  len;
-} __packed;
-#define HCI_MON_HDR_SIZE 6
-
-#define HCI_MON_NEW_INDEX       0
-#define HCI_MON_DEL_INDEX       1
-#define HCI_MON_COMMAND_PKT     2
-#define HCI_MON_EVENT_PKT       3
-#define HCI_MON_ACL_TX_PKT      4
-#define HCI_MON_ACL_RX_PKT      5
-#define HCI_MON_SCO_TX_PKT      6
-#define HCI_MON_SCO_RX_PKT      7
-
-struct hci_mon_new_index {
-        __u8            type;
-        __u8            bus;
-        bdaddr_t        bdaddr;
-        char            name[8];
-} __packed;
-#define HCI_MON_NEW_INDEX_SIZE 16
-
-#endif /* __HCI_MON_H */
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 7588ef44eba..4f34ad25e75 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -27,35 +27,20 @@
 #ifndef __L2CAP_H
 #define __L2CAP_H
 
-#include <asm/unaligned.h>
-
 /* L2CAP defaults */
 #define L2CAP_DEFAULT_MTU               672
 #define L2CAP_DEFAULT_MIN_MTU           48
-#define L2CAP_DEFAULT_FLUSH_TO          0xFFFF
-#define L2CAP_EFS_DEFAULT_FLUSH_TO      0xFFFFFFFF
+#define L2CAP_DEFAULT_FLUSH_TO          0xffff
 #define L2CAP_DEFAULT_TX_WINDOW         63
-#define L2CAP_DEFAULT_EXT_WINDOW        0x3FFF
 #define L2CAP_DEFAULT_MAX_TX            3
 #define L2CAP_DEFAULT_RETRANS_TO        2000    /* 2 seconds */
 #define L2CAP_DEFAULT_MONITOR_TO        12000   /* 12 seconds */
-#define L2CAP_DEFAULT_MAX_PDU_SIZE      1492    /* Sized for AMP packet */
+#define L2CAP_DEFAULT_MAX_PDU_SIZE      1009    /* Sized for 3-DH5 packet */
 #define L2CAP_DEFAULT_ACK_TO            200
-#define L2CAP_DEFAULT_MAX_SDU_SIZE      0xFFFF
-#define L2CAP_DEFAULT_SDU_ITIME         0xFFFFFFFF
-#define L2CAP_DEFAULT_ACC_LAT           0xFFFFFFFF
-#define L2CAP_BREDR_MAX_PAYLOAD         1019    /* 3-DH5 packet */
-#define L2CAP_LE_MIN_MTU                23
-
-#define L2CAP_DISC_TIMEOUT              msecs_to_jiffies(100)
-#define L2CAP_DISC_REJ_TIMEOUT          msecs_to_jiffies(5000)
-#define L2CAP_ENC_TIMEOUT               msecs_to_jiffies(5000)
-#define L2CAP_CONN_TIMEOUT              msecs_to_jiffies(40000)
-#define L2CAP_INFO_TIMEOUT              msecs_to_jiffies(4000)
-#define L2CAP_MOVE_TIMEOUT              msecs_to_jiffies(4000)
-#define L2CAP_MOVE_ERTX_TIMEOUT         msecs_to_jiffies(60000)
-
-#define L2CAP_A2MP_DEFAULT_MTU          670
+#define L2CAP_LE_DEFAULT_MTU            23
+
+#define L2CAP_CONN_TIMEOUT      (40000) /* 40 seconds */
+#define L2CAP_INFO_TIMEOUT      (4000)  /*  4 seconds */
 
 /* L2CAP socket address */
 struct sockaddr_l2 {
@@ -63,7 +48,6 @@ struct sockaddr_l2 {
         __le16          l2_psm;
         bdaddr_t        l2_bdaddr;
         __le16          l2_cid;
-        __u8            l2_bdaddr_type;
 };
 
 /* L2CAP socket options */
@@ -104,86 +88,52 @@ struct l2cap_conninfo {
 #define L2CAP_ECHO_RSP          0x09
 #define L2CAP_INFO_REQ          0x0a
 #define L2CAP_INFO_RSP          0x0b
-#define L2CAP_CREATE_CHAN_REQ   0x0c
-#define L2CAP_CREATE_CHAN_RSP   0x0d
-#define L2CAP_MOVE_CHAN_REQ     0x0e
-#define L2CAP_MOVE_CHAN_RSP     0x0f
-#define L2CAP_MOVE_CHAN_CFM     0x10
-#define L2CAP_MOVE_CHAN_CFM_RSP 0x11
 #define L2CAP_CONN_PARAM_UPDATE_REQ     0x12
 #define L2CAP_CONN_PARAM_UPDATE_RSP     0x13
 
-/* L2CAP extended feature mask */
+/* L2CAP feature mask */
 #define L2CAP_FEAT_FLOWCTL      0x00000001
 #define L2CAP_FEAT_RETRANS      0x00000002
-#define L2CAP_FEAT_BIDIR_QOS    0x00000004
 #define L2CAP_FEAT_ERTM         0x00000008
 #define L2CAP_FEAT_STREAMING    0x00000010
 #define L2CAP_FEAT_FCS          0x00000020
-#define L2CAP_FEAT_EXT_FLOW     0x00000040
 #define L2CAP_FEAT_FIXED_CHAN   0x00000080
-#define L2CAP_FEAT_EXT_WINDOW   0x00000100
-#define L2CAP_FEAT_UCD          0x00000200
 
 /* L2CAP checksum option */
 #define L2CAP_FCS_NONE          0x00
 #define L2CAP_FCS_CRC16         0x01
 
-/* L2CAP fixed channels */
-#define L2CAP_FC_L2CAP          0x02
-#define L2CAP_FC_A2MP           0x08
-
 /* L2CAP Control Field bit masks */
-#define L2CAP_CTRL_SAR                  0xC000
-#define L2CAP_CTRL_REQSEQ               0x3F00
-#define L2CAP_CTRL_TXSEQ                0x007E
-#define L2CAP_CTRL_SUPERVISE            0x000C
-
-#define L2CAP_CTRL_RETRANS              0x0080
-#define L2CAP_CTRL_FINAL                0x0080
-#define L2CAP_CTRL_POLL                 0x0010
-#define L2CAP_CTRL_FRAME_TYPE           0x0001 /* I- or S-Frame */
-
-#define L2CAP_CTRL_TXSEQ_SHIFT          1
-#define L2CAP_CTRL_SUPER_SHIFT          2
-#define L2CAP_CTRL_POLL_SHIFT           4
-#define L2CAP_CTRL_FINAL_SHIFT          7
-#define L2CAP_CTRL_REQSEQ_SHIFT         8
-#define L2CAP_CTRL_SAR_SHIFT            14
-
-/* L2CAP Extended Control Field bit mask */
-#define L2CAP_EXT_CTRL_TXSEQ            0xFFFC0000
-#define L2CAP_EXT_CTRL_SAR              0x00030000
-#define L2CAP_EXT_CTRL_SUPERVISE        0x00030000
-#define L2CAP_EXT_CTRL_REQSEQ           0x0000FFFC
-
-#define L2CAP_EXT_CTRL_POLL             0x00040000
-#define L2CAP_EXT_CTRL_FINAL            0x00000002
-#define L2CAP_EXT_CTRL_FRAME_TYPE       0x00000001 /* I- or S-Frame */
-
-#define L2CAP_EXT_CTRL_FINAL_SHIFT      1
-#define L2CAP_EXT_CTRL_REQSEQ_SHIFT     2
-#define L2CAP_EXT_CTRL_SAR_SHIFT        16
-#define L2CAP_EXT_CTRL_SUPER_SHIFT      16
-#define L2CAP_EXT_CTRL_POLL_SHIFT       18
-#define L2CAP_EXT_CTRL_TXSEQ_SHIFT      18
+#define L2CAP_CTRL_SAR               0xC000
+#define L2CAP_CTRL_REQSEQ            0x3F00
+#define L2CAP_CTRL_TXSEQ             0x007E
+#define L2CAP_CTRL_RETRANS           0x0080
+#define L2CAP_CTRL_FINAL             0x0080
+#define L2CAP_CTRL_POLL              0x0010
+#define L2CAP_CTRL_SUPERVISE         0x000C
+#define L2CAP_CTRL_FRAME_TYPE        0x0001 /* I- or S-Frame */
+
+#define L2CAP_CTRL_TXSEQ_SHIFT      1
+#define L2CAP_CTRL_REQSEQ_SHIFT     8
+#define L2CAP_CTRL_SAR_SHIFT       14
 
 /* L2CAP Supervisory Function */
-#define L2CAP_SUPER_RR          0x00
-#define L2CAP_SUPER_REJ         0x01
-#define L2CAP_SUPER_RNR         0x02
-#define L2CAP_SUPER_SREJ        0x03
+#define L2CAP_SUPER_RCV_READY           0x0000
+#define L2CAP_SUPER_REJECT              0x0004
+#define L2CAP_SUPER_RCV_NOT_READY       0x0008
+#define L2CAP_SUPER_SELECT_REJECT       0x000C
 
 /* L2CAP Segmentation and Reassembly */
-#define L2CAP_SAR_UNSEGMENTED   0x00
-#define L2CAP_SAR_START         0x01
-#define L2CAP_SAR_END           0x02
-#define L2CAP_SAR_CONTINUE      0x03
+#define L2CAP_SDU_UNSEGMENTED       0x0000
+#define L2CAP_SDU_START             0x4000
+#define L2CAP_SDU_END               0x8000
+#define L2CAP_SDU_CONTINUE          0xC000
 
 /* L2CAP Command rej. reasons */
-#define L2CAP_REJ_NOT_UNDERSTOOD        0x0000
-#define L2CAP_REJ_MTU_EXCEEDED          0x0001
-#define L2CAP_REJ_INVALID_CID           0x0002
+#define L2CAP_REJ_NOT_UNDERSTOOD      0x0000
+#define L2CAP_REJ_MTU_EXCEEDED        0x0001
+#define L2CAP_REJ_INVALID_CID         0x0002
+
 
 /* L2CAP structures */
 struct l2cap_hdr {
@@ -191,14 +141,6 @@ struct l2cap_hdr {
         __le16     cid;
 } __packed;
 #define L2CAP_HDR_SIZE          4
-#define L2CAP_ENH_HDR_SIZE      6
-#define L2CAP_EXT_HDR_SIZE      8
-
-#define L2CAP_FCS_SIZE          2
-#define L2CAP_SDULEN_SIZE       2
-#define L2CAP_PSMLEN_SIZE       2
-#define L2CAP_ENH_CTRL_SIZE     2
-#define L2CAP_EXT_CTRL_SIZE     4
 
 struct l2cap_cmd_hdr {
         __u8       code;
@@ -234,29 +176,23 @@ struct l2cap_conn_rsp {
         __le16     status;
 } __packed;
 
-/* protocol/service multiplexer (PSM) */
-#define L2CAP_PSM_SDP           0x0001
-#define L2CAP_PSM_RFCOMM        0x0003
-
 /* channel indentifier */
 #define L2CAP_CID_SIGNALING     0x0001
 #define L2CAP_CID_CONN_LESS     0x0002
-#define L2CAP_CID_A2MP          0x0003
 #define L2CAP_CID_LE_DATA       0x0004
 #define L2CAP_CID_LE_SIGNALING  0x0005
 #define L2CAP_CID_SMP           0x0006
 #define L2CAP_CID_DYN_START     0x0040
 #define L2CAP_CID_DYN_END       0xffff
 
-/* connect/create channel results */
+/* connect result */
 #define L2CAP_CR_SUCCESS        0x0000
 #define L2CAP_CR_PEND           0x0001
 #define L2CAP_CR_BAD_PSM        0x0002
 #define L2CAP_CR_SEC_BLOCK      0x0003
 #define L2CAP_CR_NO_MEM         0x0004
-#define L2CAP_CR_BAD_AMP        0x0005
 
-/* connect/create channel status */
+/* connect status */
 #define L2CAP_CS_NO_INFO        0x0000
 #define L2CAP_CS_AUTHEN_PEND    0x0001
 #define L2CAP_CS_AUTHOR_PEND    0x0002
@@ -278,11 +214,6 @@ struct l2cap_conf_rsp {
 #define L2CAP_CONF_UNACCEPT     0x0001
 #define L2CAP_CONF_REJECT       0x0002
 #define L2CAP_CONF_UNKNOWN      0x0003
-#define L2CAP_CONF_PENDING      0x0004
-#define L2CAP_CONF_EFS_REJECT   0x0005
-
-/* configuration req/rsp continuation flag */
-#define L2CAP_CONF_FLAG_CONTINUATION    0x0001
 
 struct l2cap_conf_opt {
         __u8       type;
@@ -299,8 +230,6 @@ struct l2cap_conf_opt {
 #define L2CAP_CONF_QOS          0x03
 #define L2CAP_CONF_RFC          0x04
 #define L2CAP_CONF_FCS          0x05
-#define L2CAP_CONF_EFS          0x06
-#define L2CAP_CONF_EWS          0x07
 
 #define L2CAP_CONF_MAX_SIZE     22
 
@@ -319,21 +248,6 @@ struct l2cap_conf_rfc {
 #define L2CAP_MODE_ERTM         0x03
 #define L2CAP_MODE_STREAMING    0x04
 
-struct l2cap_conf_efs {
-        __u8    id;
-        __u8    stype;
-        __le16  msdu;
-        __le32  sdu_itime;
-        __le32  acc_lat;
-        __le32  flush_to;
-} __packed;
-
-#define L2CAP_SERV_NOTRAFIC     0x00
-#define L2CAP_SERV_BESTEFFORT   0x01
-#define L2CAP_SERV_GUARANTEED   0x02
-
-#define L2CAP_BESTEFFORT_ID     0x01
-
 struct l2cap_disconn_req {
         __le16     dcid;
         __le16     scid;
@@ -354,57 +268,14 @@ struct l2cap_info_rsp {
         __u8        data[0];
 } __packed;
 
-struct l2cap_create_chan_req {
-        __le16      psm;
-        __le16      scid;
-        __u8        amp_id;
-} __packed;
-
-struct l2cap_create_chan_rsp {
-        __le16      dcid;
-        __le16      scid;
-        __le16      result;
-        __le16      status;
-} __packed;
-
-struct l2cap_move_chan_req {
-        __le16      icid;
-        __u8        dest_amp_id;
-} __packed;
-
-struct l2cap_move_chan_rsp {
-        __le16      icid;
-        __le16      result;
-} __packed;
-
-#define L2CAP_MR_SUCCESS        0x0000
-#define L2CAP_MR_PEND           0x0001
-#define L2CAP_MR_BAD_ID         0x0002
-#define L2CAP_MR_SAME_ID        0x0003
-#define L2CAP_MR_NOT_SUPP       0x0004
-#define L2CAP_MR_COLLISION      0x0005
-#define L2CAP_MR_NOT_ALLOWED    0x0006
-
-struct l2cap_move_chan_cfm {
-        __le16      icid;
-        __le16      result;
-} __packed;
-
-#define L2CAP_MC_CONFIRMED      0x0000
-#define L2CAP_MC_UNCONFIRMED    0x0001
-
-struct l2cap_move_chan_cfm_rsp {
-        __le16      icid;
-} __packed;
-
 /* info type */
-#define L2CAP_IT_CL_MTU         0x0001
-#define L2CAP_IT_FEAT_MASK      0x0002
-#define L2CAP_IT_FIXED_CHAN     0x0003
+#define L2CAP_IT_CL_MTU     0x0001
+#define L2CAP_IT_FEAT_MASK  0x0002
+#define L2CAP_IT_FIXED_CHAN 0x0003
 
 /* info result */
-#define L2CAP_IR_SUCCESS        0x0000
-#define L2CAP_IR_NOTSUPP        0x0001
+#define L2CAP_IR_SUCCESS    0x0000
+#define L2CAP_IR_NOTSUPP    0x0001
 
 struct l2cap_conn_param_update_req {
         __le16      min;
@@ -422,26 +293,20 @@ struct l2cap_conn_param_update_rsp {
 #define L2CAP_CONN_PARAM_REJECTED       0x0001
 
 /* ----- L2CAP channels and connections ----- */
-struct l2cap_seq_list {
-        __u16   head;
-        __u16   tail;
-        __u16   mask;
-        __u16   *list;
+struct srej_list {
+        __u8    tx_seq;
+        struct list_head list;
 };
 
-#define L2CAP_SEQ_LIST_CLEAR    0xFFFF
-#define L2CAP_SEQ_LIST_TAIL     0x8000
-
 struct l2cap_chan {
         struct sock *sk;
 
         struct l2cap_conn       *conn;
-        struct hci_conn         *hs_hcon;
-        struct hci_chan         *hs_hchan;
-        struct kref     kref;
 
         __u8            state;
 
+        atomic_t        refcnt;
+
         __le16          psm;
         __u16           dcid;
         __u16           scid;
@@ -451,11 +316,14 @@ struct l2cap_chan {
         __u16           flush_to;
         __u8            mode;
         __u8            chan_type;
-        __u8            chan_policy;
 
         __le16          sport;
 
         __u8            sec_level;
+        __u8            role_switch;
+        __u8            force_reliable;
+        __u8            flushable;
+        __u8            force_active;
 
         __u8            ident;
 
@@ -466,124 +334,92 @@ struct l2cap_chan {
 
         __u8            fcs;
 
-        __u16           tx_win;
-        __u16           tx_win_max;
-        __u16           ack_win;
+        __u8            tx_win;
         __u8            max_tx;
         __u16           retrans_timeout;
         __u16           monitor_timeout;
         __u16           mps;
 
-        __u8            tx_state;
-        __u8            rx_state;
-
         unsigned long   conf_state;
         unsigned long   conn_state;
-        unsigned long   flags;
-
-        __u8            remote_amp_id;
-        __u8            local_amp_id;
-        __u8            move_id;
-        __u8            move_state;
-        __u8            move_role;
-
-        __u16           next_tx_seq;
-        __u16           expected_ack_seq;
-        __u16           expected_tx_seq;
-        __u16           buffer_seq;
-        __u16           srej_save_reqseq;
-        __u16           last_acked_seq;
-        __u16           frames_sent;
-        __u16           unacked_frames;
+
+        __u8            next_tx_seq;
+        __u8            expected_ack_seq;
+        __u8            expected_tx_seq;
+        __u8            buffer_seq;
+        __u8            buffer_seq_srej;
+        __u8            srej_save_reqseq;
+        __u8            frames_sent;
+        __u8            unacked_frames;
         __u8            retry_count;
-        __u16           srej_queue_next;
+        __u8            num_acked;
         __u16           sdu_len;
+        __u16           partial_sdu_len;
         struct sk_buff  *sdu;
-        struct sk_buff  *sdu_last_frag;
 
-        __u16           remote_tx_win;
+        __u8            remote_tx_win;
         __u8            remote_max_tx;
         __u16           remote_mps;
 
-        __u8            local_id;
-        __u8            local_stype;
-        __u16           local_msdu;
-        __u32           local_sdu_itime;
-        __u32           local_acc_lat;
-        __u32           local_flush_to;
-
-        __u8            remote_id;
-        __u8            remote_stype;
-        __u16           remote_msdu;
-        __u32           remote_sdu_itime;
-        __u32           remote_acc_lat;
-        __u32           remote_flush_to;
-
-        struct delayed_work     chan_timer;
-        struct delayed_work     retrans_timer;
-        struct delayed_work     monitor_timer;
-        struct delayed_work     ack_timer;
-
+        struct timer_list       chan_timer;
+        struct timer_list       retrans_timer;
+        struct timer_list       monitor_timer;
+        struct timer_list       ack_timer;
         struct sk_buff          *tx_send_head;
         struct sk_buff_head     tx_q;
         struct sk_buff_head     srej_q;
-        struct l2cap_seq_list   srej_list;
-        struct l2cap_seq_list   retrans_list;
+        struct list_head        srej_l;
 
-        struct list_head        list;
-        struct list_head        global_l;
+        struct list_head list;
+        struct list_head global_l;
 
-        void                    *data;
-        struct l2cap_ops        *ops;
-        struct mutex            lock;
+        void            *data;
+        struct l2cap_ops *ops;
 };
 
 struct l2cap_ops {
-        char                    *name;
-
-        struct l2cap_chan       *(*new_connection) (struct l2cap_chan *chan);
-        int                     (*recv) (struct l2cap_chan * chan,
-                                         struct sk_buff *skb);
-        void                    (*teardown) (struct l2cap_chan *chan, int err);
-        void                    (*close) (struct l2cap_chan *chan);
-        void                    (*state_change) (struct l2cap_chan *chan,
-                                                 int state);
-        void                    (*ready) (struct l2cap_chan *chan);
-        void                    (*defer) (struct l2cap_chan *chan);
-        struct sk_buff          *(*alloc_skb) (struct l2cap_chan *chan,
-                                               unsigned long len, int nb);
+        char            *name;
+
+        struct l2cap_chan       *(*new_connection) (void *data);
+        int                     (*recv) (void *data, struct sk_buff *skb);
+        void                    (*close) (void *data);
+        void                    (*state_change) (void *data, int state);
 };
 
 struct l2cap_conn {
-        struct hci_conn         *hcon;
-        struct hci_chan         *hchan;
+        struct hci_conn *hcon;
+
+        bdaddr_t        *dst;
+        bdaddr_t        *src;
 
-        bdaddr_t                *dst;
-        bdaddr_t                *src;
+        unsigned int    mtu;
 
-        unsigned int            mtu;
+        __u32           feat_mask;
 
-        __u32                   feat_mask;
-        __u8                    fixed_chan_mask;
+        __u8            info_state;
+        __u8            info_ident;
 
-        __u8                    info_state;
-        __u8                    info_ident;
+        struct timer_list info_timer;
 
-        struct delayed_work     info_timer;
+        spinlock_t      lock;
 
-        spinlock_t              lock;
+        struct sk_buff *rx_skb;
+        __u32           rx_len;
+        __u8            tx_ident;
 
-        struct sk_buff          *rx_skb;
-        __u32                   rx_len;
-        __u8                    tx_ident;
+        __u8            disc_reason;
 
-        __u8                    disc_reason;
+        __u8            preq[7]; /* SMP Pairing Request */
+        __u8            prsp[7]; /* SMP Pairing Response */
+        __u8            prnd[16]; /* SMP Pairing Random */
+        __u8            pcnf[16]; /* SMP Pairing Confirm */
+        __u8            tk[16]; /* SMP Temporary Key */
+        __u8            smp_key_size;
 
-        struct delayed_work     security_timer;
-        struct smp_chan         *smp_chan;
+        struct timer_list security_timer;
 
-        struct list_head        chan_l;
-        struct mutex            chan_lock;
+        struct list_head chan_l;
+        rwlock_t        chan_lock;
 };
 
 #define L2CAP_INFO_CL_MTU_REQ_SENT      0x01
@@ -593,15 +429,14 @@ struct l2cap_conn {
 #define L2CAP_CHAN_RAW                  1
 #define L2CAP_CHAN_CONN_LESS            2
 #define L2CAP_CHAN_CONN_ORIENTED        3
-#define L2CAP_CHAN_CONN_FIX_A2MP        4
 
 /* ----- L2CAP socket info ----- */
 #define l2cap_pi(sk) ((struct l2cap_pinfo *) sk)
 
 struct l2cap_pinfo {
-        struct bt_sock          bt;
+        struct bt_sock  bt;
         struct l2cap_chan       *chan;
-        struct sk_buff          *rx_busy_skb;
+        struct sk_buff  *rx_busy_skb;
 };
 
 enum {
@@ -611,18 +446,15 @@ enum {
         CONF_MTU_DONE,
         CONF_MODE_DONE,
         CONF_CONNECT_PEND,
-        CONF_RECV_NO_FCS,
+        CONF_NO_FCS_RECV,
         CONF_STATE2_DEVICE,
-        CONF_EWS_RECV,
-        CONF_LOC_CONF_PEND,
-        CONF_REM_CONF_PEND,
-        CONF_NOT_COMPLETE,
 };
 
 #define L2CAP_CONF_MAX_CONF_REQ 2
 #define L2CAP_CONF_MAX_CONF_RSP 2
 
 enum {
+        CONN_SAR_SDU,
         CONN_SREJ_SENT,
         CONN_WAIT_F,
         CONN_SREJ_ACT,
@@ -634,156 +466,37 @@ enum {
         CONN_RNR_SENT,
 };
 
-/* Definitions for flags in l2cap_chan */
-enum {
-        FLAG_ROLE_SWITCH,
-        FLAG_FORCE_ACTIVE,
-        FLAG_FORCE_RELIABLE,
-        FLAG_FLUSHABLE,
-        FLAG_EXT_CTRL,
-        FLAG_EFS_ENABLE,
-};
-
-enum {
-        L2CAP_TX_STATE_XMIT,
-        L2CAP_TX_STATE_WAIT_F,
-};
-
-enum {
-        L2CAP_RX_STATE_RECV,
-        L2CAP_RX_STATE_SREJ_SENT,
-        L2CAP_RX_STATE_MOVE,
-        L2CAP_RX_STATE_WAIT_P,
-        L2CAP_RX_STATE_WAIT_F,
-};
-
-enum {
-        L2CAP_TXSEQ_EXPECTED,
-        L2CAP_TXSEQ_EXPECTED_SREJ,
-        L2CAP_TXSEQ_UNEXPECTED,
-        L2CAP_TXSEQ_UNEXPECTED_SREJ,
-        L2CAP_TXSEQ_DUPLICATE,
-        L2CAP_TXSEQ_DUPLICATE_SREJ,
-        L2CAP_TXSEQ_INVALID,
-        L2CAP_TXSEQ_INVALID_IGNORE,
-};
-
-enum {
-        L2CAP_EV_DATA_REQUEST,
-        L2CAP_EV_LOCAL_BUSY_DETECTED,
-        L2CAP_EV_LOCAL_BUSY_CLEAR,
-        L2CAP_EV_RECV_REQSEQ_AND_FBIT,
-        L2CAP_EV_RECV_FBIT,
-        L2CAP_EV_RETRANS_TO,
-        L2CAP_EV_MONITOR_TO,
-        L2CAP_EV_EXPLICIT_POLL,
-        L2CAP_EV_RECV_IFRAME,
-        L2CAP_EV_RECV_RR,
-        L2CAP_EV_RECV_REJ,
-        L2CAP_EV_RECV_RNR,
-        L2CAP_EV_RECV_SREJ,
-        L2CAP_EV_RECV_FRAME,
-};
-
-enum {
-        L2CAP_MOVE_ROLE_NONE,
-        L2CAP_MOVE_ROLE_INITIATOR,
-        L2CAP_MOVE_ROLE_RESPONDER,
-};
-
-enum {
-        L2CAP_MOVE_STABLE,
-        L2CAP_MOVE_WAIT_REQ,
-        L2CAP_MOVE_WAIT_RSP,
-        L2CAP_MOVE_WAIT_RSP_SUCCESS,
-        L2CAP_MOVE_WAIT_CONFIRM,
-        L2CAP_MOVE_WAIT_CONFIRM_RSP,
-        L2CAP_MOVE_WAIT_LOGICAL_COMP,
-        L2CAP_MOVE_WAIT_LOGICAL_CFM,
-        L2CAP_MOVE_WAIT_LOCAL_BUSY,
-        L2CAP_MOVE_WAIT_PREPARE,
-};
-
-void l2cap_chan_hold(struct l2cap_chan *c);
-void l2cap_chan_put(struct l2cap_chan *c);
-
-static inline void l2cap_chan_lock(struct l2cap_chan *chan)
-{
-        mutex_lock(&chan->lock);
-}
-
-static inline void l2cap_chan_unlock(struct l2cap_chan *chan)
-{
-        mutex_unlock(&chan->lock);
-}
-
-static inline void l2cap_set_timer(struct l2cap_chan *chan,
-                                   struct delayed_work *work, long timeout)
-{
-        BT_DBG("chan %p state %s timeout %ld", chan,
-               state_to_string(chan->state), timeout);
-
-        /* If delayed work cancelled do not hold(chan)
-           since it is already done with previous set_timer */
-        if (!cancel_delayed_work(work))
-                l2cap_chan_hold(chan);
-
-        schedule_delayed_work(work, timeout);
-}
-
-static inline bool l2cap_clear_timer(struct l2cap_chan *chan,
-                                     struct delayed_work *work)
-{
-        bool ret;
-
-        /* put(chan) if delayed work cancelled otherwise it
-           is done in delayed work function */
-        ret = cancel_delayed_work(work);
-        if (ret)
-                l2cap_chan_put(chan);
-
-        return ret;
-}
-
 #define __set_chan_timer(c, t) l2cap_set_timer(c, &c->chan_timer, (t))
 #define __clear_chan_timer(c) l2cap_clear_timer(c, &c->chan_timer)
+#define __set_retrans_timer(c) l2cap_set_timer(c, &c->retrans_timer, \
+                L2CAP_DEFAULT_RETRANS_TO);
 #define __clear_retrans_timer(c) l2cap_clear_timer(c, &c->retrans_timer)
+#define __set_monitor_timer(c) l2cap_set_timer(c, &c->monitor_timer, \
+                L2CAP_DEFAULT_MONITOR_TO);
 #define __clear_monitor_timer(c) l2cap_clear_timer(c, &c->monitor_timer)
 #define __set_ack_timer(c) l2cap_set_timer(c, &chan->ack_timer, \
-                msecs_to_jiffies(L2CAP_DEFAULT_ACK_TO));
+                L2CAP_DEFAULT_ACK_TO);
 #define __clear_ack_timer(c) l2cap_clear_timer(c, &c->ack_timer)
 
-static inline int __seq_offset(struct l2cap_chan *chan, __u16 seq1, __u16 seq2)
+static inline int l2cap_tx_window_full(struct l2cap_chan *ch)
 {
-        if (seq1 >= seq2)
-                return seq1 - seq2;
-        else
-                return chan->tx_win_max + 1 - seq2 + seq1;
-}
+        int sub;
 
-static inline __u16 __next_seq(struct l2cap_chan *chan, __u16 seq)
-{
-        return (seq + 1) % (chan->tx_win_max + 1);
-}
-
-static inline struct l2cap_chan *l2cap_chan_no_new_connection(struct l2cap_chan *chan)
-{
-        return NULL;
-}
+        sub = (ch->next_tx_seq - ch->expected_ack_seq) % 64;
 
-static inline void l2cap_chan_no_teardown(struct l2cap_chan *chan, int err)
-{
-}
+        if (sub < 0)
+                sub += 64;
 
-static inline void l2cap_chan_no_ready(struct l2cap_chan *chan)
-{
+        return sub == ch->remote_tx_win;
 }
 
-static inline void l2cap_chan_no_defer(struct l2cap_chan *chan)
-{
-}
+#define __get_txseq(ctrl)       (((ctrl) & L2CAP_CTRL_TXSEQ) >> 1)
+#define __get_reqseq(ctrl)      (((ctrl) & L2CAP_CTRL_REQSEQ) >> 8)
+#define __is_iframe(ctrl)       (!((ctrl) & L2CAP_CTRL_FRAME_TYPE))
+#define __is_sframe(ctrl)       ((ctrl) & L2CAP_CTRL_FRAME_TYPE)
+#define __is_sar_start(ctrl)    (((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START)
 
-extern bool disable_ertm;
+extern int disable_ertm;
 
 int l2cap_init_sockets(void);
 void l2cap_cleanup_sockets(void);
@@ -794,23 +507,11 @@ int __l2cap_wait_ack(struct sock *sk);
 int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm);
 int l2cap_add_scid(struct l2cap_chan *chan,  __u16 scid);
 
-struct l2cap_chan *l2cap_chan_create(void);
+struct l2cap_chan *l2cap_chan_create(struct sock *sk);
 void l2cap_chan_close(struct l2cap_chan *chan, int reason);
-int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
-                       bdaddr_t *dst, u8 dst_type);
-int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len,
-                                                                u32 priority);
+void l2cap_chan_destroy(struct l2cap_chan *chan);
+int l2cap_chan_connect(struct l2cap_chan *chan);
+int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len);
 void l2cap_chan_busy(struct l2cap_chan *chan, int busy);
-int l2cap_chan_check_security(struct l2cap_chan *chan);
-void l2cap_chan_set_defaults(struct l2cap_chan *chan);
-int l2cap_ertm_init(struct l2cap_chan *chan);
-void l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);
-void __l2cap_chan_add(struct l2cap_conn *conn, struct l2cap_chan *chan);
-void l2cap_chan_del(struct l2cap_chan *chan, int err);
-void l2cap_send_conn_req(struct l2cap_chan *chan);
-void l2cap_move_start(struct l2cap_chan *chan);
-void l2cap_logical_cfm(struct l2cap_chan *chan, struct hci_chan *hchan,
-                       u8 status);
-void __l2cap_physical_cfm(struct l2cap_chan *chan, int result);
 
 #endif /* __L2CAP_H */
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 22980a7c387..5428fd32cce 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -2,7 +2,6 @@
    BlueZ - Bluetooth protocol stack for Linux
 
    Copyright (C) 2010  Nokia Corporation
-   Copyright (C) 2011-2012  Intel Corporation
 
    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
@@ -24,464 +23,281 @@
 
 #define MGMT_INDEX_NONE                 0xFFFF
 
-#define MGMT_STATUS_SUCCESS             0x00
-#define MGMT_STATUS_UNKNOWN_COMMAND     0x01
-#define MGMT_STATUS_NOT_CONNECTED       0x02
-#define MGMT_STATUS_FAILED              0x03
-#define MGMT_STATUS_CONNECT_FAILED      0x04
-#define MGMT_STATUS_AUTH_FAILED         0x05
-#define MGMT_STATUS_NOT_PAIRED          0x06
-#define MGMT_STATUS_NO_RESOURCES        0x07
-#define MGMT_STATUS_TIMEOUT             0x08
-#define MGMT_STATUS_ALREADY_CONNECTED   0x09
-#define MGMT_STATUS_BUSY                0x0a
-#define MGMT_STATUS_REJECTED            0x0b
-#define MGMT_STATUS_NOT_SUPPORTED       0x0c
-#define MGMT_STATUS_INVALID_PARAMS      0x0d
-#define MGMT_STATUS_DISCONNECTED        0x0e
-#define MGMT_STATUS_NOT_POWERED         0x0f
-#define MGMT_STATUS_CANCELLED           0x10
-#define MGMT_STATUS_INVALID_INDEX       0x11
-
 struct mgmt_hdr {
-        __le16  opcode;
-        __le16  index;
-        __le16  len;
-} __packed;
-
-struct mgmt_addr_info {
-        bdaddr_t        bdaddr;
-        __u8            type;
+        __le16 opcode;
+        __le16 index;
+        __le16 len;
 } __packed;
-#define MGMT_ADDR_INFO_SIZE             7
 
 #define MGMT_OP_READ_VERSION            0x0001
-#define MGMT_READ_VERSION_SIZE          0
 struct mgmt_rp_read_version {
-        __u8    version;
-        __le16  revision;
-} __packed;
-
-#define MGMT_OP_READ_COMMANDS           0x0002
-#define MGMT_READ_COMMANDS_SIZE         0
-struct mgmt_rp_read_commands {
-        __le16  num_commands;
-        __le16  num_events;
-        __le16  opcodes[0];
+        __u8 version;
+        __le16 revision;
 } __packed;
 
 #define MGMT_OP_READ_INDEX_LIST         0x0003
-#define MGMT_READ_INDEX_LIST_SIZE       0
 struct mgmt_rp_read_index_list {
-        __le16  num_controllers;
-        __le16  index[0];
+        __le16 num_controllers;
+        __le16 index[0];
 } __packed;
 
 /* Reserve one extra byte for names in management messages so that they
  * are always guaranteed to be nul-terminated */
 #define MGMT_MAX_NAME_LENGTH            (HCI_MAX_NAME_LENGTH + 1)
-#define MGMT_MAX_SHORT_NAME_LENGTH      (HCI_MAX_SHORT_NAME_LENGTH + 1)
-
-#define MGMT_SETTING_POWERED            0x00000001
-#define MGMT_SETTING_CONNECTABLE        0x00000002
-#define MGMT_SETTING_FAST_CONNECTABLE   0x00000004
-#define MGMT_SETTING_DISCOVERABLE       0x00000008
-#define MGMT_SETTING_PAIRABLE           0x00000010
-#define MGMT_SETTING_LINK_SECURITY      0x00000020
-#define MGMT_SETTING_SSP                0x00000040
-#define MGMT_SETTING_BREDR              0x00000080
-#define MGMT_SETTING_HS                 0x00000100
-#define MGMT_SETTING_LE                 0x00000200
 
 #define MGMT_OP_READ_INFO               0x0004
-#define MGMT_READ_INFO_SIZE             0
 struct mgmt_rp_read_info {
-        bdaddr_t        bdaddr;
-        __u8            version;
-        __le16          manufacturer;
-        __le32          supported_settings;
-        __le32          current_settings;
-        __u8            dev_class[3];
-        __u8            name[MGMT_MAX_NAME_LENGTH];
-        __u8            short_name[MGMT_MAX_SHORT_NAME_LENGTH];
+        __u8 type;
+        __u8 powered;
+        __u8 connectable;
+        __u8 discoverable;
+        __u8 pairable;
+        __u8 sec_mode;
+        bdaddr_t bdaddr;
+        __u8 dev_class[3];
+        __u8 features[8];
+        __u16 manufacturer;
+        __u8 hci_ver;
+        __u16 hci_rev;
+        __u8 name[MGMT_MAX_NAME_LENGTH];
 } __packed;
 
 struct mgmt_mode {
         __u8 val;
 } __packed;
 
-#define MGMT_SETTING_SIZE               1
-
 #define MGMT_OP_SET_POWERED             0x0005
 
 #define MGMT_OP_SET_DISCOVERABLE        0x0006
-struct mgmt_cp_set_discoverable {
-        __u8    val;
-        __le16  timeout;
-} __packed;
-#define MGMT_SET_DISCOVERABLE_SIZE      3
 
 #define MGMT_OP_SET_CONNECTABLE         0x0007
 
-#define MGMT_OP_SET_FAST_CONNECTABLE    0x0008
-
-#define MGMT_OP_SET_PAIRABLE            0x0009
-
-#define MGMT_OP_SET_LINK_SECURITY       0x000A
-
-#define MGMT_OP_SET_SSP                 0x000B
-
-#define MGMT_OP_SET_HS                  0x000C
-
-#define MGMT_OP_SET_LE                  0x000D
-#define MGMT_OP_SET_DEV_CLASS           0x000E
-struct mgmt_cp_set_dev_class {
-        __u8    major;
-        __u8    minor;
-} __packed;
-#define MGMT_SET_DEV_CLASS_SIZE         2
-
-#define MGMT_OP_SET_LOCAL_NAME          0x000F
-struct mgmt_cp_set_local_name {
-        __u8    name[MGMT_MAX_NAME_LENGTH];
-        __u8    short_name[MGMT_MAX_SHORT_NAME_LENGTH];
-} __packed;
-#define MGMT_SET_LOCAL_NAME_SIZE        260
+#define MGMT_OP_SET_PAIRABLE            0x0008
 
-#define MGMT_OP_ADD_UUID                0x0010
+#define MGMT_OP_ADD_UUID                0x0009
 struct mgmt_cp_add_uuid {
-        __u8    uuid[16];
-        __u8    svc_hint;
+        __u8 uuid[16];
+        __u8 svc_hint;
 } __packed;
-#define MGMT_ADD_UUID_SIZE              17
 
-#define MGMT_OP_REMOVE_UUID             0x0011
+#define MGMT_OP_REMOVE_UUID             0x000A
 struct mgmt_cp_remove_uuid {
-        __u8    uuid[16];
+        __u8 uuid[16];
+} __packed;
+
+#define MGMT_OP_SET_DEV_CLASS           0x000B
+struct mgmt_cp_set_dev_class {
+        __u8 major;
+        __u8 minor;
 } __packed;
-#define MGMT_REMOVE_UUID_SIZE           16
 
-struct mgmt_link_key_info {
-        struct mgmt_addr_info addr;
-        __u8    type;
-        __u8    val[16];
-        __u8    pin_len;
+#define MGMT_OP_SET_SERVICE_CACHE       0x000C
+struct mgmt_cp_set_service_cache {
+        __u8 enable;
 } __packed;
 
-#define MGMT_OP_LOAD_LINK_KEYS          0x0012
-struct mgmt_cp_load_link_keys {
-        __u8    debug_keys;
-        __le16  key_count;
-        struct  mgmt_link_key_info keys[0];
+struct mgmt_key_info {
+        bdaddr_t bdaddr;
+        u8 type;
+        u8 val[16];
+        u8 pin_len;
+        u8 dlen;
+        u8 data[0];
 } __packed;
-#define MGMT_LOAD_LINK_KEYS_SIZE        3
 
-struct mgmt_ltk_info {
-        struct mgmt_addr_info addr;
-        __u8    authenticated;
-        __u8    master;
-        __u8    enc_size;
-        __le16  ediv;
-        __u8    rand[8];
-        __u8    val[16];
+#define MGMT_OP_LOAD_KEYS               0x000D
+struct mgmt_cp_load_keys {
+        __u8 debug_keys;
+        __le16 key_count;
+        struct mgmt_key_info keys[0];
 } __packed;
 
-#define MGMT_OP_LOAD_LONG_TERM_KEYS     0x0013
-struct mgmt_cp_load_long_term_keys {
-        __le16  key_count;
-        struct  mgmt_ltk_info keys[0];
+#define MGMT_OP_REMOVE_KEY              0x000E
+struct mgmt_cp_remove_key {
+        bdaddr_t bdaddr;
+        __u8 disconnect;
 } __packed;
-#define MGMT_LOAD_LONG_TERM_KEYS_SIZE   2
 
-#define MGMT_OP_DISCONNECT              0x0014
+#define MGMT_OP_DISCONNECT              0x000F
 struct mgmt_cp_disconnect {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
-#define MGMT_DISCONNECT_SIZE            MGMT_ADDR_INFO_SIZE
 struct mgmt_rp_disconnect {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
 
-#define MGMT_OP_GET_CONNECTIONS         0x0015
-#define MGMT_GET_CONNECTIONS_SIZE       0
+#define MGMT_OP_GET_CONNECTIONS         0x0010
 struct mgmt_rp_get_connections {
         __le16 conn_count;
-        struct mgmt_addr_info addr[0];
+        bdaddr_t conn[0];
 } __packed;
 
-#define MGMT_OP_PIN_CODE_REPLY          0x0016
+#define MGMT_OP_PIN_CODE_REPLY          0x0011
 struct mgmt_cp_pin_code_reply {
-        struct mgmt_addr_info addr;
-        __u8    pin_len;
-        __u8    pin_code[16];
+        bdaddr_t bdaddr;
+        __u8 pin_len;
+        __u8 pin_code[16];
 } __packed;
-#define MGMT_PIN_CODE_REPLY_SIZE        (MGMT_ADDR_INFO_SIZE + 17)
 struct mgmt_rp_pin_code_reply {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
+        uint8_t status;
 } __packed;
 
-#define MGMT_OP_PIN_CODE_NEG_REPLY      0x0017
+#define MGMT_OP_PIN_CODE_NEG_REPLY      0x0012
 struct mgmt_cp_pin_code_neg_reply {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
-#define MGMT_PIN_CODE_NEG_REPLY_SIZE    MGMT_ADDR_INFO_SIZE
 
-#define MGMT_OP_SET_IO_CAPABILITY       0x0018
+#define MGMT_OP_SET_IO_CAPABILITY       0x0013
 struct mgmt_cp_set_io_capability {
-        __u8    io_capability;
+        __u8 io_capability;
 } __packed;
-#define MGMT_SET_IO_CAPABILITY_SIZE     1
 
-#define MGMT_OP_PAIR_DEVICE             0x0019
+#define MGMT_OP_PAIR_DEVICE             0x0014
 struct mgmt_cp_pair_device {
-        struct mgmt_addr_info addr;
-        __u8    io_cap;
+        bdaddr_t bdaddr;
+        __u8 io_cap;
 } __packed;
-#define MGMT_PAIR_DEVICE_SIZE           (MGMT_ADDR_INFO_SIZE + 1)
 struct mgmt_rp_pair_device {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
+        __u8 status;
 } __packed;
 
-#define MGMT_OP_CANCEL_PAIR_DEVICE      0x001A
-#define MGMT_CANCEL_PAIR_DEVICE_SIZE    MGMT_ADDR_INFO_SIZE
-
-#define MGMT_OP_UNPAIR_DEVICE           0x001B
-struct mgmt_cp_unpair_device {
-        struct mgmt_addr_info addr;
-        __u8 disconnect;
-} __packed;
-#define MGMT_UNPAIR_DEVICE_SIZE         (MGMT_ADDR_INFO_SIZE + 1)
-struct mgmt_rp_unpair_device {
-        struct mgmt_addr_info addr;
-};
-
-#define MGMT_OP_USER_CONFIRM_REPLY      0x001C
+#define MGMT_OP_USER_CONFIRM_REPLY      0x0015
 struct mgmt_cp_user_confirm_reply {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
-#define MGMT_USER_CONFIRM_REPLY_SIZE    MGMT_ADDR_INFO_SIZE
 struct mgmt_rp_user_confirm_reply {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
+        __u8 status;
 } __packed;
 
-#define MGMT_OP_USER_CONFIRM_NEG_REPLY  0x001D
-struct mgmt_cp_user_confirm_neg_reply {
-        struct mgmt_addr_info addr;
-} __packed;
-#define MGMT_USER_CONFIRM_NEG_REPLY_SIZE MGMT_ADDR_INFO_SIZE
+#define MGMT_OP_USER_CONFIRM_NEG_REPLY  0x0016
 
-#define MGMT_OP_USER_PASSKEY_REPLY      0x001E
-struct mgmt_cp_user_passkey_reply {
-        struct mgmt_addr_info addr;
-        __le32  passkey;
-} __packed;
-#define MGMT_USER_PASSKEY_REPLY_SIZE    (MGMT_ADDR_INFO_SIZE + 4)
-struct mgmt_rp_user_passkey_reply {
-        struct mgmt_addr_info addr;
-} __packed;
-
-#define MGMT_OP_USER_PASSKEY_NEG_REPLY  0x001F
-struct mgmt_cp_user_passkey_neg_reply {
-        struct mgmt_addr_info addr;
+#define MGMT_OP_SET_LOCAL_NAME          0x0017
+struct mgmt_cp_set_local_name {
+        __u8 name[MGMT_MAX_NAME_LENGTH];
 } __packed;
-#define MGMT_USER_PASSKEY_NEG_REPLY_SIZE MGMT_ADDR_INFO_SIZE
 
-#define MGMT_OP_READ_LOCAL_OOB_DATA     0x0020
-#define MGMT_READ_LOCAL_OOB_DATA_SIZE   0
+#define MGMT_OP_READ_LOCAL_OOB_DATA     0x0018
 struct mgmt_rp_read_local_oob_data {
-        __u8    hash[16];
-        __u8    randomizer[16];
+        __u8 hash[16];
+        __u8 randomizer[16];
 } __packed;
 
-#define MGMT_OP_ADD_REMOTE_OOB_DATA     0x0021
+#define MGMT_OP_ADD_REMOTE_OOB_DATA     0x0019
 struct mgmt_cp_add_remote_oob_data {
-        struct mgmt_addr_info addr;
-        __u8    hash[16];
-        __u8    randomizer[16];
+        bdaddr_t bdaddr;
+        __u8 hash[16];
+        __u8 randomizer[16];
 } __packed;
-#define MGMT_ADD_REMOTE_OOB_DATA_SIZE   (MGMT_ADDR_INFO_SIZE + 32)
 
-#define MGMT_OP_REMOVE_REMOTE_OOB_DATA  0x0022
+#define MGMT_OP_REMOVE_REMOTE_OOB_DATA  0x001A
 struct mgmt_cp_remove_remote_oob_data {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
-#define MGMT_REMOVE_REMOTE_OOB_DATA_SIZE MGMT_ADDR_INFO_SIZE
 
-#define MGMT_OP_START_DISCOVERY         0x0023
-struct mgmt_cp_start_discovery {
-        __u8 type;
-} __packed;
-#define MGMT_START_DISCOVERY_SIZE       1
-
-#define MGMT_OP_STOP_DISCOVERY          0x0024
-struct mgmt_cp_stop_discovery {
-        __u8 type;
-} __packed;
-#define MGMT_STOP_DISCOVERY_SIZE        1
+#define MGMT_OP_START_DISCOVERY         0x001B
 
-#define MGMT_OP_CONFIRM_NAME            0x0025
-struct mgmt_cp_confirm_name {
-        struct mgmt_addr_info addr;
-        __u8    name_known;
-} __packed;
-#define MGMT_CONFIRM_NAME_SIZE          (MGMT_ADDR_INFO_SIZE + 1)
-struct mgmt_rp_confirm_name {
-        struct mgmt_addr_info addr;
-} __packed;
+#define MGMT_OP_STOP_DISCOVERY          0x001C
 
-#define MGMT_OP_BLOCK_DEVICE            0x0026
+#define MGMT_OP_BLOCK_DEVICE            0x001D
 struct mgmt_cp_block_device {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
-#define MGMT_BLOCK_DEVICE_SIZE          MGMT_ADDR_INFO_SIZE
 
-#define MGMT_OP_UNBLOCK_DEVICE          0x0027
+#define MGMT_OP_UNBLOCK_DEVICE          0x001E
 struct mgmt_cp_unblock_device {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
 } __packed;
-#define MGMT_UNBLOCK_DEVICE_SIZE        MGMT_ADDR_INFO_SIZE
-
-#define MGMT_OP_SET_DEVICE_ID           0x0028
-struct mgmt_cp_set_device_id {
-        __le16  source;
-        __le16  vendor;
-        __le16  product;
-        __le16  version;
-} __packed;
-#define MGMT_SET_DEVICE_ID_SIZE         8
 
 #define MGMT_EV_CMD_COMPLETE            0x0001
 struct mgmt_ev_cmd_complete {
-        __le16  opcode;
-        __u8    status;
-        __u8    data[0];
+        __le16 opcode;
+        __u8 data[0];
 } __packed;
 
 #define MGMT_EV_CMD_STATUS              0x0002
 struct mgmt_ev_cmd_status {
-        __le16  opcode;
-        __u8    status;
+        __u8 status;
+        __le16 opcode;
 } __packed;
 
 #define MGMT_EV_CONTROLLER_ERROR        0x0003
 struct mgmt_ev_controller_error {
-        __u8    error_code;
+        __u8 error_code;
 } __packed;
 
 #define MGMT_EV_INDEX_ADDED             0x0004
 
 #define MGMT_EV_INDEX_REMOVED           0x0005
 
-#define MGMT_EV_NEW_SETTINGS            0x0006
+#define MGMT_EV_POWERED                 0x0006
 
-#define MGMT_EV_CLASS_OF_DEV_CHANGED    0x0007
-struct mgmt_ev_class_of_dev_changed {
-        __u8    dev_class[3];
-};
+#define MGMT_EV_DISCOVERABLE            0x0007
 
-#define MGMT_EV_LOCAL_NAME_CHANGED      0x0008
-struct mgmt_ev_local_name_changed {
-        __u8    name[MGMT_MAX_NAME_LENGTH];
-        __u8    short_name[MGMT_MAX_SHORT_NAME_LENGTH];
-} __packed;
+#define MGMT_EV_CONNECTABLE             0x0008
 
-#define MGMT_EV_NEW_LINK_KEY            0x0009
-struct mgmt_ev_new_link_key {
-        __u8    store_hint;
-        struct mgmt_link_key_info key;
-} __packed;
+#define MGMT_EV_PAIRABLE                0x0009
 
-#define MGMT_EV_NEW_LONG_TERM_KEY       0x000A
-struct mgmt_ev_new_long_term_key {
-        __u8    store_hint;
-        struct mgmt_ltk_info key;
+#define MGMT_EV_NEW_KEY                 0x000A
+struct mgmt_ev_new_key {
+        __u8 store_hint;
+        struct mgmt_key_info key;
 } __packed;
 
-#define MGMT_EV_DEVICE_CONNECTED        0x000B
-struct mgmt_ev_device_connected {
-        struct mgmt_addr_info addr;
-        __le32  flags;
-        __le16  eir_len;
-        __u8    eir[0];
+#define MGMT_EV_CONNECTED               0x000B
+struct mgmt_ev_connected {
+        bdaddr_t bdaddr;
 } __packed;
 
-#define MGMT_DEV_DISCONN_UNKNOWN        0x00
-#define MGMT_DEV_DISCONN_TIMEOUT        0x01
-#define MGMT_DEV_DISCONN_LOCAL_HOST     0x02
-#define MGMT_DEV_DISCONN_REMOTE         0x03
-
-#define MGMT_EV_DEVICE_DISCONNECTED     0x000C
-struct mgmt_ev_device_disconnected {
-        struct mgmt_addr_info addr;
-        __u8    reason;
+#define MGMT_EV_DISCONNECTED            0x000C
+struct mgmt_ev_disconnected {
+        bdaddr_t bdaddr;
 } __packed;
 
 #define MGMT_EV_CONNECT_FAILED          0x000D
 struct mgmt_ev_connect_failed {
-        struct mgmt_addr_info addr;
-        __u8    status;
+        bdaddr_t bdaddr;
+        __u8 status;
 } __packed;
 
 #define MGMT_EV_PIN_CODE_REQUEST        0x000E
 struct mgmt_ev_pin_code_request {
-        struct mgmt_addr_info addr;
-        __u8    secure;
+        bdaddr_t bdaddr;
+        __u8 secure;
 } __packed;
 
 #define MGMT_EV_USER_CONFIRM_REQUEST    0x000F
 struct mgmt_ev_user_confirm_request {
-        struct mgmt_addr_info addr;
-        __u8    confirm_hint;
-        __le32  value;
-} __packed;
-
-#define MGMT_EV_USER_PASSKEY_REQUEST    0x0010
-struct mgmt_ev_user_passkey_request {
-        struct mgmt_addr_info addr;
+        bdaddr_t bdaddr;
+        __u8 confirm_hint;
+        __le32 value;
 } __packed;
 
-#define MGMT_EV_AUTH_FAILED             0x0011
+#define MGMT_EV_AUTH_FAILED             0x0010
 struct mgmt_ev_auth_failed {
-        struct mgmt_addr_info addr;
-        __u8    status;
+        bdaddr_t bdaddr;
+        __u8 status;
 } __packed;
 
-#define MGMT_DEV_FOUND_CONFIRM_NAME    0x01
-#define MGMT_DEV_FOUND_LEGACY_PAIRING  0x02
+#define MGMT_EV_LOCAL_NAME_CHANGED      0x0011
+struct mgmt_ev_local_name_changed {
+        __u8 name[MGMT_MAX_NAME_LENGTH];
+} __packed;
 
 #define MGMT_EV_DEVICE_FOUND            0x0012
 struct mgmt_ev_device_found {
-        struct mgmt_addr_info addr;
-        __s8    rssi;
-        __le32  flags;
-        __le16  eir_len;
-        __u8    eir[0];
+        bdaddr_t bdaddr;
+        __u8 dev_class[3];
+        __s8 rssi;
+        __u8 eir[HCI_MAX_EIR_LENGTH];
 } __packed;
 
-#define MGMT_EV_DISCOVERING             0x0013
-struct mgmt_ev_discovering {
-        __u8    type;
-        __u8    discovering;
+#define MGMT_EV_REMOTE_NAME             0x0013
+struct mgmt_ev_remote_name {
+        bdaddr_t bdaddr;
+        __u8 name[MGMT_MAX_NAME_LENGTH];
 } __packed;
 
-#define MGMT_EV_DEVICE_BLOCKED          0x0014
-struct mgmt_ev_device_blocked {
-        struct mgmt_addr_info addr;
-} __packed;
-
-#define MGMT_EV_DEVICE_UNBLOCKED        0x0015
-struct mgmt_ev_device_unblocked {
-        struct mgmt_addr_info addr;
-} __packed;
-
-#define MGMT_EV_DEVICE_UNPAIRED         0x0016
-struct mgmt_ev_device_unpaired {
-        struct mgmt_addr_info addr;
-} __packed;
-
-#define MGMT_EV_PASSKEY_NOTIFY          0x0017
-struct mgmt_ev_passkey_notify {
-        struct mgmt_addr_info addr;
-        __le32  passkey;
-        __u8    entered;
-} __packed;
+#define MGMT_EV_DISCOVERING             0x0014
diff --git a/include/net/bluetooth/rfcomm.h b/include/net/bluetooth/rfcomm.h
index e2e3ecad100..d5eee2093b1 100644
--- a/include/net/bluetooth/rfcomm.h
+++ b/include/net/bluetooth/rfcomm.h
@@ -211,7 +211,6 @@ struct rfcomm_dlc {
 #define RFCOMM_AUTH_ACCEPT  6
 #define RFCOMM_AUTH_REJECT  7
 #define RFCOMM_DEFER_SETUP  8
-#define RFCOMM_ENC_DROP     9
 
 /* Scheduling flags and events */
 #define RFCOMM_SCHED_WAKEUP 31
diff --git a/include/net/bluetooth/sco.h b/include/net/bluetooth/sco.h
index 1e35c43657c..6d1857ab8e5 100644
--- a/include/net/bluetooth/sco.h
+++ b/include/net/bluetooth/sco.h
@@ -37,6 +37,7 @@
 struct sockaddr_sco {
         sa_family_t     sco_family;
         bdaddr_t        sco_bdaddr;
+        __u16           sco_pkt_type;
 };
 
 /* SCO socket options */
@@ -72,7 +73,8 @@ struct sco_conn {
 
 struct sco_pinfo {
         struct bt_sock  bt;
-        __u32           flags;
+        __u16           pkt_type;
+
         struct sco_conn *conn;
 };
 
diff --git a/include/net/bluetooth/smp.h b/include/net/bluetooth/smp.h
index f8ba07f3e5f..46c45761230 100644
--- a/include/net/bluetooth/smp.h
+++ b/include/net/bluetooth/smp.h
@@ -77,7 +77,7 @@ struct smp_cmd_encrypt_info {
 
 #define SMP_CMD_MASTER_IDENT    0x07
 struct smp_cmd_master_ident {
-        __le16  ediv;
+        __u16   ediv;
         __u8    rand[8];
 } __packed;
 
@@ -108,39 +108,16 @@ struct smp_cmd_security_req {
 #define SMP_CONFIRM_FAILED              0x04
 #define SMP_PAIRING_NOTSUPP             0x05
 #define SMP_ENC_KEY_SIZE                0x06
-#define SMP_CMD_NOTSUPP                 0x07
-#define SMP_UNSPECIFIED                 0x08
+#define SMP_CMD_NOTSUPP         0x07
+#define SMP_UNSPECIFIED         0x08
 #define SMP_REPEATED_ATTEMPTS           0x09
 
 #define SMP_MIN_ENC_KEY_SIZE            7
 #define SMP_MAX_ENC_KEY_SIZE            16
 
-#define SMP_FLAG_TK_VALID       1
-#define SMP_FLAG_CFM_PENDING    2
-#define SMP_FLAG_MITM_AUTH      3
-
-struct smp_chan {
-        struct l2cap_conn *conn;
-        u8              preq[7]; /* SMP Pairing Request */
-        u8              prsp[7]; /* SMP Pairing Response */
-        u8              prnd[16]; /* SMP Pairing Random (local) */
-        u8              rrnd[16]; /* SMP Pairing Random (remote) */
-        u8              pcnf[16]; /* SMP Pairing Confirm */
-        u8              tk[16]; /* SMP Temporary Key */
-        u8              enc_key_size;
-        unsigned long   smp_flags;
-        struct crypto_blkcipher *tfm;
-        struct work_struct confirm;
-        struct work_struct random;
-
-};
-
 /* SMP Commands */
-int smp_conn_security(struct hci_conn *hcon, __u8 sec_level);
+int smp_conn_security(struct l2cap_conn *conn, __u8 sec_level);
 int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb);
 int smp_distribute_keys(struct l2cap_conn *conn, __u8 force);
-int smp_user_confirm_reply(struct hci_conn *conn, u16 mgmt_op, __le32 passkey);
-
-void smp_chan_destroy(struct l2cap_conn *conn);
 
 #endif /* __SMP_H */
diff --git a/include/net/caif/caif_dev.h b/include/net/caif/caif_dev.h
index ef2dd9438bb..c011281d92c 100644
--- a/include/net/caif/caif_dev.h
+++ b/include/net/caif/caif_dev.h
@@ -9,7 +9,6 @@
 
 #include <net/caif/caif_layer.h>
 #include <net/caif/cfcnfg.h>
-#include <net/caif/caif_device.h>
 #include <linux/caif/caif_socket.h>
 #include <linux/if.h>
 #include <linux/net.h>
@@ -105,24 +104,4 @@ void caif_client_register_refcnt(struct cflayer *adapt_layer,
  */
 void caif_free_client(struct cflayer *adap_layer);
 
-/**
- * struct caif_enroll_dev - Enroll a net-device as a CAIF Link layer
- * @dev:                Network device to enroll.
- * @caifdev:            Configuration information from CAIF Link Layer
- * @link_support:       Link layer support layer
- * @head_room:          Head room needed by link support layer
- * @layer:              Lowest layer in CAIF stack
- * @rcv_fun:            Receive function for CAIF stack.
- *
- * This function enroll a CAIF link layer into CAIF Stack and
- * expects the interface to be able to handle CAIF payload.
- * The link_support layer is used to add any Link Layer specific
- * framing.
- */
-void caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev,
-                        struct cflayer *link_support, int head_room,
-                        struct cflayer **layer, int (**rcv_func)(
-                                struct sk_buff *, struct net_device *,
-                                struct packet_type *, struct net_device *));
-
 #endif /* CAIF_DEV_H_ */
diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
index bcb9cc3ce98..c5dedd87b4c 100644
--- a/include/net/caif/caif_hsi.h
+++ b/include/net/caif/caif_hsi.h
@@ -52,9 +52,8 @@ struct cfhsi_desc {
 /*
  * Maximum bytes transferred in one transfer.
  */
-#define CFHSI_MAX_CAIF_FRAME_SZ 4096
-
-#define CFHSI_MAX_PAYLOAD_SZ (CFHSI_MAX_PKTS * CFHSI_MAX_CAIF_FRAME_SZ)
+/* TODO: 4096 is temporary... */
+#define CFHSI_MAX_PAYLOAD_SZ (CFHSI_MAX_PKTS * 4096)
 
 /* Size of the complete HSI TX buffer. */
 #define CFHSI_BUF_SZ_TX (CFHSI_DESC_SZ + CFHSI_MAX_PAYLOAD_SZ)
@@ -76,69 +75,38 @@ struct cfhsi_desc {
 #define CFHSI_WAKE_UP_ACK                       1
 #define CFHSI_WAKE_DOWN_ACK                     2
 #define CFHSI_AWAKE                             3
-#define CFHSI_WAKELOCK_HELD                     4
-#define CFHSI_SHUTDOWN                          5
-#define CFHSI_FLUSH_FIFO                        6
+#define CFHSI_PENDING_RX                        4
+#define CFHSI_SHUTDOWN                          6
+#define CFHSI_FLUSH_FIFO                        7
 
 #ifndef CFHSI_INACTIVITY_TOUT
 #define CFHSI_INACTIVITY_TOUT                   (1 * HZ)
 #endif /* CFHSI_INACTIVITY_TOUT */
 
-#ifndef CFHSI_WAKE_TOUT
-#define CFHSI_WAKE_TOUT                 (3 * HZ)
-#endif /* CFHSI_WAKE_TOUT */
+#ifndef CFHSI_WAKEUP_TOUT
+#define CFHSI_WAKEUP_TOUT                       (3 * HZ)
+#endif /* CFHSI_WAKEUP_TOUT */
 
-#ifndef CFHSI_MAX_RX_RETRIES
-#define CFHSI_MAX_RX_RETRIES            (10 * HZ)
-#endif
 
 /* Structure implemented by the CAIF HSI driver. */
-struct cfhsi_cb_ops {
-        void (*tx_done_cb) (struct cfhsi_cb_ops *drv);
-        void (*rx_done_cb) (struct cfhsi_cb_ops *drv);
-        void (*wake_up_cb) (struct cfhsi_cb_ops *drv);
-        void (*wake_down_cb) (struct cfhsi_cb_ops *drv);
+struct cfhsi_drv {
+        void (*tx_done_cb) (struct cfhsi_drv *drv);
+        void (*rx_done_cb) (struct cfhsi_drv *drv);
+        void (*wake_up_cb) (struct cfhsi_drv *drv);
+        void (*wake_down_cb) (struct cfhsi_drv *drv);
 };
 
 /* Structure implemented by HSI device. */
-struct cfhsi_ops {
-        int (*cfhsi_up) (struct cfhsi_ops *dev);
-        int (*cfhsi_down) (struct cfhsi_ops *dev);
-        int (*cfhsi_tx) (u8 *ptr, int len, struct cfhsi_ops *dev);
-        int (*cfhsi_rx) (u8 *ptr, int len, struct cfhsi_ops *dev);
-        int (*cfhsi_wake_up) (struct cfhsi_ops *dev);
-        int (*cfhsi_wake_down) (struct cfhsi_ops *dev);
-        int (*cfhsi_get_peer_wake) (struct cfhsi_ops *dev, bool *status);
-        int (*cfhsi_fifo_occupancy) (struct cfhsi_ops *dev, size_t *occupancy);
-        int (*cfhsi_rx_cancel)(struct cfhsi_ops *dev);
-        struct cfhsi_cb_ops *cb_ops;
-};
-
-/* Structure holds status of received CAIF frames processing */
-struct cfhsi_rx_state {
-        int state;
-        int nfrms;
-        int pld_len;
-        int retries;
-        bool piggy_desc;
-};
-
-/* Priority mapping */
-enum {
-        CFHSI_PRIO_CTL = 0,
-        CFHSI_PRIO_VI,
-        CFHSI_PRIO_VO,
-        CFHSI_PRIO_BEBK,
-        CFHSI_PRIO_LAST,
-};
-
-struct cfhsi_config {
-        u32 inactivity_timeout;
-        u32 aggregation_timeout;
-        u32 head_align;
-        u32 tail_align;
-        u32 q_high_mark;
-        u32 q_low_mark;
+struct cfhsi_dev {
+        int (*cfhsi_up) (struct cfhsi_dev *dev);
+        int (*cfhsi_down) (struct cfhsi_dev *dev);
+        int (*cfhsi_tx) (u8 *ptr, int len, struct cfhsi_dev *dev);
+        int (*cfhsi_rx) (u8 *ptr, int len, struct cfhsi_dev *dev);
+        int (*cfhsi_wake_up) (struct cfhsi_dev *dev);
+        int (*cfhsi_wake_down) (struct cfhsi_dev *dev);
+        int (*cfhsi_fifo_occupancy)(struct cfhsi_dev *dev, size_t *occupancy);
+        int (*cfhsi_rx_cancel)(struct cfhsi_dev *dev);
+        struct cfhsi_drv *drv;
 };
 
 /* Structure implemented by CAIF HSI drivers. */
@@ -146,56 +114,32 @@ struct cfhsi {
         struct caif_dev_common cfdev;
         struct net_device *ndev;
         struct platform_device *pdev;
-        struct sk_buff_head qhead[CFHSI_PRIO_LAST];
-        struct cfhsi_cb_ops cb_ops;
-        struct cfhsi_ops *ops;
+        struct sk_buff_head qhead;
+        struct cfhsi_drv drv;
+        struct cfhsi_dev *dev;
         int tx_state;
-        struct cfhsi_rx_state rx_state;
-        struct cfhsi_config cfg;
+        int rx_state;
         int rx_len;
         u8 *rx_ptr;
         u8 *tx_buf;
         u8 *rx_buf;
-        u8 *rx_flip_buf;
         spinlock_t lock;
         int flow_off_sent;
+        u32 q_low_mark;
+        u32 q_high_mark;
         struct list_head list;
         struct work_struct wake_up_work;
         struct work_struct wake_down_work;
-        struct work_struct out_of_sync_work;
+        struct work_struct rx_done_work;
+        struct work_struct tx_done_work;
         struct workqueue_struct *wq;
         wait_queue_head_t wake_up_wait;
         wait_queue_head_t wake_down_wait;
         wait_queue_head_t flush_fifo_wait;
-        struct timer_list inactivity_timer;
-        struct timer_list rx_slowpath_timer;
-
-        /* TX aggregation */
-        int aggregation_len;
-        struct timer_list aggregation_timer;
-
+        struct timer_list timer;
         unsigned long bits;
 };
-extern struct platform_driver cfhsi_driver;
 
-/**
- * enum ifla_caif_hsi - CAIF HSI NetlinkRT parameters.
- * @IFLA_CAIF_HSI_INACTIVITY_TOUT: Inactivity timeout before
- *                      taking the HSI wakeline down, in milliseconds.
- * When using RT Netlink to create, destroy or configure a CAIF HSI interface,
- * enum ifla_caif_hsi is used to specify the configuration attributes.
- */
-enum ifla_caif_hsi {
-        __IFLA_CAIF_HSI_UNSPEC,
-        __IFLA_CAIF_HSI_INACTIVITY_TOUT,
-        __IFLA_CAIF_HSI_AGGREGATION_TOUT,
-        __IFLA_CAIF_HSI_HEAD_ALIGN,
-        __IFLA_CAIF_HSI_TAIL_ALIGN,
-        __IFLA_CAIF_HSI_QHIGH_WATERMARK,
-        __IFLA_CAIF_HSI_QLOW_WATERMARK,
-        __IFLA_CAIF_HSI_MAX
-};
-
-extern struct cfhsi_ops *cfhsi_get_ops(void);
+extern struct platform_driver cfhsi_driver;
 
 #endif          /* CAIF_HSI_H_ */
diff --git a/include/net/caif/caif_layer.h b/include/net/caif/caif_layer.h
index 0f3a39125f9..35bc7883cf9 100644
--- a/include/net/caif/caif_layer.h
+++ b/include/net/caif/caif_layer.h
@@ -121,7 +121,9 @@ enum caif_direction {
  * @transmit:   Packet transmit funciton.
  * @ctrlcmd:    Used for control signalling upwards in the stack.
  * @modemcmd:   Used for control signaling downwards in the stack.
+ * @prio:       Priority of this layer.
  * @id:         The identity of this layer
+ * @type:       The type of this layer
  * @name:       Name of the layer.
  *
  *  This structure defines the layered structure in CAIF.
@@ -228,7 +230,9 @@ struct cflayer {
          */
         int (*modemcmd) (struct cflayer *layr, enum caif_modemcmd ctrl);
 
+        unsigned short prio;
         unsigned int id;
+        unsigned int type;
         char name[CAIF_LAYER_NAME_SZ];
 };
 
diff --git a/include/net/caif/caif_spi.h b/include/net/caif/caif_spi.h
index aa6a485b054..87c3d11b8e5 100644
--- a/include/net/caif/caif_spi.h
+++ b/include/net/caif/caif_spi.h
@@ -55,8 +55,8 @@
 struct cfspi_xfer {
         u16 tx_dma_len;
         u16 rx_dma_len;
-        void *va_tx[2];
-        dma_addr_t pa_tx[2];
+        void *va_tx;
+        dma_addr_t pa_tx;
         void *va_rx;
         dma_addr_t pa_rx;
 };
diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
index 90b4ff8bad8..3e93a4a4b67 100644
--- a/include/net/caif/cfcnfg.h
+++ b/include/net/caif/cfcnfg.h
@@ -14,6 +14,18 @@
 struct cfcnfg;
 
 /**
+ * enum cfcnfg_phy_type -  Types of physical layers defined in CAIF Stack
+ *
+ * @CFPHYTYPE_FRAG:     Fragmented frames physical interface.
+ * @CFPHYTYPE_CAIF:     Generic CAIF physical interface
+ */
+enum cfcnfg_phy_type {
+        CFPHYTYPE_FRAG = 1,
+        CFPHYTYPE_CAIF,
+        CFPHYTYPE_MAX
+};
+
+/**
  * enum cfcnfg_phy_preference - Physical preference HW Abstraction
  *
  * @CFPHYPREF_UNSPECIFIED:      Default physical interface
@@ -54,20 +66,21 @@ void cfcnfg_remove(struct cfcnfg *cfg);
  * cfcnfg_add_phy_layer() - Adds a physical layer to the CAIF stack.
  * @cnfg:       Pointer to a CAIF configuration object, created by
  *              cfcnfg_create().
+ * @phy_type:   Specifies the type of physical interface, e.g.
+ *                      CFPHYTYPE_FRAG.
  * @dev:        Pointer to link layer device
  * @phy_layer:  Specify the physical layer. The transmit function
  *              MUST be set in the structure.
  * @pref:       The phy (link layer) preference.
- * @link_support: Protocol implementation for link layer specific protocol.
  * @fcs:        Specify if checksum is used in CAIF Framing Layer.
- * @head_room:  Head space needed by link specific protocol.
+ * @stx:        Specify if Start Of Frame eXtention is used.
  */
+
 void
-cfcnfg_add_phy_layer(struct cfcnfg *cnfg,
+cfcnfg_add_phy_layer(struct cfcnfg *cnfg, enum cfcnfg_phy_type phy_type,
                      struct net_device *dev, struct cflayer *phy_layer,
                      enum cfcnfg_phy_preference pref,
-                     struct cflayer *link_support,
-                     bool fcs, int head_room);
+                     bool fcs, bool stx);
 
 /**
  * cfcnfg_del_phy_layer - Deletes an phy layer from the CAIF stack.
diff --git a/include/net/caif/cfpkt.h b/include/net/caif/cfpkt.h
index 83a89ba3005..6bd200a4754 100644
--- a/include/net/caif/cfpkt.h
+++ b/include/net/caif/cfpkt.h
@@ -188,18 +188,11 @@ struct cfpkt *cfpkt_fromnative(enum caif_direction dir, void *nativepkt);
  */
 void *cfpkt_tonative(struct cfpkt *pkt);
 
+
 /*
  * Returns packet information for a packet.
  * pkt Packet to get info from;
  * @return Packet information
  */
 struct caif_payload_info *cfpkt_info(struct cfpkt *pkt);
-
-/** cfpkt_set_prio - set priority for a CAIF packet.
- *
- * @pkt: The CAIF packet to be adjusted.
- * @prio: one of TC_PRIO_ constants.
- */
-void cfpkt_set_prio(struct cfpkt *pkt, int prio);
-
 #endif                          /* CFPKT_H_ */
diff --git a/include/net/caif/cfserl.h b/include/net/caif/cfserl.h
index f121299a342..b8374321b36 100644
--- a/include/net/caif/cfserl.h
+++ b/include/net/caif/cfserl.h
@@ -8,5 +8,5 @@
 #define CFSERL_H_
 #include <net/caif/caif_layer.h>
 
-struct cflayer *cfserl_create(int instance, bool use_stx);
-#endif
+struct cflayer *cfserl_create(int type, int instance, bool use_stx);
+#endif                          /* CFSERL_H_ */
diff --git a/include/net/cfg80211-wext.h b/include/net/cfg80211-wext.h
deleted file mode 100644
index 25baddc4fbe..00000000000
--- a/include/net/cfg80211-wext.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef __NET_CFG80211_WEXT_H
-#define __NET_CFG80211_WEXT_H
-/*
- * 802.11 device and configuration interface -- wext handlers
- *
- * Copyright 2006-2010  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
- * published by the Free Software Foundation.
- */
-
-#include <linux/netdevice.h>
-#include <linux/wireless.h>
-#include <net/iw_handler.h>
-
-/*
- * Temporary wext handlers & helper functions
- *
- * These are used only by drivers that aren't yet fully
- * converted to cfg80211.
- */
-int cfg80211_wext_giwname(struct net_device *dev,
-                          struct iw_request_info *info,
-                          char *name, char *extra);
-int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
-                          u32 *mode, char *extra);
-int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
-                          u32 *mode, char *extra);
-int cfg80211_wext_siwscan(struct net_device *dev,
-                          struct iw_request_info *info,
-                          union iwreq_data *wrqu, char *extra);
-int cfg80211_wext_giwscan(struct net_device *dev,
-                          struct iw_request_info *info,
-                          struct iw_point *data, char *extra);
-int cfg80211_wext_giwrange(struct net_device *dev,
-                           struct iw_request_info *info,
-                           struct iw_point *data, char *extra);
-int cfg80211_wext_siwrts(struct net_device *dev,
-                         struct iw_request_info *info,
-                         struct iw_param *rts, char *extra);
-int cfg80211_wext_giwrts(struct net_device *dev,
-                         struct iw_request_info *info,
-                         struct iw_param *rts, char *extra);
-int cfg80211_wext_siwfrag(struct net_device *dev,
-                          struct iw_request_info *info,
-                          struct iw_param *frag, char *extra);
-int cfg80211_wext_giwfrag(struct net_device *dev,
-                          struct iw_request_info *info,
-                          struct iw_param *frag, char *extra);
-int cfg80211_wext_giwretry(struct net_device *dev,
-                           struct iw_request_info *info,
-                           struct iw_param *retry, char *extra);
-
-#endif /* __NET_CFG80211_WEXT_H */
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 8e6a6b73b9c..ffa8aedd70f 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -13,7 +13,6 @@
 #include <linux/netdevice.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
-#include <linux/bug.h>
 #include <linux/netlink.h>
 #include <linux/skbuff.h>
 #include <linux/nl80211.h>
@@ -21,6 +20,11 @@
 #include <linux/ieee80211.h>
 #include <net/regulatory.h>
 
+/* remove once we remove the wext stuff */
+#include <net/iw_handler.h>
+#include <linux/wireless.h>
+
+
 /**
  * DOC: Introduction
  *
@@ -58,8 +62,6 @@
  * structures here describe these capabilities in detail.
  */
 
-struct wiphy;
-
 /*
  * wireless hardware capability structures
  */
@@ -72,13 +74,11 @@ struct wiphy;
  *
  * @IEEE80211_BAND_2GHZ: 2.4GHz ISM band
  * @IEEE80211_BAND_5GHZ: around 5GHz band (4.9-5.7)
- * @IEEE80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
  * @IEEE80211_NUM_BANDS: number of defined bands
  */
 enum ieee80211_band {
         IEEE80211_BAND_2GHZ = NL80211_BAND_2GHZ,
         IEEE80211_BAND_5GHZ = NL80211_BAND_5GHZ,
-        IEEE80211_BAND_60GHZ = NL80211_BAND_60GHZ,
 
         /* keep last */
         IEEE80211_NUM_BANDS
@@ -98,7 +98,6 @@ enum ieee80211_band {
  *      is not permitted.
  * @IEEE80211_CHAN_NO_HT40MINUS: extension channel below this channel
  *      is not permitted.
- * @IEEE80211_CHAN_NO_OFDM: OFDM is not allowed on this channel.
  */
 enum ieee80211_channel_flags {
         IEEE80211_CHAN_DISABLED         = 1<<0,
@@ -107,7 +106,6 @@ enum ieee80211_channel_flags {
         IEEE80211_CHAN_RADAR            = 1<<3,
         IEEE80211_CHAN_NO_HT40PLUS      = 1<<4,
         IEEE80211_CHAN_NO_HT40MINUS     = 1<<5,
-        IEEE80211_CHAN_NO_OFDM          = 1<<6,
 };
 
 #define IEEE80211_CHAN_NO_HT40 \
@@ -127,7 +125,6 @@ enum ieee80211_channel_flags {
  * @band: band this channel belongs to.
  * @max_antenna_gain: maximum antenna gain in dBi
  * @max_power: maximum transmission power (in dBm)
- * @max_reg_power: maximum regulatory transmission power (in dBm)
  * @beacon_found: helper to regulatory code to indicate when a beacon
  *      has been found on this channel. Use regulatory_hint_found_beacon()
  *      to enable this, this is useful only on 5 GHz band.
@@ -141,7 +138,6 @@ struct ieee80211_channel {
         u32 flags;
         int max_antenna_gain;
         int max_power;
-        int max_reg_power;
         bool beacon_found;
         u32 orig_flags;
         int orig_mag, orig_mpwr;
@@ -217,22 +213,6 @@ struct ieee80211_sta_ht_cap {
 };
 
 /**
- * struct ieee80211_sta_vht_cap - STA's VHT capabilities
- *
- * This structure describes most essential parameters needed
- * to describe 802.11ac VHT capabilities for an STA.
- *
- * @vht_supported: is VHT supported by the STA
- * @cap: VHT capabilities map as described in 802.11ac spec
- * @vht_mcs: Supported VHT MCS rates
- */
-struct ieee80211_sta_vht_cap {
-        bool vht_supported;
-        u32 cap; /* use IEEE80211_VHT_CAP_ */
-        struct ieee80211_vht_mcs_info vht_mcs;
-};
-
-/**
  * struct ieee80211_supported_band - frequency band definition
  *
  * This structure describes a frequency band a wiphy
@@ -247,7 +227,6 @@ struct ieee80211_sta_vht_cap {
  *      rates" IE, i.e. CCK rates first, then OFDM.
  * @n_bitrates: Number of bitrates in @bitrates
  * @ht_cap: HT capabilities in this band
- * @vht_cap: VHT capabilities in this band
  */
 struct ieee80211_supported_band {
         struct ieee80211_channel *channels;
@@ -256,7 +235,6 @@ struct ieee80211_supported_band {
         int n_channels;
         int n_bitrates;
         struct ieee80211_sta_ht_cap ht_cap;
-        struct ieee80211_sta_vht_cap vht_cap;
 };
 
 /*
@@ -308,104 +286,6 @@ struct key_params {
 };
 
 /**
- * struct cfg80211_chan_def - channel definition
- * @chan: the (control) channel
- * @width: channel width
- * @center_freq1: center frequency of first segment
- * @center_freq2: center frequency of second segment
- *      (only with 80+80 MHz)
- */
-struct cfg80211_chan_def {
-        struct ieee80211_channel *chan;
-        enum nl80211_chan_width width;
-        u32 center_freq1;
-        u32 center_freq2;
-};
-
-/**
- * cfg80211_get_chandef_type - return old channel type from chandef
- * @chandef: the channel definition
- *
- * Returns the old channel type (NOHT, HT20, HT40+/-) from a given
- * chandef, which must have a bandwidth allowing this conversion.
- */
-static inline enum nl80211_channel_type
-cfg80211_get_chandef_type(const struct cfg80211_chan_def *chandef)
-{
-        switch (chandef->width) {
-        case NL80211_CHAN_WIDTH_20_NOHT:
-                return NL80211_CHAN_NO_HT;
-        case NL80211_CHAN_WIDTH_20:
-                return NL80211_CHAN_HT20;
-        case NL80211_CHAN_WIDTH_40:
-                if (chandef->center_freq1 > chandef->chan->center_freq)
-                        return NL80211_CHAN_HT40PLUS;
-                return NL80211_CHAN_HT40MINUS;
-        default:
-                WARN_ON(1);
-                return NL80211_CHAN_NO_HT;
-        }
-}
-
-/**
- * cfg80211_chandef_create - create channel definition using channel type
- * @chandef: the channel definition struct to fill
- * @channel: the control channel
- * @chantype: the channel type
- *
- * Given a channel type, create a channel definition.
- */
-void cfg80211_chandef_create(struct cfg80211_chan_def *chandef,
-                             struct ieee80211_channel *channel,
-                             enum nl80211_channel_type chantype);
-
-/**
- * cfg80211_chandef_identical - check if two channel definitions are identical
- * @chandef1: first channel definition
- * @chandef2: second channel definition
- *
- * Returns %true if the channels defined by the channel definitions are
- * identical, %false otherwise.
- */
-static inline bool
-cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1,
-                           const struct cfg80211_chan_def *chandef2)
-{
-        return (chandef1->chan == chandef2->chan &&
-                chandef1->width == chandef2->width &&
-                chandef1->center_freq1 == chandef2->center_freq1 &&
-                chandef1->center_freq2 == chandef2->center_freq2);
-}
-
-/**
- * cfg80211_chandef_compatible - check if two channel definitions are compatible
- * @chandef1: first channel definition
- * @chandef2: second channel definition
- *
- * Returns %NULL if the given channel definitions are incompatible,
- * chandef1 or chandef2 otherwise.
- */
-const struct cfg80211_chan_def *
-cfg80211_chandef_compatible(const struct cfg80211_chan_def *chandef1,
-                            const struct cfg80211_chan_def *chandef2);
-
-/**
- * cfg80211_chandef_valid - check if a channel definition is valid
- * @chandef: the channel definition to check
- */
-bool cfg80211_chandef_valid(const struct cfg80211_chan_def *chandef);
-
-/**
- * cfg80211_chandef_usable - check if secondary channels can be used
- * @wiphy: the wiphy to validate against
- * @chandef: the channel definition to check
- * @prohibited_flags: the regulatory chanenl flags that must not be set
- */
-bool cfg80211_chandef_usable(struct wiphy *wiphy,
-                             const struct cfg80211_chan_def *chandef,
-                             u32 prohibited_flags);
-
-/**
  * enum survey_info_flags - survey information flags
  *
  * @SURVEY_INFO_NOISE_DBM: noise (in dBm) was filled in
@@ -459,103 +339,23 @@ struct survey_info {
 };
 
 /**
- * struct cfg80211_crypto_settings - Crypto settings
- * @wpa_versions: indicates which, if any, WPA versions are enabled
- *      (from enum nl80211_wpa_versions)
- * @cipher_group: group key cipher suite (or 0 if unset)
- * @n_ciphers_pairwise: number of AP supported unicast ciphers
- * @ciphers_pairwise: unicast key cipher suites
- * @n_akm_suites: number of AKM suites
- * @akm_suites: AKM suites
- * @control_port: Whether user space controls IEEE 802.1X port, i.e.,
- *      sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
- *      required to assume that the port is unauthorized until authorized by
- *      user space. Otherwise, port is marked authorized by default.
- * @control_port_ethertype: the control port protocol that should be
- *      allowed through even on unauthorized ports
- * @control_port_no_encrypt: TRUE to prevent encryption of control port
- *      protocol frames.
- */
-struct cfg80211_crypto_settings {
-        u32 wpa_versions;
-        u32 cipher_group;
-        int n_ciphers_pairwise;
-        u32 ciphers_pairwise[NL80211_MAX_NR_CIPHER_SUITES];
-        int n_akm_suites;
-        u32 akm_suites[NL80211_MAX_NR_AKM_SUITES];
-        bool control_port;
-        __be16 control_port_ethertype;
-        bool control_port_no_encrypt;
-};
-
-/**
- * struct cfg80211_beacon_data - beacon data
+ * struct beacon_parameters - beacon parameters
+ *
+ * Used to configure the beacon for an interface.
+ *
  * @head: head portion of beacon (before TIM IE)
  *     or %NULL if not changed
  * @tail: tail portion of beacon (after TIM IE)
  *     or %NULL if not changed
+ * @interval: beacon interval or zero if not changed
+ * @dtim_period: DTIM period or zero if not changed
  * @head_len: length of @head
  * @tail_len: length of @tail
- * @beacon_ies: extra information element(s) to add into Beacon frames or %NULL
- * @beacon_ies_len: length of beacon_ies in octets
- * @proberesp_ies: extra information element(s) to add into Probe Response
- *      frames or %NULL
- * @proberesp_ies_len: length of proberesp_ies in octets
- * @assocresp_ies: extra information element(s) to add into (Re)Association
- *      Response frames or %NULL
- * @assocresp_ies_len: length of assocresp_ies in octets
- * @probe_resp_len: length of probe response template (@probe_resp)
- * @probe_resp: probe response template (AP mode only)
- */
-struct cfg80211_beacon_data {
-        const u8 *head, *tail;
-        const u8 *beacon_ies;
-        const u8 *proberesp_ies;
-        const u8 *assocresp_ies;
-        const u8 *probe_resp;
-
-        size_t head_len, tail_len;
-        size_t beacon_ies_len;
-        size_t proberesp_ies_len;
-        size_t assocresp_ies_len;
-        size_t probe_resp_len;
-};
-
-/**
- * struct cfg80211_ap_settings - AP configuration
- *
- * Used to configure an AP interface.
- *
- * @chandef: defines the channel to use
- * @beacon: beacon data
- * @beacon_interval: beacon interval
- * @dtim_period: DTIM period
- * @ssid: SSID to be used in the BSS (note: may be %NULL if not provided from
- *      user space)
- * @ssid_len: length of @ssid
- * @hidden_ssid: whether to hide the SSID in Beacon/Probe Response frames
- * @crypto: crypto settings
- * @privacy: the BSS uses privacy
- * @auth_type: Authentication type (algorithm)
- * @inactivity_timeout: time in seconds to determine station's inactivity.
- * @p2p_ctwindow: P2P CT Window
- * @p2p_opp_ps: P2P opportunistic PS
  */
-struct cfg80211_ap_settings {
-        struct cfg80211_chan_def chandef;
-
-        struct cfg80211_beacon_data beacon;
-
-        int beacon_interval, dtim_period;
-        const u8 *ssid;
-        size_t ssid_len;
-        enum nl80211_hidden_ssid hidden_ssid;
-        struct cfg80211_crypto_settings crypto;
-        bool privacy;
-        enum nl80211_auth_type auth_type;
-        int inactivity_timeout;
-        u8 p2p_ctwindow;
-        bool p2p_opp_ps;
+struct beacon_parameters {
+        u8 *head, *tail;
+        int interval, dtim_period;
+        int head_len, tail_len;
 };
 
 /**
@@ -572,17 +372,6 @@ enum plink_actions {
 };
 
 /**
- * enum station_parameters_apply_mask - station parameter values to apply
- * @STATION_PARAM_APPLY_UAPSD: apply new uAPSD parameters (uapsd_queues, max_sp)
- *
- * Not all station parameters have in-band "no change" signalling,
- * for those that don't these flags will are used.
- */
-enum station_parameters_apply_mask {
-        STATION_PARAM_APPLY_UAPSD = BIT(0),
-};
-
-/**
  * struct station_parameters - station parameters
  *
  * Used to change and create a new station.
@@ -600,29 +389,17 @@ enum station_parameters_apply_mask {
  * @plink_action: plink action to take
  * @plink_state: set the peer link state for a station
  * @ht_capa: HT capabilities of station
- * @vht_capa: VHT capabilities of station
- * @uapsd_queues: bitmap of queues configured for uapsd. same format
- *      as the AC bitmap in the QoS info field
- * @max_sp: max Service Period. same format as the MAX_SP in the
- *      QoS info field (but already shifted down)
- * @sta_modify_mask: bitmap indicating which parameters changed
- *      (for those that don't have a natural "no change" value),
- *      see &enum station_parameters_apply_mask
  */
 struct station_parameters {
         u8 *supported_rates;
         struct net_device *vlan;
         u32 sta_flags_mask, sta_flags_set;
-        u32 sta_modify_mask;
         int listen_interval;
         u16 aid;
         u8 supported_rates_len;
         u8 plink_action;
         u8 plink_state;
         struct ieee80211_ht_cap *ht_capa;
-        struct ieee80211_vht_cap *vht_capa;
-        u8 uapsd_queues;
-        u8 max_sp;
 };
 
 /**
@@ -649,10 +426,6 @@ struct station_parameters {
  * @STATION_INFO_RX_BITRATE: @rxrate fields are filled
  * @STATION_INFO_BSS_PARAM: @bss_param filled
  * @STATION_INFO_CONNECTED_TIME: @connected_time filled
- * @STATION_INFO_ASSOC_REQ_IES: @assoc_req_ies filled
- * @STATION_INFO_STA_FLAGS: @sta_flags filled
- * @STATION_INFO_BEACON_LOSS_COUNT: @beacon_loss_count filled
- * @STATION_INFO_T_OFFSET: @t_offset filled
  */
 enum station_info_flags {
         STATION_INFO_INACTIVE_TIME      = 1<<0,
@@ -671,11 +444,7 @@ enum station_info_flags {
         STATION_INFO_SIGNAL_AVG         = 1<<13,
         STATION_INFO_RX_BITRATE         = 1<<14,
         STATION_INFO_BSS_PARAM          = 1<<15,
-        STATION_INFO_CONNECTED_TIME     = 1<<16,
-        STATION_INFO_ASSOC_REQ_IES      = 1<<17,
-        STATION_INFO_STA_FLAGS          = 1<<18,
-        STATION_INFO_BEACON_LOSS_COUNT  = 1<<19,
-        STATION_INFO_T_OFFSET           = 1<<20,
+        STATION_INFO_CONNECTED_TIME     = 1<<16
 };
 
 /**
@@ -684,24 +453,14 @@ enum station_info_flags {
  * Used by the driver to indicate the specific rate transmission
  * type for 802.11n transmissions.
  *
- * @RATE_INFO_FLAGS_MCS: mcs field filled with HT MCS
- * @RATE_INFO_FLAGS_VHT_MCS: mcs field filled with VHT MCS
- * @RATE_INFO_FLAGS_40_MHZ_WIDTH: 40 MHz width transmission
- * @RATE_INFO_FLAGS_80_MHZ_WIDTH: 80 MHz width transmission
- * @RATE_INFO_FLAGS_80P80_MHZ_WIDTH: 80+80 MHz width transmission
- * @RATE_INFO_FLAGS_160_MHZ_WIDTH: 160 MHz width transmission
+ * @RATE_INFO_FLAGS_MCS: @tx_bitrate_mcs filled
+ * @RATE_INFO_FLAGS_40_MHZ_WIDTH: 40 Mhz width transmission
  * @RATE_INFO_FLAGS_SHORT_GI: 400ns guard interval
- * @RATE_INFO_FLAGS_60G: 60GHz MCS
  */
 enum rate_info_flags {
-        RATE_INFO_FLAGS_MCS                     = BIT(0),
-        RATE_INFO_FLAGS_VHT_MCS                 = BIT(1),
-        RATE_INFO_FLAGS_40_MHZ_WIDTH            = BIT(2),
-        RATE_INFO_FLAGS_80_MHZ_WIDTH            = BIT(3),
-        RATE_INFO_FLAGS_80P80_MHZ_WIDTH         = BIT(4),
-        RATE_INFO_FLAGS_160_MHZ_WIDTH           = BIT(5),
-        RATE_INFO_FLAGS_SHORT_GI                = BIT(6),
-        RATE_INFO_FLAGS_60G                     = BIT(7),
+        RATE_INFO_FLAGS_MCS             = 1<<0,
+        RATE_INFO_FLAGS_40_MHZ_WIDTH    = 1<<1,
+        RATE_INFO_FLAGS_SHORT_GI        = 1<<2,
 };
 
 /**
@@ -712,13 +471,11 @@ enum rate_info_flags {
  * @flags: bitflag of flags from &enum rate_info_flags
  * @mcs: mcs index if struct describes a 802.11n bitrate
  * @legacy: bitrate in 100kbit/s for 802.11abg
- * @nss: number of streams (VHT only)
  */
 struct rate_info {
         u8 flags;
         u8 mcs;
         u16 legacy;
-        u8 nss;
 };
 
 /**
@@ -765,10 +522,8 @@ struct sta_bss_parameters {
  * @llid: mesh local link id
  * @plid: mesh peer link id
  * @plink_state: mesh peer link state
- * @signal: The signal strength, type depends on the wiphy's signal_type.
- *      For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
- * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
- *      For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
+ * @signal: signal strength of last received packet in dBm
+ * @signal_avg: signal strength average in dBm
  * @txrate: current unicast bitrate from this station
  * @rxrate: current unicast bitrate to this station
  * @rx_packets: packets received from this station
@@ -786,9 +541,6 @@ struct sta_bss_parameters {
  *      user space MLME/SME implementation. The information is provided for
  *      the cfg80211_new_sta() calls to notify user space of the IEs.
  * @assoc_req_ies_len: Length of assoc_req_ies buffer in octets.
- * @sta_flags: station flags mask & values
- * @beacon_loss_count: Number of times beacon loss event has triggered.
- * @t_offset: Time offset of the station relative to this host.
  */
 struct station_info {
         u32 filled;
@@ -809,16 +561,12 @@ struct station_info {
         u32 tx_failed;
         u32 rx_dropped_misc;
         struct sta_bss_parameters bss_param;
-        struct nl80211_sta_flag_update sta_flags;
 
         int generation;
 
         const u8 *assoc_req_ies;
         size_t assoc_req_ies_len;
 
-        u32 beacon_loss_count;
-        s64 t_offset;
-
         /*
          * Note: Add a new enum station_info_flags value for each new field and
          * use it to check which fields are initialized.
@@ -917,8 +665,6 @@ struct mpath_info {
  * @ap_isolate: do not forward packets between connected stations
  * @ht_opmode: HT Operation mode
  *      (u16 = opmode, -1 = do not change)
- * @p2p_ctwindow: P2P CT Window (-1 = no change)
- * @p2p_opp_ps: P2P opportunistic PS (-1 = no change)
  */
 struct bss_parameters {
         int use_cts_prot;
@@ -928,133 +674,62 @@ struct bss_parameters {
         u8 basic_rates_len;
         int ap_isolate;
         int ht_opmode;
-        s8 p2p_ctwindow, p2p_opp_ps;
 };
 
-/**
+/*
  * struct mesh_config - 802.11s mesh configuration
  *
  * These parameters can be changed while the mesh is active.
- *
- * @dot11MeshRetryTimeout: the initial retry timeout in millisecond units used
- *      by the Mesh Peering Open message
- * @dot11MeshConfirmTimeout: the initial retry timeout in millisecond units
- *      used by the Mesh Peering Open message
- * @dot11MeshHoldingTimeout: the confirm timeout in millisecond units used by
- *      the mesh peering management to close a mesh peering
- * @dot11MeshMaxPeerLinks: the maximum number of peer links allowed on this
- *      mesh interface
- * @dot11MeshMaxRetries: the maximum number of peer link open retries that can
- *      be sent to establish a new peer link instance in a mesh
- * @dot11MeshTTL: the value of TTL field set at a source mesh STA
- * @element_ttl: the value of TTL field set at a mesh STA for path selection
- *      elements
- * @auto_open_plinks: whether we should automatically open peer links when we
- *      detect compatible mesh peers
- * @dot11MeshNbrOffsetMaxNeighbor: the maximum number of neighbors to
- *      synchronize to for 11s default synchronization method
- * @dot11MeshHWMPmaxPREQretries: the number of action frames containing a PREQ
- *      that an originator mesh STA can send to a particular path target
- * @path_refresh_time: how frequently to refresh mesh paths in milliseconds
- * @min_discovery_timeout: the minimum length of time to wait until giving up on
- *      a path discovery in milliseconds
- * @dot11MeshHWMPactivePathTimeout: the time (in TUs) for which mesh STAs
- *      receiving a PREQ shall consider the forwarding information from the
- *      root to be valid. (TU = time unit)
- * @dot11MeshHWMPpreqMinInterval: the minimum interval of time (in TUs) during
- *      which a mesh STA can send only one action frame containing a PREQ
- *      element
- * @dot11MeshHWMPperrMinInterval: the minimum interval of time (in TUs) during
- *      which a mesh STA can send only one Action frame containing a PERR
- *      element
- * @dot11MeshHWMPnetDiameterTraversalTime: the interval of time (in TUs) that
- *      it takes for an HWMP information element to propagate across the mesh
- * @dot11MeshHWMPRootMode: the configuration of a mesh STA as root mesh STA
- * @dot11MeshHWMPRannInterval: the interval of time (in TUs) between root
- *      announcements are transmitted
- * @dot11MeshGateAnnouncementProtocol: whether to advertise that this mesh
- *      station has access to a broader network beyond the MBSS. (This is
- *      missnamed in draft 12.0: dot11MeshGateAnnouncementProtocol set to true
- *      only means that the station will announce others it's a mesh gate, but
- *      not necessarily using the gate announcement protocol. Still keeping the
- *      same nomenclature to be in sync with the spec)
- * @dot11MeshForwarding: whether the Mesh STA is forwarding or non-forwarding
- *      entity (default is TRUE - forwarding entity)
- * @rssi_threshold: the threshold for average signal strength of candidate
- *      station to establish a peer link
- * @ht_opmode: mesh HT protection mode
- *
- * @dot11MeshHWMPactivePathToRootTimeout: The time (in TUs) for which mesh STAs
- *      receiving a proactive PREQ shall consider the forwarding information to
- *      the root mesh STA to be valid.
- *
- * @dot11MeshHWMProotInterval: The interval of time (in TUs) between proactive
- *      PREQs are transmitted.
- * @dot11MeshHWMPconfirmationInterval: The minimum interval of time (in TUs)
- *      during which a mesh STA can send only one Action frame containing
- *      a PREQ element for root path confirmation.
  */
 struct mesh_config {
+        /* Timeouts in ms */
+        /* Mesh plink management parameters */
         u16 dot11MeshRetryTimeout;
         u16 dot11MeshConfirmTimeout;
         u16 dot11MeshHoldingTimeout;
         u16 dot11MeshMaxPeerLinks;
-        u8 dot11MeshMaxRetries;
-        u8 dot11MeshTTL;
-        u8 element_ttl;
+        u8  dot11MeshMaxRetries;
+        u8  dot11MeshTTL;
+        /* ttl used in path selection information elements */
+        u8  element_ttl;
         bool auto_open_plinks;
-        u32 dot11MeshNbrOffsetMaxNeighbor;
-        u8 dot11MeshHWMPmaxPREQretries;
+        /* HWMP parameters */
+        u8  dot11MeshHWMPmaxPREQretries;
         u32 path_refresh_time;
         u16 min_discovery_timeout;
         u32 dot11MeshHWMPactivePathTimeout;
         u16 dot11MeshHWMPpreqMinInterval;
-        u16 dot11MeshHWMPperrMinInterval;
         u16 dot11MeshHWMPnetDiameterTraversalTime;
-        u8 dot11MeshHWMPRootMode;
-        u16 dot11MeshHWMPRannInterval;
-        bool dot11MeshGateAnnouncementProtocol;
-        bool dot11MeshForwarding;
-        s32 rssi_threshold;
-        u16 ht_opmode;
-        u32 dot11MeshHWMPactivePathToRootTimeout;
-        u16 dot11MeshHWMProotInterval;
-        u16 dot11MeshHWMPconfirmationInterval;
+        u8  dot11MeshHWMPRootMode;
 };
 
 /**
  * struct mesh_setup - 802.11s mesh setup configuration
- * @chandef: defines the channel to use
  * @mesh_id: the mesh ID
  * @mesh_id_len: length of the mesh ID, at least 1 and at most 32 bytes
- * @sync_method: which synchronization method to use
  * @path_sel_proto: which path selection protocol to use
  * @path_metric: which metric to use
  * @ie: vendor information elements (optional)
  * @ie_len: length of vendor information elements
  * @is_authenticated: this mesh requires authentication
  * @is_secure: this mesh uses security
- * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a]
  *
  * These parameters are fixed when the mesh is created.
  */
 struct mesh_setup {
-        struct cfg80211_chan_def chandef;
         const u8 *mesh_id;
         u8 mesh_id_len;
-        u8 sync_method;
-        u8 path_sel_proto;
-        u8 path_metric;
+        u8  path_sel_proto;
+        u8  path_metric;
         const u8 *ie;
         u8 ie_len;
         bool is_authenticated;
         bool is_secure;
-        int mcast_rate[IEEE80211_NUM_BANDS];
 };
 
 /**
  * struct ieee80211_txq_params - TX queue parameters
- * @ac: AC identifier
+ * @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]
@@ -1063,13 +738,16 @@ struct mesh_setup {
  * @aifs: Arbitration interframe space [0..255]
  */
 struct ieee80211_txq_params {
-        enum nl80211_ac ac;
+        enum nl80211_txq_q queue;
         u16 txop;
         u16 cwmin;
         u16 cwmax;
         u8 aifs;
 };
 
+/* from net/wireless.h */
+struct wiphy;
+
 /**
  * DOC: Scanning and BSS list handling
  *
@@ -1112,13 +790,10 @@ struct cfg80211_ssid {
  * @n_channels: total number of channels to scan
  * @ie: optional information element(s) to add into Probe Request or %NULL
  * @ie_len: length of ie in octets
- * @flags: bit field of flags controlling operation
  * @rates: bitmap of rates to advertise for each band
  * @wiphy: the wiphy this was for
- * @scan_start: time (in jiffies) when the scan started
- * @wdev: the wireless device to scan for
+ * @dev: the interface
  * @aborted: (internal) scan request was notified as aborted
- * @no_cck: used to send probe requests at non CCK rate in 2GHz band
  */
 struct cfg80211_scan_request {
         struct cfg80211_ssid *ssids;
@@ -1126,32 +801,19 @@ struct cfg80211_scan_request {
         u32 n_channels;
         const u8 *ie;
         size_t ie_len;
-        u32 flags;
 
         u32 rates[IEEE80211_NUM_BANDS];
 
-        struct wireless_dev *wdev;
-
         /* internal */
         struct wiphy *wiphy;
-        unsigned long scan_start;
+        struct net_device *dev;
         bool aborted;
-        bool no_cck;
 
         /* keep last */
         struct ieee80211_channel *channels[0];
 };
 
 /**
- * struct cfg80211_match_set - sets of attributes to match
- *
- * @ssid: SSID to be matched
- */
-struct cfg80211_match_set {
-        struct cfg80211_ssid ssid;
-};
-
-/**
  * struct cfg80211_sched_scan_request - scheduled scan request description
  *
  * @ssids: SSIDs to scan for (passed in the probe_reqs in active scans)
@@ -1160,16 +822,9 @@ struct cfg80211_match_set {
  * @interval: interval between each scheduled scan cycle
  * @ie: optional information element(s) to add into Probe Request or %NULL
  * @ie_len: length of ie in octets
- * @flags: bit field of flags controlling operation
- * @match_sets: sets of parameters to be matched for a scan result
- *      entry to be considered valid and to be passed to the host
- *      (others are filtered out).
- *      If ommited, all results are passed.
- * @n_match_sets: number of match sets
  * @wiphy: the wiphy this was for
  * @dev: the interface
  * @channels: channels to scan
- * @rssi_thold: don't report scan results below this threshold (in s32 dBm)
  */
 struct cfg80211_sched_scan_request {
         struct cfg80211_ssid *ssids;
@@ -1178,15 +833,10 @@ struct cfg80211_sched_scan_request {
         u32 interval;
         const u8 *ie;
         size_t ie_len;
-        u32 flags;
-        struct cfg80211_match_set *match_sets;
-        int n_match_sets;
-        s32 rssi_thold;
 
         /* internal */
         struct wiphy *wiphy;
         struct net_device *dev;
-        unsigned long scan_start;
 
         /* keep last */
         struct ieee80211_channel *channels[0];
@@ -1206,18 +856,6 @@ enum cfg80211_signal_type {
 };
 
 /**
- * struct cfg80211_bss_ie_data - BSS entry IE data
- * @rcu_head: internal use, for freeing
- * @len: length of the IEs
- * @data: IE data
- */
-struct cfg80211_bss_ies {
-        struct rcu_head rcu_head;
-        int len;
-        u8 data[];
-};
-
-/**
  * struct cfg80211_bss - BSS description
  *
  * This structure describes a BSS (which may also be a mesh network)
@@ -1228,34 +866,36 @@ struct cfg80211_bss_ies {
  * @tsf: timestamp of last received update
  * @beacon_interval: the beacon interval as from the frame
  * @capability: the capability field in host byte order
- * @ies: the information elements (Note that there
+ * @information_elements: the information elements (Note that there
  *      is no guarantee that these are well-formed!); this is a pointer to
  *      either the beacon_ies or proberesp_ies depending on whether Probe
  *      Response frame has been received
+ * @len_information_elements: total length of the information elements
  * @beacon_ies: the information elements from the last Beacon frame
+ * @len_beacon_ies: total length of the beacon_ies
  * @proberesp_ies: the information elements from the last Probe Response frame
+ * @len_proberesp_ies: total length of the proberesp_ies
  * @signal: signal strength value (type depends on the wiphy's signal_type)
  * @free_priv: function pointer to free private data
  * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
  */
 struct cfg80211_bss {
-        u64 tsf;
-
         struct ieee80211_channel *channel;
 
-        const struct cfg80211_bss_ies __rcu *ies;
-        const struct cfg80211_bss_ies __rcu *beacon_ies;
-        const struct cfg80211_bss_ies __rcu *proberesp_ies;
-
-        void (*free_priv)(struct cfg80211_bss *bss);
-
-        s32 signal;
-
+        u8 bssid[ETH_ALEN];
+        u64 tsf;
         u16 beacon_interval;
         u16 capability;
+        u8 *information_elements;
+        size_t len_information_elements;
+        u8 *beacon_ies;
+        size_t len_beacon_ies;
+        u8 *proberesp_ies;
+        size_t len_proberesp_ies;
 
-        u8 bssid[ETH_ALEN];
+        s32 signal;
 
+        void (*free_priv)(struct cfg80211_bss *bss);
         u8 priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
 
@@ -1263,15 +903,42 @@ struct cfg80211_bss {
  * ieee80211_bss_get_ie - find IE with given ID
  * @bss: the bss to search
  * @ie: the IE ID
- *
- * Note that the return value is an RCU-protected pointer, so
- * rcu_read_lock() must be held when calling this function.
  * Returns %NULL if not found.
  */
 const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie);
 
 
 /**
+ * struct cfg80211_crypto_settings - Crypto settings
+ * @wpa_versions: indicates which, if any, WPA versions are enabled
+ *      (from enum nl80211_wpa_versions)
+ * @cipher_group: group key cipher suite (or 0 if unset)
+ * @n_ciphers_pairwise: number of AP supported unicast ciphers
+ * @ciphers_pairwise: unicast key cipher suites
+ * @n_akm_suites: number of AKM suites
+ * @akm_suites: AKM suites
+ * @control_port: Whether user space controls IEEE 802.1X port, i.e.,
+ *      sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
+ *      required to assume that the port is unauthorized until authorized by
+ *      user space. Otherwise, port is marked authorized by default.
+ * @control_port_ethertype: the control port protocol that should be
+ *      allowed through even on unauthorized ports
+ * @control_port_no_encrypt: TRUE to prevent encryption of control port
+ *      protocol frames.
+ */
+struct cfg80211_crypto_settings {
+        u32 wpa_versions;
+        u32 cipher_group;
+        int n_ciphers_pairwise;
+        u32 ciphers_pairwise[NL80211_MAX_NR_CIPHER_SUITES];
+        int n_akm_suites;
+        u32 akm_suites[NL80211_MAX_NR_AKM_SUITES];
+        bool control_port;
+        __be16 control_port_ethertype;
+        bool control_port_no_encrypt;
+};
+
+/**
  * struct cfg80211_auth_request - Authentication request data
  *
  * This structure provides information needed to complete IEEE 802.11
@@ -1284,9 +951,10 @@ const u8 *ieee80211_bss_get_ie(struct cfg80211_bss *bss, u8 ie);
  * @key_len: length of WEP key for shared key authentication
  * @key_idx: index of WEP key for shared key authentication
  * @key: WEP key for shared key authentication
- * @sae_data: Non-IE data to use with SAE or %NULL. This starts with
- *      Authentication transaction sequence number field.
- * @sae_data_len: Length of sae_data buffer in octets
+ * @local_state_change: This is a request for a local state only, i.e., no
+ *      Authentication frame is to be transmitted and authentication state is
+ *      to be changed without having to wait for a response from the peer STA
+ *      (AP).
  */
 struct cfg80211_auth_request {
         struct cfg80211_bss *bss;
@@ -1295,17 +963,7 @@ struct cfg80211_auth_request {
         enum nl80211_auth_type auth_type;
         const u8 *key;
         u8 key_len, key_idx;
-        const u8 *sae_data;
-        size_t sae_data_len;
-};
-
-/**
- * enum cfg80211_assoc_req_flags - Over-ride default behaviour in association.
- *
- * @ASSOC_REQ_DISABLE_HT:  Disable HT (802.11n)
- */
-enum cfg80211_assoc_req_flags {
-        ASSOC_REQ_DISABLE_HT            = BIT(0),
+        bool local_state_change;
 };
 
 /**
@@ -1313,20 +971,12 @@ enum cfg80211_assoc_req_flags {
  *
  * This structure provides information needed to complete IEEE 802.11
  * (re)association.
- * @bss: The BSS to associate with. If the call is successful the driver
- *      is given a reference that it must release, normally via a call to
- *      cfg80211_send_rx_assoc(), or, if association timed out, with a
- *      call to cfg80211_put_bss() (in addition to calling
- *      cfg80211_send_assoc_timeout())
+ * @bss: The BSS to associate with.
  * @ie: Extra IEs to add to (Re)Association Request frame or %NULL
  * @ie_len: Length of ie buffer in octets
  * @use_mfp: Use management frame protection (IEEE 802.11w) in this association
  * @crypto: crypto settings
  * @prev_bssid: previous BSSID, if not %NULL use reassociate frame
- * @flags:  See &enum cfg80211_assoc_req_flags
- * @ht_capa:  HT Capabilities over-rides.  Values set in ht_capa_mask
- *   will be used in ht_capa.  Un-supported values will be ignored.
- * @ht_capa_mask:  The bits of ht_capa which are to be used.
  */
 struct cfg80211_assoc_request {
         struct cfg80211_bss *bss;
@@ -1334,9 +984,6 @@ struct cfg80211_assoc_request {
         size_t ie_len;
         struct cfg80211_crypto_settings crypto;
         bool use_mfp;
-        u32 flags;
-        struct ieee80211_ht_cap ht_capa;
-        struct ieee80211_ht_cap ht_capa_mask;
 };
 
 /**
@@ -1345,13 +992,15 @@ struct cfg80211_assoc_request {
  * This structure provides information needed to complete IEEE 802.11
  * deauthentication.
  *
- * @bssid: the BSSID of the BSS to deauthenticate from
+ * @bss: the BSS to deauthenticate from
  * @ie: Extra IEs to add to Deauthentication frame or %NULL
  * @ie_len: Length of ie buffer in octets
  * @reason_code: The reason code for the deauthentication
+ * @local_state_change: This is a request for a local state only, i.e., no
+ *      Deauthentication frame is to be transmitted.
  */
 struct cfg80211_deauth_request {
-        const u8 *bssid;
+        struct cfg80211_bss *bss;
         const u8 *ie;
         size_t ie_len;
         u16 reason_code;
@@ -1389,7 +1038,7 @@ struct cfg80211_disassoc_request {
  * @ssid_len: The length of the SSID, will always be non-zero.
  * @bssid: Fixed BSSID requested, maybe be %NULL, if set do not
  *      search for IBSSs with a different BSSID.
- * @chandef: defines the channel to use if no other IBSS to join can be found
+ * @channel: The channel to use if no IBSS can be found to join.
  * @channel_fixed: The channel should be fixed -- do not search for
  *      IBSSs to join on other channels.
  * @ie: information element(s) to include in the beacon
@@ -1397,24 +1046,19 @@ struct cfg80211_disassoc_request {
  * @beacon_interval: beacon interval to use
  * @privacy: this is a protected network, keys will be configured
  *      after joining
- * @control_port: whether user space controls IEEE 802.1X port, i.e.,
- *      sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
- *      required to assume that the port is unauthorized until authorized by
- *      user space. Otherwise, port is marked authorized by default.
  * @basic_rates: bitmap of basic rates to use when creating the IBSS
  * @mcast_rate: per-band multicast rate index + 1 (0: disabled)
  */
 struct cfg80211_ibss_params {
         u8 *ssid;
         u8 *bssid;
-        struct cfg80211_chan_def chandef;
+        struct ieee80211_channel *channel;
         u8 *ie;
         u8 ssid_len, ie_len;
         u16 beacon_interval;
         u32 basic_rates;
         bool channel_fixed;
         bool privacy;
-        bool control_port;
         int mcast_rate[IEEE80211_NUM_BANDS];
 };
 
@@ -1438,12 +1082,6 @@ struct cfg80211_ibss_params {
  * @key_len: length of WEP key for shared key authentication
  * @key_idx: index of WEP key for shared key authentication
  * @key: WEP key for shared key authentication
- * @flags:  See &enum cfg80211_assoc_req_flags
- * @bg_scan_period:  Background scan period in seconds
- *   or -1 to indicate that default value is to be used.
- * @ht_capa:  HT Capabilities over-rides.  Values set in ht_capa_mask
- *   will be used in ht_capa.  Un-supported values will be ignored.
- * @ht_capa_mask:  The bits of ht_capa which are to be used.
  */
 struct cfg80211_connect_params {
         struct ieee80211_channel *channel;
@@ -1457,10 +1095,6 @@ struct cfg80211_connect_params {
         struct cfg80211_crypto_settings crypto;
         const u8 *key;
         u8 key_len, key_idx;
-        u32 flags;
-        int bg_scan_period;
-        struct ieee80211_ht_cap ht_capa;
-        struct ieee80211_ht_cap ht_capa_mask;
 };
 
 /**
@@ -1485,7 +1119,8 @@ enum wiphy_params_flags {
 struct cfg80211_bitrate_mask {
         struct {
                 u32 legacy;
-                u8 mcs[IEEE80211_HT_MCS_MASK_LEN];
+                /* TODO: add support for masking MCS rates; e.g.: */
+                /* u8 mcs[IEEE80211_HT_MCS_MASK_LEN]; */
         } control[IEEE80211_NUM_BANDS];
 };
 /**
@@ -1569,17 +1204,13 @@ struct cfg80211_gtk_rekey_data {
  *      be %NULL or contain the enabled Wake-on-Wireless triggers that are
  *      configured for the device.
  * @resume: wiphy device needs to be resumed
- * @set_wakeup: Called when WoWLAN is enabled/disabled, use this callback
- *      to call device_set_wakeup_enable() to enable/disable wakeup from
- *      the device.
  *
  * @add_virtual_intf: create a new virtual interface with the given name,
  *      must set the struct wireless_dev's iftype. Beware: You must create
- *      the new netdev in the wiphy's network namespace! Returns the struct
- *      wireless_dev, or an ERR_PTR. For P2P device wdevs, the driver must
- *      also set the address member in the wdev.
+ *      the new netdev in the wiphy's network namespace! Returns the netdev,
+ *      or an ERR_PTR.
  *
- * @del_virtual_intf: remove the virtual interface
+ * @del_virtual_intf: remove the virtual interface determined by ifindex.
  *
  * @change_virtual_intf: change type/configuration of virtual interface,
  *      keep the struct wireless_dev's iftype updated.
@@ -1602,19 +1233,16 @@ struct cfg80211_gtk_rekey_data {
  *
  * @set_rekey_data: give the data necessary for GTK rekeying to the driver
  *
- * @start_ap: Start acting in AP mode defined by the parameters.
- * @change_beacon: Change the beacon parameters for an access point mode
- *      interface. This should reject the call when AP mode wasn't started.
- * @stop_ap: Stop being an AP, including stopping beaconing.
+ * @add_beacon: Add a beacon with given parameters, @head, @interval
+ *      and @dtim_period will be valid, @tail is optional.
+ * @set_beacon: Change the beacon parameters for an access point mode
+ *      interface. This should reject the call when no beacon has been
+ *      configured.
+ * @del_beacon: Remove beacon configuration and stop sending the beacon.
  *
  * @add_station: Add a new station.
  * @del_station: Remove a station; @mac may be NULL to remove all stations.
- * @change_station: Modify a given station. Note that flags changes are not much
- *      validated in cfg80211, in particular the auth/assoc/authorized flags
- *      might come to the driver in invalid combinations -- make sure to check
- *      them, also against the existing state! Also, supported_rates changes are
- *      not checked in station mode -- drivers need to reject (or ignore) them
- *      for anything but TDLS peers.
+ * @change_station: Modify a given station.
  * @get_station: get station information for the station identified by @mac
  * @dump_station: dump station callback -- resume dump at index @idx
  *
@@ -1636,14 +1264,11 @@ struct cfg80211_gtk_rekey_data {
  *
  * @set_txq_params: Set TX queue parameters
  *
- * @libertas_set_mesh_channel: Only for backward compatibility for libertas,
- *      as it doesn't implement join_mesh and needs to set the channel to
- *      join the mesh instead.
- *
- * @set_monitor_channel: Set the monitor mode channel for the device. If other
- *      interfaces are active this callback should reject the configuration.
- *      If no interfaces are active or the device is down, the channel should
- *      be stored for when a monitor interface becomes active.
+ * @set_channel: Set channel for a given wireless interface. Some devices
+ *      may support multi-channel operation (by channel hopping) so cfg80211
+ *      doesn't verify much. Note, however, that the passed netdev may be
+ *      %NULL as well if the user requested changing the channel for the
+ *      device itself, or for a monitor interface.
  *
  * @scan: Request to do a scan. If returning zero, the scan request is given
  *      the driver, and will be valid until passed to cfg80211_scan_done().
@@ -1666,19 +1291,12 @@ struct cfg80211_gtk_rekey_data {
  *      to a merge.
  * @leave_ibss: Leave the IBSS.
  *
- * @set_mcast_rate: Set the specified multicast rate (only if vif is in ADHOC or
- *      MESH mode)
- *
  * @set_wiphy_params: Notify that wiphy parameters have changed;
  *      @changed bitfield (see &enum wiphy_params_flags) describes which values
  *      have changed. The actual parameter values are available in
  *      struct wiphy. If returning an error, no value should be changed.
  *
- * @set_tx_power: set the transmit power according to the parameters,
- *      the power passed is in mBm, to get dBm use MBM_TO_DBM(). The
- *      wdev may be %NULL if power was set for the wiphy, and will
- *      always be %NULL unless the driver supports per-vif TX power
- *      (as advertised by the nl80211 feature flag.)
+ * @set_tx_power: set the transmit power according to the parameters
  * @get_tx_power: store the current TX power into the dbm variable;
  *      return 0 if successful
  *
@@ -1719,10 +1337,10 @@ struct cfg80211_gtk_rekey_data {
  * @set_power_mgmt: Configure WLAN power management. A timeout value of -1
  *      allows the driver to adjust the dynamic ps timeout value.
  * @set_cqm_rssi_config: Configure connection quality monitor RSSI threshold.
- * @set_cqm_txe_config: Configure connection quality monitor TX error
- *      thresholds.
  * @sched_scan_start: Tell the driver to start a scheduled scan.
- * @sched_scan_stop: Tell the driver to stop an ongoing scheduled scan.
+ * @sched_scan_stop: Tell the driver to stop an ongoing scheduled
+ *      scan.  The driver_initiated flag specifies whether the driver
+ *      itself has informed that the scan has stopped.
  *
  * @mgmt_frame_register: Notify driver that a management frame type was
  *      registered. Note that this callback may not sleep, and cannot run
@@ -1738,44 +1356,17 @@ struct cfg80211_gtk_rekey_data {
  * @set_ringparam: Set tx and rx ring sizes.
  *
  * @get_ringparam: Get tx and rx ring current and maximum sizes.
- *
- * @tdls_mgmt: Transmit a TDLS management frame.
- * @tdls_oper: Perform a high-level TDLS operation (e.g. TDLS link setup).
- *
- * @probe_client: probe an associated client, must return a cookie that it
- *      later passes to cfg80211_probe_status().
- *
- * @set_noack_map: Set the NoAck Map for the TIDs.
- *
- * @get_et_sset_count:  Ethtool API to get string-set count.
- *      See @ethtool_ops.get_sset_count
- *
- * @get_et_stats:  Ethtool API to get a set of u64 stats.
- *      See @ethtool_ops.get_ethtool_stats
- *
- * @get_et_strings:  Ethtool API to get a set of strings to describe stats
- *      and perhaps other supported types of ethtool data-sets.
- *      See @ethtool_ops.get_strings
- *
- * @get_channel: Get the current operating channel for the virtual interface.
- *      For monitor interfaces, it should return %NULL unless there's a single
- *      current monitoring channel.
- *
- * @start_p2p_device: Start the given P2P device.
- * @stop_p2p_device: Stop the given P2P device.
  */
 struct cfg80211_ops {
         int     (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow);
         int     (*resume)(struct wiphy *wiphy);
-        void    (*set_wakeup)(struct wiphy *wiphy, bool enabled);
-
-        struct wireless_dev * (*add_virtual_intf)(struct wiphy *wiphy,
-                                                  const char *name,
-                                                  enum nl80211_iftype type,
-                                                  u32 *flags,
-                                                  struct vif_params *params);
-        int     (*del_virtual_intf)(struct wiphy *wiphy,
-                                    struct wireless_dev *wdev);
+
+        struct net_device * (*add_virtual_intf)(struct wiphy *wiphy,
+                                                char *name,
+                                                enum nl80211_iftype type,
+                                                u32 *flags,
+                                                struct vif_params *params);
+        int     (*del_virtual_intf)(struct wiphy *wiphy, struct net_device *dev);
         int     (*change_virtual_intf)(struct wiphy *wiphy,
                                        struct net_device *dev,
                                        enum nl80211_iftype type, u32 *flags,
@@ -1797,11 +1388,11 @@ struct cfg80211_ops {
                                         struct net_device *netdev,
                                         u8 key_index);
 
-        int     (*start_ap)(struct wiphy *wiphy, struct net_device *dev,
-                            struct cfg80211_ap_settings *settings);
-        int     (*change_beacon)(struct wiphy *wiphy, struct net_device *dev,
-                                 struct cfg80211_beacon_data *info);
-        int     (*stop_ap)(struct wiphy *wiphy, struct net_device *dev);
+        int     (*add_beacon)(struct wiphy *wiphy, struct net_device *dev,
+                              struct beacon_parameters *info);
+        int     (*set_beacon)(struct wiphy *wiphy, struct net_device *dev,
+                              struct beacon_parameters *info);
+        int     (*del_beacon)(struct wiphy *wiphy, struct net_device *dev);
 
 
         int     (*add_station)(struct wiphy *wiphy, struct net_device *dev,
@@ -1841,17 +1432,14 @@ struct cfg80211_ops {
         int     (*change_bss)(struct wiphy *wiphy, struct net_device *dev,
                               struct bss_parameters *params);
 
-        int     (*set_txq_params)(struct wiphy *wiphy, struct net_device *dev,
+        int     (*set_txq_params)(struct wiphy *wiphy,
                                   struct ieee80211_txq_params *params);
 
-        int     (*libertas_set_mesh_channel)(struct wiphy *wiphy,
-                                             struct net_device *dev,
-                                             struct ieee80211_channel *chan);
-
-        int     (*set_monitor_channel)(struct wiphy *wiphy,
-                                       struct cfg80211_chan_def *chandef);
+        int     (*set_channel)(struct wiphy *wiphy, struct net_device *dev,
+                               struct ieee80211_channel *chan,
+                               enum nl80211_channel_type channel_type);
 
-        int     (*scan)(struct wiphy *wiphy,
+        int     (*scan)(struct wiphy *wiphy, struct net_device *dev,
                         struct cfg80211_scan_request *request);
 
         int     (*auth)(struct wiphy *wiphy, struct net_device *dev,
@@ -1859,9 +1447,11 @@ struct cfg80211_ops {
         int     (*assoc)(struct wiphy *wiphy, struct net_device *dev,
                          struct cfg80211_assoc_request *req);
         int     (*deauth)(struct wiphy *wiphy, struct net_device *dev,
-                          struct cfg80211_deauth_request *req);
+                          struct cfg80211_deauth_request *req,
+                          void *cookie);
         int     (*disassoc)(struct wiphy *wiphy, struct net_device *dev,
-                            struct cfg80211_disassoc_request *req);
+                            struct cfg80211_disassoc_request *req,
+                            void *cookie);
 
         int     (*connect)(struct wiphy *wiphy, struct net_device *dev,
                            struct cfg80211_connect_params *sme);
@@ -1872,15 +1462,11 @@ struct cfg80211_ops {
                              struct cfg80211_ibss_params *params);
         int     (*leave_ibss)(struct wiphy *wiphy, struct net_device *dev);
 
-        int     (*set_mcast_rate)(struct wiphy *wiphy, struct net_device *dev,
-                                  int rate[IEEE80211_NUM_BANDS]);
-
         int     (*set_wiphy_params)(struct wiphy *wiphy, u32 changed);
 
-        int     (*set_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
+        int     (*set_tx_power)(struct wiphy *wiphy,
                                 enum nl80211_tx_power_setting type, int mbm);
-        int     (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
-                                int *dbm);
+        int     (*get_tx_power)(struct wiphy *wiphy, int *dbm);
 
         int     (*set_wds_peer)(struct wiphy *wiphy, struct net_device *dev,
                                 const u8 *addr);
@@ -1909,20 +1495,22 @@ struct cfg80211_ops {
         int     (*flush_pmksa)(struct wiphy *wiphy, struct net_device *netdev);
 
         int     (*remain_on_channel)(struct wiphy *wiphy,
-                                     struct wireless_dev *wdev,
+                                     struct net_device *dev,
                                      struct ieee80211_channel *chan,
+                                     enum nl80211_channel_type channel_type,
                                      unsigned int duration,
                                      u64 *cookie);
         int     (*cancel_remain_on_channel)(struct wiphy *wiphy,
-                                            struct wireless_dev *wdev,
+                                            struct net_device *dev,
                                             u64 cookie);
 
-        int     (*mgmt_tx)(struct wiphy *wiphy, struct wireless_dev *wdev,
+        int     (*mgmt_tx)(struct wiphy *wiphy, struct net_device *dev,
                           struct ieee80211_channel *chan, bool offchan,
-                          unsigned int wait, const u8 *buf, size_t len,
-                          bool no_cck, bool dont_wait_for_ack, u64 *cookie);
+                          enum nl80211_channel_type channel_type,
+                          bool channel_type_valid, unsigned int wait,
+                          const u8 *buf, size_t len, u64 *cookie);
         int     (*mgmt_tx_cancel_wait)(struct wiphy *wiphy,
-                                       struct wireless_dev *wdev,
+                                       struct net_device *dev,
                                        u64 cookie);
 
         int     (*set_power_mgmt)(struct wiphy *wiphy, struct net_device *dev,
@@ -1932,12 +1520,8 @@ struct cfg80211_ops {
                                        struct net_device *dev,
                                        s32 rssi_thold, u32 rssi_hyst);
 
-        int     (*set_cqm_txe_config)(struct wiphy *wiphy,
-                                      struct net_device *dev,
-                                      u32 rate, u32 pkts, u32 intvl);
-
         void    (*mgmt_frame_register)(struct wiphy *wiphy,
-                                       struct wireless_dev *wdev,
+                                       struct net_device *dev,
                                        u16 frame_type, bool reg);
 
         int     (*set_antenna)(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant);
@@ -1954,35 +1538,6 @@ struct cfg80211_ops {
 
         int     (*set_rekey_data)(struct wiphy *wiphy, struct net_device *dev,
                                   struct cfg80211_gtk_rekey_data *data);
-
-        int     (*tdls_mgmt)(struct wiphy *wiphy, struct net_device *dev,
-                             u8 *peer, u8 action_code,  u8 dialog_token,
-                             u16 status_code, const u8 *buf, size_t len);
-        int     (*tdls_oper)(struct wiphy *wiphy, struct net_device *dev,
-                             u8 *peer, enum nl80211_tdls_operation oper);
-
-        int     (*probe_client)(struct wiphy *wiphy, struct net_device *dev,
-                                const u8 *peer, u64 *cookie);
-
-        int     (*set_noack_map)(struct wiphy *wiphy,
-                                  struct net_device *dev,
-                                  u16 noack_map);
-
-        int     (*get_et_sset_count)(struct wiphy *wiphy,
-                                     struct net_device *dev, int sset);
-        void    (*get_et_stats)(struct wiphy *wiphy, struct net_device *dev,
-                                struct ethtool_stats *stats, u64 *data);
-        void    (*get_et_strings)(struct wiphy *wiphy, struct net_device *dev,
-                                  u32 sset, u8 *data);
-
-        int     (*get_channel)(struct wiphy *wiphy,
-                               struct wireless_dev *wdev,
-                               struct cfg80211_chan_def *chandef);
-
-        int     (*start_p2p_device)(struct wiphy *wiphy,
-                                    struct wireless_dev *wdev);
-        void    (*stop_p2p_device)(struct wiphy *wiphy,
-                                   struct wireless_dev *wdev);
 };
 
 /*
@@ -2007,15 +1562,17 @@ struct cfg80211_ops {
  *      regulatory domain no user regulatory domain can enable these channels
  *      at a later time. This can be used for devices which do not have
  *      calibration information guaranteed for frequencies or settings
- *      outside of its regulatory domain. If used in combination with
- *      WIPHY_FLAG_CUSTOM_REGULATORY the inspected country IE power settings
- *      will be followed.
+ *      outside of its regulatory domain.
  * @WIPHY_FLAG_DISABLE_BEACON_HINTS: enable this if your driver needs to ensure
  *      that passive scan flags and beaconing flags may not be lifted by
  *      cfg80211 due to regulatory beacon hints. For more information on beacon
  *      hints read the documenation for regulatory_hint_found_beacon()
  * @WIPHY_FLAG_NETNS_OK: if not set, do not allow changing the netns of this
  *      wiphy at all
+ * @WIPHY_FLAG_ENFORCE_COMBINATIONS: Set this flag to enforce interface
+ *      combinations for this device. This flag is used for backward
+ *      compatibility only until all drivers advertise combinations and
+ *      they will always be enforced.
  * @WIPHY_FLAG_PS_ON_BY_DEFAULT: if set to true, powersave will be enabled
  *      by default -- this flag will be set depending on the kernel's default
  *      on wiphy_new(), but can be changed by the driver if it has a good
@@ -2030,23 +1587,6 @@ struct cfg80211_ops {
  * @WIPHY_FLAG_MESH_AUTH: The device supports mesh authentication by routing
  *      auth frames to userspace. See @NL80211_MESH_SETUP_USERSPACE_AUTH.
  * @WIPHY_FLAG_SUPPORTS_SCHED_SCAN: The device supports scheduled scans.
- * @WIPHY_FLAG_SUPPORTS_FW_ROAM: The device supports roaming feature in the
- *      firmware.
- * @WIPHY_FLAG_AP_UAPSD: The device supports uapsd on AP.
- * @WIPHY_FLAG_SUPPORTS_TDLS: The device supports TDLS (802.11z) operation.
- * @WIPHY_FLAG_TDLS_EXTERNAL_SETUP: The device does not handle TDLS (802.11z)
- *      link setup/discovery operations internally. Setup, discovery and
- *      teardown packets should be sent through the @NL80211_CMD_TDLS_MGMT
- *      command. When this flag is not set, @NL80211_CMD_TDLS_OPER should be
- *      used for asking the driver/firmware to perform a TDLS operation.
- * @WIPHY_FLAG_HAVE_AP_SME: device integrates AP SME
- * @WIPHY_FLAG_REPORTS_OBSS: the device will report beacons from other BSSes
- *      when there are virtual interfaces in AP mode by calling
- *      cfg80211_report_obss_beacon().
- * @WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD: When operating as an AP, the device
- *      responds to probe-requests in hardware.
- * @WIPHY_FLAG_OFFCHAN_TX: Device supports direct off-channel TX.
- * @WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL: Device supports remain-on-channel call.
  */
 enum wiphy_flags {
         WIPHY_FLAG_CUSTOM_REGULATORY            = BIT(0),
@@ -2060,16 +1600,7 @@ enum wiphy_flags {
         WIPHY_FLAG_IBSS_RSN                     = BIT(8),
         WIPHY_FLAG_MESH_AUTH                    = BIT(10),
         WIPHY_FLAG_SUPPORTS_SCHED_SCAN          = BIT(11),
-        /* use hole at 12 */
-        WIPHY_FLAG_SUPPORTS_FW_ROAM             = BIT(13),
-        WIPHY_FLAG_AP_UAPSD                     = BIT(14),
-        WIPHY_FLAG_SUPPORTS_TDLS                = BIT(15),
-        WIPHY_FLAG_TDLS_EXTERNAL_SETUP          = BIT(16),
-        WIPHY_FLAG_HAVE_AP_SME                  = BIT(17),
-        WIPHY_FLAG_REPORTS_OBSS                 = BIT(18),
-        WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD        = BIT(19),
-        WIPHY_FLAG_OFFCHAN_TX                   = BIT(20),
-        WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL        = BIT(21),
+        WIPHY_FLAG_ENFORCE_COMBINATIONS         = BIT(12),
 };
 
 /**
@@ -2231,7 +1762,6 @@ struct wiphy_wowlan_support {
  * @debugfsdir: debugfs directory used for this wiphy, will be renamed
  *      automatically on wiphy renames
  * @dev: (virtual) struct device for this wiphy
- * @registered: helps synchronize suspend/resume with wiphy unregister
  * @wext: wireless extension handlers
  * @priv: driver private data (sized according to wiphy_new() parameter)
  * @interface_modes: bitmask of interfaces types valid for this wiphy,
@@ -2242,16 +1772,12 @@ struct wiphy_wowlan_support {
  * @software_iftypes: bitmask of software interface types, these are not
  *      subject to any restrictions since they are purely managed in SW.
  * @flags: wiphy flags, see &enum wiphy_flags
- * @features: features advertised to nl80211, see &enum nl80211_feature_flags.
  * @bss_priv_size: each BSS struct has private data allocated with it,
  *      this variable determines its size
  * @max_scan_ssids: maximum number of SSIDs the device can scan for in
  *      any given scan
  * @max_sched_scan_ssids: maximum number of SSIDs the device can scan
  *      for in any given scheduled scan
- * @max_match_sets: maximum number of match sets the device can handle
- *      when performing a scheduled scan, 0 if filtering is not
- *      supported.
  * @max_scan_ie_len: maximum length of user-controlled IEs device can
  *      add to probe request frames transmitted during a scan, must not
  *      include fixed IEs like supported rates
@@ -2277,19 +1803,10 @@ struct wiphy_wowlan_support {
  *      configured as RX antennas. Antenna configuration commands will be
  *      rejected unless this or @available_antennas_tx is set.
  *
- * @probe_resp_offload:
- *       Bitmap of supported protocols for probe response offloading.
- *       See &enum nl80211_probe_resp_offload_support_attr. Only valid
- *       when the wiphy flag @WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD is set.
- *
  * @max_remain_on_channel_duration: Maximum time a remain-on-channel operation
  *      may request, if implemented.
  *
  * @wowlan: WoWLAN support information
- *
- * @ap_sme_capa: AP SME capabilities, flags from &enum nl80211_ap_sme_features.
- * @ht_capa_mod_mask:  Specify what ht_cap values can be over-ridden.
- *      If null, then none can be over-ridden.
  */
 struct wiphy {
         /* assign these fields before you register the wiphy */
@@ -2311,16 +1828,13 @@ struct wiphy {
         /* Supported interface modes, OR together BIT(NL80211_IFTYPE_...) */
         u16 interface_modes;
 
-        u32 flags, features;
-
-        u32 ap_sme_capa;
+        u32 flags;
 
         enum cfg80211_signal_type signal_type;
 
         int bss_priv_size;
         u8 max_scan_ssids;
         u8 max_sched_scan_ssids;
-        u8 max_match_sets;
         u16 max_scan_ie_len;
         u16 max_sched_scan_ie_len;
 
@@ -2336,9 +1850,7 @@ struct wiphy {
         char fw_version[ETHTOOL_BUSINFO_LEN];
         u32 hw_version;
 
-#ifdef CONFIG_PM
         struct wiphy_wowlan_support wowlan;
-#endif
 
         u16 max_remain_on_channel_duration;
 
@@ -2347,13 +1859,6 @@ struct wiphy {
         u32 available_antennas_tx;
         u32 available_antennas_rx;
 
-        /*
-         * Bitmap of supported protocols for probe response offloading
-         * see &enum nl80211_probe_resp_offload_support_attr. Only valid
-         * when the wiphy flag @WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD is set.
-         */
-        u32 probe_resp_offload;
-
         /* If multiple wiphys are registered and you're handed e.g.
          * a regular netdev with assigned ieee80211_ptr, you won't
          * know whether it points to a wiphy your driver has registered
@@ -2381,8 +1886,6 @@ struct wiphy {
         /* dir in debugfs: ieee80211/<wiphyname> */
         struct dentry *debugfsdir;
 
-        const struct ieee80211_ht_cap *ht_capa_mod_mask;
-
 #ifdef CONFIG_NET_NS
         /* the network namespace this phy lives in currently */
         struct net *_net;
@@ -2504,32 +2007,23 @@ struct cfg80211_conn;
 struct cfg80211_internal_bss;
 struct cfg80211_cached_keys;
 
+#define MAX_AUTH_BSSES          4
+
 /**
- * struct wireless_dev - wireless device state
+ * struct wireless_dev - wireless per-netdev state
  *
- * For netdevs, this structure must be allocated by the driver
- * that uses the ieee80211_ptr field in struct net_device (this
- * is intentional so it can be allocated along with the netdev.)
- * It need not be registered then as netdev registration will
- * be intercepted by cfg80211 to see the new wireless device.
- *
- * For non-netdev uses, it must also be allocated by the driver
- * in response to the cfg80211 callbacks that require it, as
- * there's no netdev registration in that case it may not be
- * allocated outside of callback operations that return it.
+ * This structure must be allocated by the driver/stack
+ * that uses the ieee80211_ptr field in struct net_device
+ * (this is intentional so it can be allocated along with
+ * the netdev.)
  *
  * @wiphy: pointer to hardware description
  * @iftype: interface type
  * @list: (private) Used to collect the interfaces
- * @netdev: (private) Used to reference back to the netdev, may be %NULL
- * @identifier: (private) Identifier used in nl80211 to identify this
- *      wireless device if it has no netdev
+ * @netdev: (private) Used to reference back to the netdev
  * @current_bss: (private) Used by the internal configuration code
  * @channel: (private) Used by the internal configuration code to track
- *      the user-set AP, monitor and WDS channel
- * @preset_chan: (private) Used by the internal configuration code to
- *      track the channel to be used for AP later
- * @preset_chantype: (private) the corresponding channel type
+ *      user-set AP, monitor and WDS channels for wireless extensions
  * @bssid: (private) Used by the internal configuration code
  * @ssid: (private) Used by the internal configuration code
  * @ssid_len: (private) Used by the internal configuration code
@@ -2546,8 +2040,6 @@ struct cfg80211_cached_keys;
  * @cleanup_work: work struct used for cleanup that can't be done directly
  * @beacon_interval: beacon interval used on this device for transmitting
  *      beacons, 0 when not valid
- * @address: The address for this device, valid only if @netdev is %NULL
- * @p2p_started: true if this is a P2P Device that has been started
  */
 struct wireless_dev {
         struct wiphy *wiphy;
@@ -2557,8 +2049,6 @@ struct wireless_dev {
         struct list_head list;
         struct net_device *netdev;
 
-        u32 identifier;
-
         struct list_head mgmt_registrations;
         spinlock_t mgmt_registrations_lock;
 
@@ -2566,9 +2056,7 @@ struct wireless_dev {
 
         struct work_struct cleanup_work;
 
-        bool use_4addr, p2p_started;
-
-        u8 address[ETH_ALEN] __aligned(sizeof(u16));
+        bool use_4addr;
 
         /* currently used for IBSS and SME - might be rearranged later */
         u8 ssid[IEEE80211_MAX_SSID_LEN];
@@ -2584,21 +2072,16 @@ struct wireless_dev {
         struct list_head event_list;
         spinlock_t event_lock;
 
+        struct cfg80211_internal_bss *authtry_bsses[MAX_AUTH_BSSES];
+        struct cfg80211_internal_bss *auth_bsses[MAX_AUTH_BSSES];
         struct cfg80211_internal_bss *current_bss; /* associated / joined */
-        struct cfg80211_chan_def preset_chandef;
-
-        /* for AP and mesh channel tracking */
         struct ieee80211_channel *channel;
 
-        bool ibss_fixed;
-
         bool ps;
         int ps_timeout;
 
         int beacon_interval;
 
-        u32 ap_unexpected_nlportid;
-
 #ifdef CONFIG_CFG80211_WEXT
         /* wext data */
         struct {
@@ -2615,13 +2098,6 @@ struct wireless_dev {
 #endif
 };
 
-static inline u8 *wdev_address(struct wireless_dev *wdev)
-{
-        if (wdev->netdev)
-                return wdev->netdev->dev_addr;
-        return wdev->address;
-}
-
 /**
  * wdev_priv - return wiphy priv from wireless_dev
  *
@@ -2791,15 +2267,6 @@ unsigned int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
 unsigned int __attribute_const__ ieee80211_hdrlen(__le16 fc);
 
 /**
- * ieee80211_get_mesh_hdrlen - get mesh extension header length
- * @meshhdr: the mesh extension header, only the flags field
- *      (first byte) will be accessed
- * Returns the length of the extension header, which is always at
- * least 6 bytes and at most 18 if address 5 and 6 are present.
- */
-unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr);
-
-/**
  * DOC: Data path helpers
  *
  * In addition to generic utilities, cfg80211 also offers
@@ -2870,24 +2337,6 @@ unsigned int cfg80211_classify8021d(struct sk_buff *skb);
 const u8 *cfg80211_find_ie(u8 eid, const u8 *ies, int len);
 
 /**
- * cfg80211_find_vendor_ie - find vendor specific information element in data
- *
- * @oui: vendor OUI
- * @oui_type: vendor-specific OUI type
- * @ies: data consisting of IEs
- * @len: length of data
- *
- * This function will return %NULL if the vendor specific element ID
- * could not be found or if the element is invalid (claims to be
- * longer than the given data), or a pointer to the first byte
- * of the requested element, that is the byte containing the
- * element ID. There are no checks on the element length
- * other than having to fit into the given data.
- */
-const u8 *cfg80211_find_vendor_ie(unsigned int oui, u8 oui_type,
-                                  const u8 *ies, int len);
-
-/**
  * DOC: Regulatory enforcement infrastructure
  *
  * TODO
@@ -2962,6 +2411,113 @@ extern int freq_reg_info(struct wiphy *wiphy,
                          const struct ieee80211_reg_rule **reg_rule);
 
 /*
+ * Temporary wext handlers & helper functions
+ *
+ * In the future cfg80211 will simply assign the entire wext handler
+ * structure to netdevs it manages, but we're not there yet.
+ */
+int cfg80211_wext_giwname(struct net_device *dev,
+                          struct iw_request_info *info,
+                          char *name, char *extra);
+int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
+                          u32 *mode, char *extra);
+int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
+                          u32 *mode, char *extra);
+int cfg80211_wext_siwscan(struct net_device *dev,
+                          struct iw_request_info *info,
+                          union iwreq_data *wrqu, char *extra);
+int cfg80211_wext_giwscan(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_point *data, char *extra);
+int cfg80211_wext_siwmlme(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_point *data, char *extra);
+int cfg80211_wext_giwrange(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *extra);
+int cfg80211_wext_siwgenie(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *extra);
+int cfg80211_wext_siwauth(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *data, char *extra);
+int cfg80211_wext_giwauth(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *data, char *extra);
+
+int cfg80211_wext_siwfreq(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_freq *freq, char *extra);
+int cfg80211_wext_giwfreq(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_freq *freq, char *extra);
+int cfg80211_wext_siwessid(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *ssid);
+int cfg80211_wext_giwessid(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *ssid);
+int cfg80211_wext_siwrate(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *rate, char *extra);
+int cfg80211_wext_giwrate(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *rate, char *extra);
+
+int cfg80211_wext_siwrts(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_param *rts, char *extra);
+int cfg80211_wext_giwrts(struct net_device *dev,
+                         struct iw_request_info *info,
+                         struct iw_param *rts, char *extra);
+int cfg80211_wext_siwfrag(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *frag, char *extra);
+int cfg80211_wext_giwfrag(struct net_device *dev,
+                          struct iw_request_info *info,
+                          struct iw_param *frag, char *extra);
+int cfg80211_wext_siwretry(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_param *retry, char *extra);
+int cfg80211_wext_giwretry(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_param *retry, char *extra);
+int cfg80211_wext_siwencodeext(struct net_device *dev,
+                               struct iw_request_info *info,
+                               struct iw_point *erq, char *extra);
+int cfg80211_wext_siwencode(struct net_device *dev,
+                            struct iw_request_info *info,
+                            struct iw_point *erq, char *keybuf);
+int cfg80211_wext_giwencode(struct net_device *dev,
+                            struct iw_request_info *info,
+                            struct iw_point *erq, char *keybuf);
+int cfg80211_wext_siwtxpower(struct net_device *dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *data, char *keybuf);
+int cfg80211_wext_giwtxpower(struct net_device *dev,
+                             struct iw_request_info *info,
+                             union iwreq_data *data, char *keybuf);
+struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev);
+
+int cfg80211_wext_siwpower(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_param *wrq, char *extra);
+int cfg80211_wext_giwpower(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_param *wrq, char *extra);
+
+int cfg80211_wext_siwap(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct sockaddr *ap_addr, char *extra);
+int cfg80211_wext_giwap(struct net_device *dev,
+                        struct iw_request_info *info,
+                        struct sockaddr *ap_addr, char *extra);
+
+int cfg80211_wext_siwpmksa(struct net_device *dev,
+                           struct iw_request_info *info,
+                           struct iw_point *data, char *extra);
+
+/*
  * callbacks for asynchronous cfg80211 methods, notification
  * functions and BSS handling helpers
  */
@@ -3005,10 +2561,8 @@ void cfg80211_sched_scan_stopped(struct wiphy *wiphy);
  *
  * This informs cfg80211 that BSS information was found and
  * the BSS should be updated/added.
- *
- * NOTE: Returns a referenced struct, must be released with cfg80211_put_bss()!
  */
-struct cfg80211_bss * __must_check
+struct cfg80211_bss*
 cfg80211_inform_bss_frame(struct wiphy *wiphy,
                           struct ieee80211_channel *channel,
                           struct ieee80211_mgmt *mgmt, size_t len,
@@ -3020,7 +2574,7 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
  * @wiphy: the wiphy reporting the BSS
  * @channel: The channel the frame was received on
  * @bssid: the BSSID of the BSS
- * @tsf: the TSF sent by the peer in the beacon/probe response (or 0)
+ * @timestamp: the TSF timestamp sent by the peer
  * @capability: the capability field sent by the peer
  * @beacon_interval: the beacon interval announced by the peer
  * @ie: additional IEs sent by the peer
@@ -3030,14 +2584,13 @@ cfg80211_inform_bss_frame(struct wiphy *wiphy,
  *
  * This informs cfg80211 that BSS information was found and
  * the BSS should be updated/added.
- *
- * NOTE: Returns a referenced struct, must be released with cfg80211_put_bss()!
  */
-struct cfg80211_bss * __must_check
+struct cfg80211_bss*
 cfg80211_inform_bss(struct wiphy *wiphy,
                     struct ieee80211_channel *channel,
-                    const u8 *bssid, u64 tsf, u16 capability,
-                    u16 beacon_interval, const u8 *ie, size_t ielen,
+                    const u8 *bssid,
+                    u64 timestamp, u16 capability, u16 beacon_interval,
+                    const u8 *ie, size_t ielen,
                     s32 signal, gfp_t gfp);
 
 struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,
@@ -3058,20 +2611,6 @@ struct cfg80211_bss *cfg80211_get_mesh(struct wiphy *wiphy,
                                        struct ieee80211_channel *channel,
                                        const u8 *meshid, size_t meshidlen,
                                        const u8 *meshcfg);
-/**
- * cfg80211_ref_bss - reference BSS struct
- * @bss: the BSS struct to reference
- *
- * Increments the refcount of the given BSS struct.
- */
-void cfg80211_ref_bss(struct cfg80211_bss *bss);
-
-/**
- * cfg80211_put_bss - unref BSS struct
- * @bss: the BSS struct
- *
- * Decrements the refcount of the given BSS struct.
- */
 void cfg80211_put_bss(struct cfg80211_bss *bss);
 
 /**
@@ -3109,10 +2648,20 @@ void cfg80211_send_rx_auth(struct net_device *dev, const u8 *buf, size_t len);
 void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
 
 /**
+ * __cfg80211_auth_canceled - notify cfg80211 that authentication was canceled
+ * @dev: network device
+ * @addr: The MAC address of the device with which the authentication timed out
+ *
+ * When a pending authentication had no action yet, the driver may decide
+ * to not send a deauth frame, but in that case must calls this function
+ * to tell cfg80211 about this decision. It is only valid to call this
+ * function within the deauth() callback.
+ */
+void __cfg80211_auth_canceled(struct net_device *dev, const u8 *addr);
+
+/**
  * cfg80211_send_rx_assoc - notification of processed association
  * @dev: network device
- * @bss: the BSS struct association was requested for, the struct reference
- *      is owned by cfg80211 after this call
  * @buf: (re)association response frame (header + body)
  * @len: length of the frame data
  *
@@ -3121,8 +2670,7 @@ void cfg80211_send_auth_timeout(struct net_device *dev, const u8 *addr);
  * function or cfg80211_send_assoc_timeout() to indicate the result of
  * cfg80211_ops::assoc() call. This function may sleep.
  */
-void cfg80211_send_rx_assoc(struct net_device *dev, struct cfg80211_bss *bss,
-                            const u8 *buf, size_t len);
+void cfg80211_send_rx_assoc(struct net_device *dev, const u8 *buf, size_t len);
 
 /**
  * cfg80211_send_assoc_timeout - notification of timed out association
@@ -3420,32 +2968,6 @@ void cfg80211_roamed(struct net_device *dev,
                      const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp);
 
 /**
- * cfg80211_roamed_bss - notify cfg80211 of roaming
- *
- * @dev: network device
- * @bss: entry of bss to which STA got roamed
- * @req_ie: association request IEs (maybe be %NULL)
- * @req_ie_len: association request IEs length
- * @resp_ie: association response IEs (may be %NULL)
- * @resp_ie_len: assoc response IEs length
- * @gfp: allocation flags
- *
- * This is just a wrapper to notify cfg80211 of roaming event with driver
- * passing bss to avoid a race in timeout of the bss entry. It should be
- * called by the underlying driver whenever it roamed from one AP to another
- * while connected. Drivers which have roaming implemented in firmware
- * may use this function to avoid a race in bss entry timeout where the bss
- * entry of the new AP is seen in the driver, but gets timed out by the time
- * it is accessed in __cfg80211_roamed() due to delay in scheduling
- * rdev->event_work. In case of any failures, the reference is released
- * either in cfg80211_roamed_bss() or in __cfg80211_romed(), Otherwise,
- * it will be released while diconneting from the current bss.
- */
-void cfg80211_roamed_bss(struct net_device *dev, struct cfg80211_bss *bss,
-                         const u8 *req_ie, size_t req_ie_len,
-                         const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp);
-
-/**
  * cfg80211_disconnected - notify cfg80211 that connection was dropped
  *
  * @dev: network device
@@ -3462,26 +2984,31 @@ void cfg80211_disconnected(struct net_device *dev, u16 reason,
 
 /**
  * cfg80211_ready_on_channel - notification of remain_on_channel start
- * @wdev: wireless device
+ * @dev: network device
  * @cookie: the request cookie
  * @chan: The current channel (from remain_on_channel request)
+ * @channel_type: Channel type
  * @duration: Duration in milliseconds that the driver intents to remain on the
  *      channel
  * @gfp: allocation flags
  */
-void cfg80211_ready_on_channel(struct wireless_dev *wdev, u64 cookie,
+void cfg80211_ready_on_channel(struct net_device *dev, u64 cookie,
                                struct ieee80211_channel *chan,
+                               enum nl80211_channel_type channel_type,
                                unsigned int duration, gfp_t gfp);
 
 /**
  * cfg80211_remain_on_channel_expired - remain_on_channel duration expired
- * @wdev: wireless device
+ * @dev: network device
  * @cookie: the request cookie
  * @chan: The current channel (from remain_on_channel request)
+ * @channel_type: Channel type
  * @gfp: allocation flags
  */
-void cfg80211_remain_on_channel_expired(struct wireless_dev *wdev, u64 cookie,
+void cfg80211_remain_on_channel_expired(struct net_device *dev,
+                                        u64 cookie,
                                         struct ieee80211_channel *chan,
+                                        enum nl80211_channel_type channel_type,
                                         gfp_t gfp);
 
 
@@ -3506,29 +3033,9 @@ void cfg80211_new_sta(struct net_device *dev, const u8 *mac_addr,
 void cfg80211_del_sta(struct net_device *dev, const u8 *mac_addr, gfp_t gfp);
 
 /**
- * cfg80211_conn_failed - connection request failed notification
- *
- * @dev: the netdev
- * @mac_addr: the station's address
- * @reason: the reason for connection failure
- * @gfp: allocation flags
- *
- * Whenever a station tries to connect to an AP and if the station
- * could not connect to the AP as the AP has rejected the connection
- * for some reasons, this function is called.
- *
- * The reason for connection failure can be any of the value from
- * nl80211_connect_failed_reason enum
- */
-void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr,
-                          enum nl80211_connect_failed_reason reason,
-                          gfp_t gfp);
-
-/**
  * cfg80211_rx_mgmt - notification of received, unprocessed management frame
- * @wdev: wireless device receiving the frame
+ * @dev: network device
  * @freq: Frequency on which the frame was received in MHz
- * @sig_dbm: signal strength in mBm, or 0 if unknown
  * @buf: Management frame (header + body)
  * @len: length of the frame data
  * @gfp: context flags
@@ -3541,12 +3048,12 @@ void cfg80211_conn_failed(struct net_device *dev, const u8 *mac_addr,
  * This function is called whenever an Action frame is received for a station
  * mode interface, but is not processed in kernel.
  */
-bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,
-                      const u8 *buf, size_t len, gfp_t gfp);
+bool cfg80211_rx_mgmt(struct net_device *dev, int freq, const u8 *buf,
+                      size_t len, gfp_t gfp);
 
 /**
  * cfg80211_mgmt_tx_status - notification of TX status for management frame
- * @wdev: wireless device receiving the frame
+ * @dev: network device
  * @cookie: Cookie returned by cfg80211_ops::mgmt_tx()
  * @buf: Management frame (header + body)
  * @len: length of the frame data
@@ -3557,7 +3064,7 @@ bool cfg80211_rx_mgmt(struct wireless_dev *wdev, int freq, int sig_dbm,
  * transmitted with cfg80211_ops::mgmt_tx() to report the TX status of the
  * transmission attempt.
  */
-void cfg80211_mgmt_tx_status(struct wireless_dev *wdev, u64 cookie,
+void cfg80211_mgmt_tx_status(struct net_device *dev, u64 cookie,
                              const u8 *buf, size_t len, bool ack, gfp_t gfp);
 
 
@@ -3587,21 +3094,6 @@ void cfg80211_cqm_pktloss_notify(struct net_device *dev,
                                  const u8 *peer, u32 num_packets, gfp_t gfp);
 
 /**
- * cfg80211_cqm_txe_notify - TX error rate event
- * @dev: network device
- * @peer: peer's MAC address
- * @num_packets: how many packets were lost
- * @rate: % of packets which failed transmission
- * @intvl: interval (in s) over which the TX failure threshold was breached.
- * @gfp: context flags
- *
- * Notify userspace when configured % TX failures over number of packets in a
- * given interval is exceeded.
- */
-void cfg80211_cqm_txe_notify(struct net_device *dev, const u8 *peer,
-                             u32 num_packets, u32 rate, u32 intvl, gfp_t gfp);
-
-/**
  * cfg80211_gtk_rekey_notify - notify userspace about driver rekeying
  * @dev: network device
  * @bssid: BSSID of AP (to avoid races)
@@ -3611,159 +3103,6 @@ void cfg80211_cqm_txe_notify(struct net_device *dev, const u8 *peer,
 void cfg80211_gtk_rekey_notify(struct net_device *dev, const u8 *bssid,
                                const u8 *replay_ctr, gfp_t gfp);
 
-/**
- * cfg80211_pmksa_candidate_notify - notify about PMKSA caching candidate
- * @dev: network device
- * @index: candidate index (the smaller the index, the higher the priority)
- * @bssid: BSSID of AP
- * @preauth: Whether AP advertises support for RSN pre-authentication
- * @gfp: allocation flags
- */
-void cfg80211_pmksa_candidate_notify(struct net_device *dev, int index,
-                                     const u8 *bssid, bool preauth, gfp_t gfp);
-
-/**
- * cfg80211_rx_spurious_frame - inform userspace about a spurious frame
- * @dev: The device the frame matched to
- * @addr: the transmitter address
- * @gfp: context flags
- *
- * This function is used in AP mode (only!) to inform userspace that
- * a spurious class 3 frame was received, to be able to deauth the
- * sender.
- * Returns %true if the frame was passed to userspace (or this failed
- * for a reason other than not having a subscription.)
- */
-bool cfg80211_rx_spurious_frame(struct net_device *dev,
-                                const u8 *addr, gfp_t gfp);
-
-/**
- * cfg80211_rx_unexpected_4addr_frame - inform about unexpected WDS frame
- * @dev: The device the frame matched to
- * @addr: the transmitter address
- * @gfp: context flags
- *
- * This function is used in AP mode (only!) to inform userspace that
- * an associated station sent a 4addr frame but that wasn't expected.
- * It is allowed and desirable to send this event only once for each
- * station to avoid event flooding.
- * Returns %true if the frame was passed to userspace (or this failed
- * for a reason other than not having a subscription.)
- */
-bool cfg80211_rx_unexpected_4addr_frame(struct net_device *dev,
-                                        const u8 *addr, gfp_t gfp);
-
-/**
- * cfg80211_probe_status - notify userspace about probe status
- * @dev: the device the probe was sent on
- * @addr: the address of the peer
- * @cookie: the cookie filled in @probe_client previously
- * @acked: indicates whether probe was acked or not
- * @gfp: allocation flags
- */
-void cfg80211_probe_status(struct net_device *dev, const u8 *addr,
-                           u64 cookie, bool acked, gfp_t gfp);
-
-/**
- * cfg80211_report_obss_beacon - report beacon from other APs
- * @wiphy: The wiphy that received the beacon
- * @frame: the frame
- * @len: length of the frame
- * @freq: frequency the frame was received on
- * @sig_dbm: signal strength in mBm, or 0 if unknown
- *
- * Use this function to report to userspace when a beacon was
- * received. It is not useful to call this when there is no
- * netdev that is in AP/GO mode.
- */
-void cfg80211_report_obss_beacon(struct wiphy *wiphy,
-                                 const u8 *frame, size_t len,
-                                 int freq, int sig_dbm);
-
-/**
- * cfg80211_reg_can_beacon - check if beaconing is allowed
- * @wiphy: the wiphy
- * @chandef: the channel definition
- *
- * This function returns true if there is no secondary channel or the secondary
- * channel(s) can be used for beaconing (i.e. is not a radar channel etc.)
- */
-bool cfg80211_reg_can_beacon(struct wiphy *wiphy,
-                             struct cfg80211_chan_def *chandef);
-
-/*
- * cfg80211_ch_switch_notify - update wdev channel and notify userspace
- * @dev: the device which switched channels
- * @chandef: the new channel definition
- *
- * Acquires wdev_lock, so must only be called from sleepable driver context!
- */
-void cfg80211_ch_switch_notify(struct net_device *dev,
-                               struct cfg80211_chan_def *chandef);
-
-/*
- * cfg80211_tdls_oper_request - request userspace to perform TDLS operation
- * @dev: the device on which the operation is requested
- * @peer: the MAC address of the peer device
- * @oper: the requested TDLS operation (NL80211_TDLS_SETUP or
- *      NL80211_TDLS_TEARDOWN)
- * @reason_code: the reason code for teardown request
- * @gfp: allocation flags
- *
- * This function is used to request userspace to perform TDLS operation that
- * requires knowledge of keys, i.e., link setup or teardown when the AP
- * connection uses encryption. This is optional mechanism for the driver to use
- * if it can automatically determine when a TDLS link could be useful (e.g.,
- * based on traffic and signal strength for a peer).
- */
-void cfg80211_tdls_oper_request(struct net_device *dev, const u8 *peer,
-                                enum nl80211_tdls_operation oper,
-                                u16 reason_code, gfp_t gfp);
-
-/*
- * cfg80211_calculate_bitrate - calculate actual bitrate (in 100Kbps units)
- * @rate: given rate_info to calculate bitrate from
- *
- * return 0 if MCS index >= 32
- */
-u32 cfg80211_calculate_bitrate(struct rate_info *rate);
-
-/**
- * cfg80211_unregister_wdev - remove the given wdev
- * @wdev: struct wireless_dev to remove
- *
- * Call this function only for wdevs that have no netdev assigned,
- * e.g. P2P Devices. It removes the device from the list so that
- * it can no longer be used. It is necessary to call this function
- * even when cfg80211 requests the removal of the interface by
- * calling the del_virtual_intf() callback. The function must also
- * be called when the driver wishes to unregister the wdev, e.g.
- * when the device is unbound from the driver.
- *
- * Requires the RTNL to be held.
- */
-void cfg80211_unregister_wdev(struct wireless_dev *wdev);
-
-/**
- * cfg80211_get_p2p_attr - find and copy a P2P attribute from IE buffer
- * @ies: the input IE buffer
- * @len: the input length
- * @attr: the attribute ID to find
- * @buf: output buffer, can be %NULL if the data isn't needed, e.g.
- *      if the function is only called to get the needed buffer size
- * @bufsize: size of the output buffer
- *
- * The function finds a given P2P attribute in the (vendor) IEs and
- * copies its contents to the given buffer.
- *
- * The return value is a negative error code (-%EILSEQ or -%ENOENT) if
- * the data is malformed or the attribute can't be found (respectively),
- * or the length of the found attribute (which can be zero).
- */
-int cfg80211_get_p2p_attr(const u8 *ies, unsigned int len,
-                          enum ieee80211_p2p_attr_id attr,
-                          u8 *buf, unsigned int bufsize);
-
 /* Logging, debugging and troubleshooting/diagnostic helpers. */
 
 /* wiphy_printk helpers, similar to dev_printk */
diff --git a/include/net/checksum.h b/include/net/checksum.h
index 600d1d705bb..ba55d8b8c87 100644
--- a/include/net/checksum.h
+++ b/include/net/checksum.h
@@ -109,9 +109,6 @@ static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to)
 struct sk_buff;
 extern void inet_proto_csum_replace4(__sum16 *sum, struct sk_buff *skb,
                                      __be32 from, __be32 to, int pseudohdr);
-extern void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb,
-                                      const __be32 *from, const __be32 *to,
-                                      int pseudohdr);
 
 static inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
                                             __be16 from, __be16 to,
diff --git a/include/net/cipso_ipv4.h b/include/net/cipso_ipv4.h
index a7a683e30b6..9808877c2ab 100644
--- a/include/net/cipso_ipv4.h
+++ b/include/net/cipso_ipv4.h
@@ -42,7 +42,6 @@
 #include <net/netlabel.h>
 #include <net/request_sock.h>
 #include <linux/atomic.h>
-#include <asm/unaligned.h>
 
 /* known doi values */
 #define CIPSO_V4_DOI_UNKNOWN          0x00000000
@@ -286,33 +285,7 @@ static inline int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
 static inline int cipso_v4_validate(const struct sk_buff *skb,
                                     unsigned char **option)
 {
-        unsigned char *opt = *option;
-        unsigned char err_offset = 0;
-        u8 opt_len = opt[1];
-        u8 opt_iter;
-
-        if (opt_len < 8) {
-                err_offset = 1;
-                goto out;
-        }
-
-        if (get_unaligned_be32(&opt[2]) == 0) {
-                err_offset = 2;
-                goto out;
-        }
-
-        for (opt_iter = 6; opt_iter < opt_len;) {
-                if (opt[opt_iter + 1] > (opt_len - opt_iter)) {
-                        err_offset = opt_iter + 1;
-                        goto out;
-                }
-                opt_iter += opt[opt_iter + 1];
-        }
-
-out:
-        *option = opt + err_offset;
-        return err_offset;
-
+        return -ENOSYS;
 }
 #endif /* CONFIG_NETLABEL */
 
diff --git a/include/net/cls_cgroup.h b/include/net/cls_cgroup.h
index 2581638f4a3..a4dc5b027bd 100644
--- a/include/net/cls_cgroup.h
+++ b/include/net/cls_cgroup.h
@@ -17,19 +17,17 @@
 #include <linux/hardirq.h>
 #include <linux/rcupdate.h>
 
-#if IS_ENABLED(CONFIG_NET_CLS_CGROUP)
+#ifdef CONFIG_CGROUPS
 struct cgroup_cls_state
 {
         struct cgroup_subsys_state css;
         u32 classid;
 };
 
-extern void sock_update_classid(struct sock *sk, struct task_struct *task);
-
-#if IS_BUILTIN(CONFIG_NET_CLS_CGROUP)
+#ifdef CONFIG_NET_CLS_CGROUP
 static inline u32 task_cls_classid(struct task_struct *p)
 {
-        u32 classid;
+        int classid;
 
         if (in_interrupt())
                 return 0;
@@ -41,33 +39,32 @@ static inline u32 task_cls_classid(struct task_struct *p)
 
         return classid;
 }
-#elif IS_MODULE(CONFIG_NET_CLS_CGROUP)
+#else
+extern int net_cls_subsys_id;
+
 static inline u32 task_cls_classid(struct task_struct *p)
 {
-        struct cgroup_subsys_state *css;
+        int id;
         u32 classid = 0;
 
         if (in_interrupt())
                 return 0;
 
         rcu_read_lock();
-        css = task_subsys_state(p, net_cls_subsys_id);
-        if (css)
-                classid = container_of(css,
+        id = rcu_dereference_index_check(net_cls_subsys_id,
+                                         rcu_read_lock_held());
+        if (id >= 0)
+                classid = container_of(task_subsys_state(p, id),
                                        struct cgroup_cls_state, css)->classid;
         rcu_read_unlock();
 
         return classid;
 }
 #endif
-#else /* !CGROUP_NET_CLS_CGROUP */
-static inline void sock_update_classid(struct sock *sk, struct task_struct *task)
-{
-}
-
+#else
 static inline u32 task_cls_classid(struct task_struct *p)
 {
         return 0;
 }
-#endif /* CGROUP_NET_CLS_CGROUP */
+#endif
 #endif  /* _NET_CLS_CGROUP_H */
diff --git a/include/net/codel.h b/include/net/codel.h
deleted file mode 100644
index 389cf621161..00000000000
--- a/include/net/codel.h
+++ /dev/null
@@ -1,346 +0,0 @@
-#ifndef __NET_SCHED_CODEL_H
-#define __NET_SCHED_CODEL_H
-
-/*
- * Codel - The Controlled-Delay Active Queue Management algorithm
- *
- *  Copyright (C) 2011-2012 Kathleen Nichols <nichols@pollere.com>
- *  Copyright (C) 2011-2012 Van Jacobson <van@pollere.net>
- *  Copyright (C) 2012 Michael D. Taht <dave.taht@bufferbloat.net>
- *  Copyright (C) 2012 Eric Dumazet <edumazet@google.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The names of the authors may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * Alternatively, provided that this notice is retained in full, this
- * software may be distributed under the terms of the GNU General
- * Public License ("GPL") version 2, in which case the provisions of the
- * GPL apply INSTEAD OF those given above.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- * DAMAGE.
- *
- */
-
-#include <linux/types.h>
-#include <linux/ktime.h>
-#include <linux/skbuff.h>
-#include <net/pkt_sched.h>
-#include <net/inet_ecn.h>
-#include <linux/reciprocal_div.h>
-
-/* Controlling Queue Delay (CoDel) algorithm
- * =========================================
- * Source : Kathleen Nichols and Van Jacobson
- * http://queue.acm.org/detail.cfm?id=2209336
- *
- * Implemented on linux by Dave Taht and Eric Dumazet
- */
-
-
-/* CoDel uses a 1024 nsec clock, encoded in u32
- * This gives a range of 2199 seconds, because of signed compares
- */
-typedef u32 codel_time_t;
-typedef s32 codel_tdiff_t;
-#define CODEL_SHIFT 10
-#define MS2TIME(a) ((a * NSEC_PER_MSEC) >> CODEL_SHIFT)
-
-static inline codel_time_t codel_get_time(void)
-{
-        u64 ns = ktime_to_ns(ktime_get());
-
-        return ns >> CODEL_SHIFT;
-}
-
-#define codel_time_after(a, b)          ((s32)(a) - (s32)(b) > 0)
-#define codel_time_after_eq(a, b)       ((s32)(a) - (s32)(b) >= 0)
-#define codel_time_before(a, b)         ((s32)(a) - (s32)(b) < 0)
-#define codel_time_before_eq(a, b)      ((s32)(a) - (s32)(b) <= 0)
-
-/* Qdiscs using codel plugin must use codel_skb_cb in their own cb[] */
-struct codel_skb_cb {
-        codel_time_t enqueue_time;
-};
-
-static struct codel_skb_cb *get_codel_cb(const struct sk_buff *skb)
-{
-        qdisc_cb_private_validate(skb, sizeof(struct codel_skb_cb));
-        return (struct codel_skb_cb *)qdisc_skb_cb(skb)->data;
-}
-
-static codel_time_t codel_get_enqueue_time(const struct sk_buff *skb)
-{
-        return get_codel_cb(skb)->enqueue_time;
-}
-
-static void codel_set_enqueue_time(struct sk_buff *skb)
-{
-        get_codel_cb(skb)->enqueue_time = codel_get_time();
-}
-
-static inline u32 codel_time_to_us(codel_time_t val)
-{
-        u64 valns = ((u64)val << CODEL_SHIFT);
-
-        do_div(valns, NSEC_PER_USEC);
-        return (u32)valns;
-}
-
-/**
- * struct codel_params - contains codel parameters
- * @target:     target queue size (in time units)
- * @interval:   width of moving time window
- * @ecn:        is Explicit Congestion Notification enabled
- */
-struct codel_params {
-        codel_time_t    target;
-        codel_time_t    interval;
-        bool            ecn;
-};
-
-/**
- * struct codel_vars - contains codel variables
- * @count:              how many drops we've done since the last time we
- *                      entered dropping state
- * @lastcount:          count at entry to dropping state
- * @dropping:           set to true if in dropping state
- * @rec_inv_sqrt:       reciprocal value of sqrt(count) >> 1
- * @first_above_time:   when we went (or will go) continuously above target
- *                      for interval
- * @drop_next:          time to drop next packet, or when we dropped last
- * @ldelay:             sojourn time of last dequeued packet
- */
-struct codel_vars {
-        u32             count;
-        u32             lastcount;
-        bool            dropping;
-        u16             rec_inv_sqrt;
-        codel_time_t    first_above_time;
-        codel_time_t    drop_next;
-        codel_time_t    ldelay;
-};
-
-#define REC_INV_SQRT_BITS (8 * sizeof(u16)) /* or sizeof_in_bits(rec_inv_sqrt) */
-/* needed shift to get a Q0.32 number from rec_inv_sqrt */
-#define REC_INV_SQRT_SHIFT (32 - REC_INV_SQRT_BITS)
-
-/**
- * struct codel_stats - contains codel shared variables and stats
- * @maxpacket:  largest packet we've seen so far
- * @drop_count: temp count of dropped packets in dequeue()
- * ecn_mark:    number of packets we ECN marked instead of dropping
- */
-struct codel_stats {
-        u32             maxpacket;
-        u32             drop_count;
-        u32             ecn_mark;
-};
-
-static void codel_params_init(struct codel_params *params)
-{
-        params->interval = MS2TIME(100);
-        params->target = MS2TIME(5);
-        params->ecn = false;
-}
-
-static void codel_vars_init(struct codel_vars *vars)
-{
-        memset(vars, 0, sizeof(*vars));
-}
-
-static void codel_stats_init(struct codel_stats *stats)
-{
-        stats->maxpacket = 256;
-}
-
-/*
- * http://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Iterative_methods_for_reciprocal_square_roots
- * new_invsqrt = (invsqrt / 2) * (3 - count * invsqrt^2)
- *
- * Here, invsqrt is a fixed point number (< 1.0), 32bit mantissa, aka Q0.32
- */
-static void codel_Newton_step(struct codel_vars *vars)
-{
-        u32 invsqrt = ((u32)vars->rec_inv_sqrt) << REC_INV_SQRT_SHIFT;
-        u32 invsqrt2 = ((u64)invsqrt * invsqrt) >> 32;
-        u64 val = (3LL << 32) - ((u64)vars->count * invsqrt2);
-
-        val >>= 2; /* avoid overflow in following multiply */
-        val = (val * invsqrt) >> (32 - 2 + 1);
-
-        vars->rec_inv_sqrt = val >> REC_INV_SQRT_SHIFT;
-}
-
-/*
- * CoDel control_law is t + interval/sqrt(count)
- * We maintain in rec_inv_sqrt the reciprocal value of sqrt(count) to avoid
- * both sqrt() and divide operation.
- */
-static codel_time_t codel_control_law(codel_time_t t,
-                                      codel_time_t interval,
-                                      u32 rec_inv_sqrt)
-{
-        return t + reciprocal_divide(interval, rec_inv_sqrt << REC_INV_SQRT_SHIFT);
-}
-
-
-static bool codel_should_drop(const struct sk_buff *skb,
-                              struct Qdisc *sch,
-                              struct codel_vars *vars,
-                              struct codel_params *params,
-                              struct codel_stats *stats,
-                              codel_time_t now)
-{
-        bool ok_to_drop;
-
-        if (!skb) {
-                vars->first_above_time = 0;
-                return false;
-        }
-
-        vars->ldelay = now - codel_get_enqueue_time(skb);
-        sch->qstats.backlog -= qdisc_pkt_len(skb);
-
-        if (unlikely(qdisc_pkt_len(skb) > stats->maxpacket))
-                stats->maxpacket = qdisc_pkt_len(skb);
-
-        if (codel_time_before(vars->ldelay, params->target) ||
-            sch->qstats.backlog <= stats->maxpacket) {
-                /* went below - stay below for at least interval */
-                vars->first_above_time = 0;
-                return false;
-        }
-        ok_to_drop = false;
-        if (vars->first_above_time == 0) {
-                /* just went above from below. If we stay above
-                 * for at least interval we'll say it's ok to drop
-                 */
-                vars->first_above_time = now + params->interval;
-        } else if (codel_time_after(now, vars->first_above_time)) {
-                ok_to_drop = true;
-        }
-        return ok_to_drop;
-}
-
-typedef struct sk_buff * (*codel_skb_dequeue_t)(struct codel_vars *vars,
-                                                struct Qdisc *sch);
-
-static struct sk_buff *codel_dequeue(struct Qdisc *sch,
-                                     struct codel_params *params,
-                                     struct codel_vars *vars,
-                                     struct codel_stats *stats,
-                                     codel_skb_dequeue_t dequeue_func)
-{
-        struct sk_buff *skb = dequeue_func(vars, sch);
-        codel_time_t now;
-        bool drop;
-
-        if (!skb) {
-                vars->dropping = false;
-                return skb;
-        }
-        now = codel_get_time();
-        drop = codel_should_drop(skb, sch, vars, params, stats, now);
-        if (vars->dropping) {
-                if (!drop) {
-                        /* sojourn time below target - leave dropping state */
-                        vars->dropping = false;
-                } else if (codel_time_after_eq(now, vars->drop_next)) {
-                        /* It's time for the next drop. Drop the current
-                         * packet and dequeue the next. The dequeue might
-                         * take us out of dropping state.
-                         * If not, schedule the next drop.
-                         * A large backlog might result in drop rates so high
-                         * that the next drop should happen now,
-                         * hence the while loop.
-                         */
-                        while (vars->dropping &&
-                               codel_time_after_eq(now, vars->drop_next)) {
-                                vars->count++; /* dont care of possible wrap
-                                                * since there is no more divide
-                                                */
-                                codel_Newton_step(vars);
-                                if (params->ecn && INET_ECN_set_ce(skb)) {
-                                        stats->ecn_mark++;
-                                        vars->drop_next =
-                                                codel_control_law(vars->drop_next,
-                                                                  params->interval,
-                                                                  vars->rec_inv_sqrt);
-                                        goto end;
-                                }
-                                qdisc_drop(skb, sch);
-                                stats->drop_count++;
-                                skb = dequeue_func(vars, sch);
-                                if (!codel_should_drop(skb, sch,
-                                                       vars, params, stats, now)) {
-                                        /* leave dropping state */
-                                        vars->dropping = false;
-                                } else {
-                                        /* and schedule the next drop */
-                                        vars->drop_next =
-                                                codel_control_law(vars->drop_next,
-                                                                  params->interval,
-                                                                  vars->rec_inv_sqrt);
-                                }
-                        }
-                }
-        } else if (drop) {
-                u32 delta;
-
-                if (params->ecn && INET_ECN_set_ce(skb)) {
-                        stats->ecn_mark++;
-                } else {
-                        qdisc_drop(skb, sch);
-                        stats->drop_count++;
-
-                        skb = dequeue_func(vars, sch);
-                        drop = codel_should_drop(skb, sch, vars, params,
-                                                 stats, now);
-                }
-                vars->dropping = true;
-                /* if min went above target close to when we last went below it
-                 * assume that the drop rate that controlled the queue on the
-                 * last cycle is a good starting point to control it now.
-                 */
-                delta = vars->count - vars->lastcount;
-                if (delta > 1 &&
-                    codel_time_before(now - vars->drop_next,
-                                      16 * params->interval)) {
-                        vars->count = delta;
-                        /* we dont care if rec_inv_sqrt approximation
-                         * is not very precise :
-                         * Next Newton steps will correct it quadratically.
-                         */
-                        codel_Newton_step(vars);
-                } else {
-                        vars->count = 1;
-                        vars->rec_inv_sqrt = ~0U >> REC_INV_SQRT_SHIFT;
-                }
-                vars->lastcount = vars->count;
-                vars->drop_next = codel_control_law(now, params->interval,
-                                                    vars->rec_inv_sqrt);
-        }
-end:
-        return skb;
-}
-#endif
diff --git a/include/net/compat.h b/include/net/compat.h
index 6e956532498..9ee75edcc29 100644
--- a/include/net/compat.h
+++ b/include/net/compat.h
@@ -41,13 +41,13 @@ extern int compat_sock_get_timestampns(struct sock *, struct timespec __user *);
 #endif /* defined(CONFIG_COMPAT) */
 
 extern int get_compat_msghdr(struct msghdr *, struct compat_msghdr __user *);
-extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr_storage *, int);
-extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned int);
+extern int verify_compat_iovec(struct msghdr *, struct iovec *, struct sockaddr *, int);
+extern asmlinkage long compat_sys_sendmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_sendmmsg(int, struct compat_mmsghdr __user *,
-                                           unsigned int, unsigned int);
-extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned int);
+                                           unsigned, unsigned);
+extern asmlinkage long compat_sys_recvmsg(int,struct compat_msghdr __user *,unsigned);
 extern asmlinkage long compat_sys_recvmmsg(int, struct compat_mmsghdr __user *,
-                                           unsigned int, unsigned int,
+                                           unsigned, unsigned,
                                            struct compat_timespec __user *);
 extern asmlinkage long compat_sys_getsockopt(int, int, int, char __user *, int __user *);
 extern int put_cmsg_compat(struct msghdr*, int, int, int, void *);
diff --git a/include/net/dcbevent.h b/include/net/dcbevent.h
index 443626ed4cb..bc1e7ef4017 100644
--- a/include/net/dcbevent.h
+++ b/include/net/dcbevent.h
@@ -24,26 +24,8 @@ enum dcbevent_notif_type {
         DCB_APP_EVENT = 1,
 };
 
-#ifdef CONFIG_DCB
 extern int register_dcbevent_notifier(struct notifier_block *nb);
 extern int unregister_dcbevent_notifier(struct notifier_block *nb);
 extern int call_dcbevent_notifiers(unsigned long val, void *v);
-#else
-static inline int
-register_dcbevent_notifier(struct notifier_block *nb)
-{
-        return 0;
-}
-
-static inline int unregister_dcbevent_notifier(struct notifier_block *nb)
-{
-        return 0;
-}
-
-static inline int call_dcbevent_notifiers(unsigned long val, void *v)
-{
-        return 0;
-}
-#endif /* CONFIG_DCB */
 
 #endif
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h
index fc5d5dcebb0..f5aa39997f0 100644
--- a/include/net/dcbnl.h
+++ b/include/net/dcbnl.h
@@ -23,10 +23,9 @@
 #include <linux/dcbnl.h>
 
 struct dcb_app_type {
-        int     ifindex;
+        char              name[IFNAMSIZ];
         struct dcb_app    app;
         struct list_head  list;
-        u8      dcbx;
 };
 
 int dcb_setapp(struct net_device *, struct dcb_app *);
@@ -48,8 +47,6 @@ struct dcbnl_rtnl_ops {
         /* IEEE 802.1Qaz std */
         int (*ieee_getets) (struct net_device *, struct ieee_ets *);
         int (*ieee_setets) (struct net_device *, struct ieee_ets *);
-        int (*ieee_getmaxrate) (struct net_device *, struct ieee_maxrate *);
-        int (*ieee_setmaxrate) (struct net_device *, struct ieee_maxrate *);
         int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *);
         int (*ieee_getapp) (struct net_device *, struct dcb_app *);
@@ -74,8 +71,8 @@ struct dcbnl_rtnl_ops {
         void (*getpfccfg)(struct net_device *, int, u8 *);
         u8   (*setall)(struct net_device *);
         u8   (*getcap)(struct net_device *, int, u8 *);
-        int  (*getnumtcs)(struct net_device *, int, u8 *);
-        int  (*setnumtcs)(struct net_device *, int, u8);
+        u8   (*getnumtcs)(struct net_device *, int, u8 *);
+        u8   (*setnumtcs)(struct net_device *, int, u8);
         u8   (*getpfcstate)(struct net_device *);
         void (*setpfcstate)(struct net_device *, u8);
         void (*getbcncfg)(struct net_device *, int, u32 *);
diff --git a/include/net/dn.h b/include/net/dn.h
index c88bf4ebd33..298521e0d8a 100644
--- a/include/net/dn.h
+++ b/include/net/dn.h
@@ -3,7 +3,6 @@
 
 #include <linux/dn.h>
 #include <net/sock.h>
-#include <net/flow.h>
 #include <asm/byteorder.h>
 #include <asm/unaligned.h>
 
@@ -199,7 +198,7 @@ static inline void dn_sk_ports_copy(struct flowidn *fld, struct dn_scp *scp)
         fld->fld_dport = scp->addrrem;
 }
 
-extern unsigned int dn_mss_from_pmtu(struct net_device *dev, int mtu);
+extern unsigned dn_mss_from_pmtu(struct net_device *dev, int mtu);
 
 #define DN_MENUVER_ACC 0x01
 #define DN_MENUVER_USR 0x02
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h
index 1ee9d4bda30..782ef7cb493 100644
--- a/include/net/dn_fib.h
+++ b/include/net/dn_fib.h
@@ -31,7 +31,7 @@ struct dn_fib_res {
 
 struct dn_fib_nh {
         struct net_device       *nh_dev;
-        unsigned int            nh_flags;
+        unsigned                nh_flags;
         unsigned char           nh_scope;
         int                     nh_weight;
         int                     nh_power;
@@ -45,7 +45,7 @@ struct dn_fib_info {
         int                     fib_treeref;
         atomic_t                fib_clntref;
         int                     fib_dead;
-        unsigned int            fib_flags;
+        unsigned                fib_flags;
         int                     fib_protocol;
         __le16                  fib_prefsrc;
         __u32                   fib_priority;
@@ -140,7 +140,7 @@ extern void dn_fib_table_cleanup(void);
  */
 extern void dn_fib_rules_init(void);
 extern void dn_fib_rules_cleanup(void);
-extern unsigned int dnet_addr_type(__le16 addr);
+extern unsigned dnet_addr_type(__le16 addr);
 extern int dn_fib_lookup(struct flowidn *fld, struct dn_fib_res *res);
 
 extern int dn_fib_dump(struct sk_buff *skb, struct netlink_callback *cb);
diff --git a/include/net/dn_route.h b/include/net/dn_route.h
index 4f7d6a18238..81712cfa1dd 100644
--- a/include/net/dn_route.h
+++ b/include/net/dn_route.h
@@ -67,8 +67,6 @@ extern void dn_rt_cache_flush(int delay);
 struct dn_route {
         struct dst_entry dst;
 
-        struct neighbour *n;
-
         struct flowidn fld;
 
         __le16 rt_saddr;
@@ -78,8 +76,8 @@ struct dn_route {
         __le16 rt_src_map;
         __le16 rt_dst_map;
 
-        unsigned int rt_flags;
-        unsigned int rt_type;
+        unsigned rt_flags;
+        unsigned rt_type;
 };
 
 static inline bool dn_is_input_route(struct dn_route *rt)
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 7828ebf99ee..839f768f9e3 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -11,11 +11,6 @@
 #ifndef __LINUX_NET_DSA_H
 #define __LINUX_NET_DSA_H
 
-#include <linux/if_ether.h>
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-
 #define DSA_MAX_SWITCHES        4
 #define DSA_MAX_PORTS           12
 
@@ -59,143 +54,8 @@ struct dsa_platform_data {
         struct dsa_chip_data    *chip;
 };
 
-struct dsa_switch_tree {
-        /*
-         * Configuration data for the platform device that owns
-         * this dsa switch tree instance.
-         */
-        struct dsa_platform_data        *pd;
-
-        /*
-         * Reference to network device to use, and which tagging
-         * protocol to use.
-         */
-        struct net_device       *master_netdev;
-        __be16                  tag_protocol;
-
-        /*
-         * The switch and port to which the CPU is attached.
-         */
-        s8                      cpu_switch;
-        s8                      cpu_port;
-
-        /*
-         * Link state polling.
-         */
-        int                     link_poll_needed;
-        struct work_struct      link_poll_work;
-        struct timer_list       link_poll_timer;
-
-        /*
-         * Data for the individual switch chips.
-         */
-        struct dsa_switch       *ds[DSA_MAX_SWITCHES];
-};
-
-struct dsa_switch {
-        /*
-         * Parent switch tree, and switch index.
-         */
-        struct dsa_switch_tree  *dst;
-        int                     index;
-
-        /*
-         * Configuration data for this switch.
-         */
-        struct dsa_chip_data    *pd;
-
-        /*
-         * The used switch driver.
-         */
-        struct dsa_switch_driver        *drv;
-
-        /*
-         * Reference to mii bus to use.
-         */
-        struct mii_bus          *master_mii_bus;
-
-        /*
-         * Slave mii_bus and devices for the individual ports.
-         */
-        u32                     dsa_port_mask;
-        u32                     phys_port_mask;
-        struct mii_bus          *slave_mii_bus;
-        struct net_device       *ports[DSA_MAX_PORTS];
-};
-
-static inline bool dsa_is_cpu_port(struct dsa_switch *ds, int p)
-{
-        return !!(ds->index == ds->dst->cpu_switch && p == ds->dst->cpu_port);
-}
-
-static inline u8 dsa_upstream_port(struct dsa_switch *ds)
-{
-        struct dsa_switch_tree *dst = ds->dst;
-
-        /*
-         * If this is the root switch (i.e. the switch that connects
-         * to the CPU), return the cpu port number on this switch.
-         * Else return the (DSA) port number that connects to the
-         * switch that is one hop closer to the cpu.
-         */
-        if (dst->cpu_switch == ds->index)
-                return dst->cpu_port;
-        else
-                return ds->pd->rtable[dst->cpu_switch];
-}
-
-struct dsa_switch_driver {
-        struct list_head        list;
-
-        __be16                  tag_protocol;
-        int                     priv_size;
-
-        /*
-         * Probing and setup.
-         */
-        char    *(*probe)(struct mii_bus *bus, int sw_addr);
-        int     (*setup)(struct dsa_switch *ds);
-        int     (*set_addr)(struct dsa_switch *ds, u8 *addr);
-
-        /*
-         * Access to the switch's PHY registers.
-         */
-        int     (*phy_read)(struct dsa_switch *ds, int port, int regnum);
-        int     (*phy_write)(struct dsa_switch *ds, int port,
-                             int regnum, u16 val);
-
-        /*
-         * Link state polling and IRQ handling.
-         */
-        void    (*poll_link)(struct dsa_switch *ds);
-
-        /*
-         * ethtool hardware statistics.
-         */
-        void    (*get_strings)(struct dsa_switch *ds, int port, uint8_t *data);
-        void    (*get_ethtool_stats)(struct dsa_switch *ds,
-                                     int port, uint64_t *data);
-        int     (*get_sset_count)(struct dsa_switch *ds);
-};
-
-void register_switch_driver(struct dsa_switch_driver *type);
-void unregister_switch_driver(struct dsa_switch_driver *type);
-
-/*
- * The original DSA tag format and some other tag formats have no
- * ethertype, which means that we need to add a little hack to the
- * networking receive path to make sure that received frames get
- * the right ->protocol assigned to them when one of those tag
- * formats is in use.
- */
-static inline bool dsa_uses_dsa_tags(struct dsa_switch_tree *dst)
-{
-        return !!(dst->tag_protocol == htons(ETH_P_DSA));
-}
+extern bool dsa_uses_dsa_tags(void *dsa_ptr);
+extern bool dsa_uses_trailer_tags(void *dsa_ptr);
 
-static inline bool dsa_uses_trailer_tags(struct dsa_switch_tree *dst)
-{
-        return !!(dst->tag_protocol == htons(ETH_P_TRAILER));
-}
 
 #endif
diff --git a/include/net/dst.h b/include/net/dst.h
index 9a7881066fb..82952498b63 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -12,7 +12,6 @@
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <linux/rcupdate.h>
-#include <linux/bug.h>
 #include <linux/jiffies.h>
 #include <net/neighbour.h>
 #include <asm/processor.h>
@@ -36,22 +35,18 @@ struct dst_entry {
         struct net_device       *dev;
         struct  dst_ops         *ops;
         unsigned long           _metrics;
-        union {
-                unsigned long           expires;
-                /* point to where the dst_entry copied from */
-                struct dst_entry        *from;
-        };
+        unsigned long           expires;
         struct dst_entry        *path;
-        void                    *__pad0;
+        struct neighbour __rcu  *_neighbour;
 #ifdef CONFIG_XFRM
         struct xfrm_state       *xfrm;
 #else
         void                    *__pad1;
 #endif
-        int                     (*input)(struct sk_buff *);
-        int                     (*output)(struct sk_buff *);
+        int                     (*input)(struct sk_buff*);
+        int                     (*output)(struct sk_buff*);
 
-        unsigned short          flags;
+        int                     flags;
 #define DST_HOST                0x0001
 #define DST_NOXFRM              0x0002
 #define DST_NOPOLICY            0x0004
@@ -59,26 +54,9 @@ struct dst_entry {
 #define DST_NOCACHE             0x0010
 #define DST_NOCOUNT             0x0020
 #define DST_NOPEER              0x0040
-#define DST_FAKE_RTABLE         0x0080
-#define DST_XFRM_TUNNEL         0x0100
-
-        unsigned short          pending_confirm;
 
         short                   error;
-
-        /* A non-zero value of dst->obsolete forces by-hand validation
-         * of the route entry.  Positive values are set by the generic
-         * dst layer to indicate that the entry has been forcefully
-         * destroyed.
-         *
-         * Negative values are used by the implementation layer code to
-         * force invocation of the dst_ops->check() method.
-         */
         short                   obsolete;
-#define DST_OBSOLETE_NONE       0
-#define DST_OBSOLETE_DEAD       2
-#define DST_OBSOLETE_FORCE_CHK  -1
-#define DST_OBSOLETE_KILL       -2
         unsigned short          header_len;     /* more space at head required */
         unsigned short          trailer_len;    /* space to reserve at tail */
 #ifdef CONFIG_IP_ROUTE_CLASSID
@@ -109,8 +87,23 @@ struct dst_entry {
         };
 };
 
+static inline struct neighbour *dst_get_neighbour(struct dst_entry *dst)
+{
+        return rcu_dereference(dst->_neighbour);
+}
+
+static inline struct neighbour *dst_get_neighbour_raw(struct dst_entry *dst)
+{
+        return rcu_dereference_raw(dst->_neighbour);
+}
+
+static inline void dst_set_neighbour(struct dst_entry *dst, struct neighbour *neigh)
+{
+        rcu_assign_pointer(dst->_neighbour, neigh);
+}
+
 extern u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old);
-extern const u32 dst_default_metrics[];
+extern const u32 dst_default_metrics[RTAX_MAX];
 
 #define DST_METRICS_READ_ONLY   0x1UL
 #define __DST_METRICS_PTR(Y)    \
@@ -213,7 +206,12 @@ dst_feature(const struct dst_entry *dst, u32 feature)
 
 static inline u32 dst_mtu(const struct dst_entry *dst)
 {
-        return dst->ops->mtu(dst);
+        u32 mtu = dst_metric_raw(dst, RTAX_MTU);
+
+        if (!mtu)
+                mtu = dst->ops->default_mtu(dst);
+
+        return mtu;
 }
 
 /* RTT metrics are stored in milliseconds for user ABI, but used as jiffies */
@@ -222,6 +220,12 @@ static inline unsigned long dst_metric_rtt(const struct dst_entry *dst, int metr
         return msecs_to_jiffies(dst_metric(dst, metric));
 }
 
+static inline void set_dst_metric_rtt(struct dst_entry *dst, int metric,
+                                      unsigned long rtt)
+{
+        dst_metric_set(dst, metric, jiffies_to_msecs(rtt));
+}
+
 static inline u32
 dst_allfrag(const struct dst_entry *dst)
 {
@@ -235,7 +239,7 @@ dst_metric_locked(const struct dst_entry *dst, int metric)
         return dst_metric(dst, RTAX_LOCK) & (1<<metric);
 }
 
-static inline void dst_hold(struct dst_entry *dst)
+static inline void dst_hold(struct dst_entry * dst)
 {
         /*
          * If your kernel compilation stops here, please check
@@ -258,7 +262,8 @@ static inline void dst_use_noref(struct dst_entry *dst, unsigned long time)
         dst->lastuse = time;
 }
 
-static inline struct dst_entry *dst_clone(struct dst_entry *dst)
+static inline
+struct dst_entry * dst_clone(struct dst_entry * dst)
 {
         if (dst)
                 atomic_inc(&dst->__refcnt);
@@ -321,14 +326,7 @@ static inline void skb_dst_force(struct sk_buff *skb)
 static inline void __skb_tunnel_rx(struct sk_buff *skb, struct net_device *dev)
 {
         skb->dev = dev;
-
-        /*
-         * Clear rxhash so that we can recalulate the hash for the
-         * encapsulated packet, unless we have already determine the hash
-         * over the L4 4-tuple.
-         */
-        if (!skb->l4_rxhash)
-                skb->rxhash = 0;
+        skb->rxhash = 0;
         skb_set_queue_mapping(skb, 0);
         skb_dst_drop(skb);
         nf_reset(skb);
@@ -364,15 +362,14 @@ static inline struct dst_entry *skb_dst_pop(struct sk_buff *skb)
 }
 
 extern int dst_discard(struct sk_buff *skb);
-extern void *dst_alloc(struct dst_ops *ops, struct net_device *dev,
-                       int initial_ref, int initial_obsolete,
-                       unsigned short flags);
-extern void __dst_free(struct dst_entry *dst);
-extern struct dst_entry *dst_destroy(struct dst_entry *dst);
+extern void *dst_alloc(struct dst_ops * ops, struct net_device *dev,
+                       int initial_ref, int initial_obsolete, int flags);
+extern void __dst_free(struct dst_entry * dst);
+extern struct dst_entry *dst_destroy(struct dst_entry * dst);
 
-static inline void dst_free(struct dst_entry *dst)
+static inline void dst_free(struct dst_entry * dst)
 {
-        if (dst->obsolete > 0)
+        if (dst->obsolete > 1)
                 return;
         if (!atomic_read(&dst->__refcnt)) {
                 dst = dst_destroy(dst);
@@ -390,39 +387,19 @@ static inline void dst_rcu_free(struct rcu_head *head)
 
 static inline void dst_confirm(struct dst_entry *dst)
 {
-        dst->pending_confirm = 1;
-}
+        if (dst) {
+                struct neighbour *n;
 
-static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
-                                   struct sk_buff *skb)
-{
-        const struct hh_cache *hh;
-
-        if (dst->pending_confirm) {
-                unsigned long now = jiffies;
-
-                dst->pending_confirm = 0;
-                /* avoid dirtying neighbour */
-                if (n->confirmed != now)
-                        n->confirmed = now;
+                rcu_read_lock();
+                n = dst_get_neighbour(dst);
+                neigh_confirm(n);
+                rcu_read_unlock();
         }
-
-        hh = &n->hh;
-        if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
-                return neigh_hh_output(hh, skb);
-        else
-                return n->output(n, skb);
 }
 
 static inline struct neighbour *dst_neigh_lookup(const struct dst_entry *dst, const void *daddr)
 {
-        return dst->ops->neigh_lookup(dst, NULL, daddr);
-}
-
-static inline struct neighbour *dst_neigh_lookup_skb(const struct dst_entry *dst,
-                                                     struct sk_buff *skb)
-{
-        return dst->ops->neigh_lookup(dst, skb, NULL);
+        return dst->ops->neigh_lookup(dst, daddr);
 }
 
 static inline void dst_link_failure(struct sk_buff *skb)
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 2f26dfb8450..9adb99845a5 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -8,31 +8,25 @@ struct dst_entry;
 struct kmem_cachep;
 struct net_device;
 struct sk_buff;
-struct sock;
 
 struct dst_ops {
         unsigned short          family;
         __be16                  protocol;
-        unsigned int            gc_thresh;
+        unsigned                gc_thresh;
 
         int                     (*gc)(struct dst_ops *ops);
         struct dst_entry *      (*check)(struct dst_entry *, __u32 cookie);
         unsigned int            (*default_advmss)(const struct dst_entry *);
-        unsigned int            (*mtu)(const struct dst_entry *);
+        unsigned int            (*default_mtu)(const struct dst_entry *);
         u32 *                   (*cow_metrics)(struct dst_entry *, unsigned long);
         void                    (*destroy)(struct dst_entry *);
         void                    (*ifdown)(struct dst_entry *,
                                           struct net_device *dev, int how);
         struct dst_entry *      (*negative_advice)(struct dst_entry *);
         void                    (*link_failure)(struct sk_buff *);
-        void                    (*update_pmtu)(struct dst_entry *dst, struct sock *sk,
-                                               struct sk_buff *skb, u32 mtu);
-        void                    (*redirect)(struct dst_entry *dst, struct sock *sk,
-                                            struct sk_buff *skb);
+        void                    (*update_pmtu)(struct dst_entry *dst, u32 mtu);
         int                     (*local_out)(struct sk_buff *skb);
-        struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst,
-                                                struct sk_buff *skb,
-                                                const void *daddr);
+        struct neighbour *      (*neigh_lookup)(const struct dst_entry *dst, const void *daddr);
 
         struct kmem_cache       *kmem_cachep;
 
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h
index e361f488242..075f1e3a0fe 100644
--- a/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
@@ -52,7 +52,6 @@ struct fib_rules_ops {
                                              struct sk_buff *,
                                              struct fib_rule_hdr *,
                                              struct nlattr **);
-        void                    (*delete)(struct fib_rule *);
         int                     (*compare)(struct fib_rule *,
                                            struct fib_rule_hdr *,
                                            struct nlattr **);
diff --git a/include/net/flow.h b/include/net/flow.h
index 628e11b98c5..57f15a7f1cd 100644
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -20,8 +20,8 @@ struct flowi_common {
         __u8    flowic_proto;
         __u8    flowic_flags;
 #define FLOWI_FLAG_ANYSRC               0x01
-#define FLOWI_FLAG_CAN_SLEEP            0x02
-#define FLOWI_FLAG_KNOWN_NH             0x04
+#define FLOWI_FLAG_PRECOW_METRICS       0x02
+#define FLOWI_FLAG_CAN_SLEEP            0x04
         __u32   flowic_secid;
 };
 
@@ -59,11 +59,8 @@ struct flowi4 {
 #define flowi4_proto            __fl_common.flowic_proto
 #define flowi4_flags            __fl_common.flowic_flags
 #define flowi4_secid            __fl_common.flowic_secid
-
-        /* (saddr,daddr) must be grouped, same order as in IP header */
-        __be32                  saddr;
         __be32                  daddr;
-
+        __be32                  saddr;
         union flowi_uli         uli;
 #define fl4_sport               uli.ports.sport
 #define fl4_dport               uli.ports.dport
@@ -78,7 +75,7 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
                                       __u32 mark, __u8 tos, __u8 scope,
                                       __u8 proto, __u8 flags,
                                       __be32 daddr, __be32 saddr,
-                                      __be16 dport, __be16 sport)
+                                      __be16 dport, __be32 sport)
 {
         fl4->flowi4_oif = oif;
         fl4->flowi4_iif = 0;
@@ -93,16 +90,6 @@ static inline void flowi4_init_output(struct flowi4 *fl4, int oif,
         fl4->fl4_dport = dport;
         fl4->fl4_sport = sport;
 }
-
-/* Reset some input parameters after previous lookup */
-static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
-                                        __be32 daddr, __be32 saddr)
-{
-        fl4->flowi4_oif = oif;
-        fl4->flowi4_tos = tos;
-        fl4->daddr = daddr;
-        fl4->saddr = saddr;
-}
                                       
 
 struct flowi6 {
diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h
deleted file mode 100644
index 80461c1ae9e..00000000000
--- a/include/net/flow_keys.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef _NET_FLOW_KEYS_H
-#define _NET_FLOW_KEYS_H
-
-struct flow_keys {
-        /* (src,dst) must be grouped, in the same way than in IP header */
-        __be32 src;
-        __be32 dst;
-        union {
-                __be32 ports;
-                __be16 port16[2];
-        };
-        u8 ip_proto;
-};
-
-extern bool skb_flow_dissect(const struct sk_buff *skb, struct flow_keys *flow);
-#endif
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index bdfbe68c1c3..82d8d09faa4 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -5,8 +5,6 @@
 #include <net/netlink.h>
 #include <net/net_namespace.h>
 
-#define GENLMSG_DEFAULT_SIZE (NLMSG_DEFAULT_SIZE - GENL_HDRLEN)
-
 /**
  * struct genl_multicast_group - generic netlink multicast group
  * @name: name of the multicast group, names are per-family
@@ -65,7 +63,7 @@ struct genl_family {
 /**
  * struct genl_info - receiving information
  * @snd_seq: sending sequence number
- * @snd_portid: netlink portid of sender
+ * @snd_pid: netlink pid of sender
  * @nlhdr: netlink message header
  * @genlhdr: generic netlink message header
  * @userhdr: user specific header
@@ -75,7 +73,7 @@ struct genl_family {
  */
 struct genl_info {
         u32                     snd_seq;
-        u32                     snd_portid;
+        u32                     snd_pid;
         struct nlmsghdr *       nlhdr;
         struct genlmsghdr *     genlhdr;
         void *                  userhdr;
@@ -130,11 +128,36 @@ extern int genl_register_mc_group(struct genl_family *family,
                                   struct genl_multicast_group *grp);
 extern void genl_unregister_mc_group(struct genl_family *family,
                                      struct genl_multicast_group *grp);
-extern void genl_notify(struct sk_buff *skb, struct net *net, u32 portid,
-                        u32 group, struct nlmsghdr *nlh, gfp_t flags);
 
-void *genlmsg_put(struct sk_buff *skb, u32 portid, u32 seq,
-                                struct genl_family *family, int flags, u8 cmd);
+/**
+ * genlmsg_put - Add generic netlink header to netlink message
+ * @skb: socket buffer holding the message
+ * @pid: netlink pid the message is addressed to
+ * @seq: sequence number (usually the one of the sender)
+ * @family: generic netlink family
+ * @flags netlink message flags
+ * @cmd: generic netlink command
+ *
+ * Returns pointer to user specific header
+ */
+static inline void *genlmsg_put(struct sk_buff *skb, u32 pid, u32 seq,
+                                struct genl_family *family, int flags, u8 cmd)
+{
+        struct nlmsghdr *nlh;
+        struct genlmsghdr *hdr;
+
+        nlh = nlmsg_put(skb, pid, seq, family->id, GENL_HDRLEN +
+                        family->hdrsize, flags);
+        if (nlh == NULL)
+                return NULL;
+
+        hdr = nlmsg_data(nlh);
+        hdr->cmd = cmd;
+        hdr->version = family->version;
+        hdr->reserved = 0;
+
+        return (char *) hdr + GENL_HDRLEN;
+}
 
 /**
  * genlmsg_nlhdr - Obtain netlink header from user specified header
@@ -183,7 +206,7 @@ static inline void *genlmsg_put_reply(struct sk_buff *skb,
                                       struct genl_family *family,
                                       int flags, u8 cmd)
 {
-        return genlmsg_put(skb, info->snd_portid, info->snd_seq, family,
+        return genlmsg_put(skb, info->snd_pid, info->snd_seq, family,
                            flags, cmd);
 }
 
@@ -212,49 +235,49 @@ static inline void genlmsg_cancel(struct sk_buff *skb, void *hdr)
  * genlmsg_multicast_netns - multicast a netlink message to a specific netns
  * @net: the net namespace
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  */
 static inline int genlmsg_multicast_netns(struct net *net, struct sk_buff *skb,
-                                          u32 portid, unsigned int group, gfp_t flags)
+                                          u32 pid, unsigned int group, gfp_t flags)
 {
-        return nlmsg_multicast(net->genl_sock, skb, portid, group, flags);
+        return nlmsg_multicast(net->genl_sock, skb, pid, group, flags);
 }
 
 /**
  * genlmsg_multicast - multicast a netlink message to the default netns
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  */
-static inline int genlmsg_multicast(struct sk_buff *skb, u32 portid,
+static inline int genlmsg_multicast(struct sk_buff *skb, u32 pid,
                                     unsigned int group, gfp_t flags)
 {
-        return genlmsg_multicast_netns(&init_net, skb, portid, group, flags);
+        return genlmsg_multicast_netns(&init_net, skb, pid, group, flags);
 }
 
 /**
  * genlmsg_multicast_allns - multicast a netlink message to all net namespaces
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  *
  * This function must hold the RTNL or rcu_read_lock().
  */
-int genlmsg_multicast_allns(struct sk_buff *skb, u32 portid,
+int genlmsg_multicast_allns(struct sk_buff *skb, u32 pid,
                             unsigned int group, gfp_t flags);
 
 /**
  * genlmsg_unicast - unicast a netlink message
  * @skb: netlink message as socket buffer
- * @portid: netlink portid of the destination socket
+ * @pid: netlink pid of the destination socket
  */
-static inline int genlmsg_unicast(struct net *net, struct sk_buff *skb, u32 portid)
+static inline int genlmsg_unicast(struct net *net, struct sk_buff *skb, u32 pid)
 {
-        return nlmsg_unicast(net->genl_sock, skb, portid);
+        return nlmsg_unicast(net->genl_sock, skb, pid);
 }
 
 /**
@@ -264,7 +287,7 @@ static inline int genlmsg_unicast(struct net *net, struct sk_buff *skb, u32 port
  */
 static inline int genlmsg_reply(struct sk_buff *skb, struct genl_info *info)
 {
-        return genlmsg_unicast(genl_info_net(info), skb, info->snd_portid);
+        return genlmsg_unicast(genl_info_net(info), skb, info->snd_pid);
 }
 
 /**
diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
deleted file mode 100644
index e5062c955ea..00000000000
--- a/include/net/gro_cells.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef _NET_GRO_CELLS_H
-#define _NET_GRO_CELLS_H
-
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <linux/netdevice.h>
-
-struct gro_cell {
-        struct sk_buff_head     napi_skbs;
-        struct napi_struct      napi;
-} ____cacheline_aligned_in_smp;
-
-struct gro_cells {
-        unsigned int            gro_cells_mask;
-        struct gro_cell         *cells;
-};
-
-static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *skb)
-{
-        struct gro_cell *cell = gcells->cells;
-        struct net_device *dev = skb->dev;
-
-        if (!cell || skb_cloned(skb) || !(dev->features & NETIF_F_GRO)) {
-                netif_rx(skb);
-                return;
-        }
-
-        if (skb_rx_queue_recorded(skb))
-                cell += skb_get_rx_queue(skb) & gcells->gro_cells_mask;
-
-        if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
-                atomic_long_inc(&dev->rx_dropped);
-                kfree_skb(skb);
-                return;
-        }
-
-        /* We run in BH context */
-        spin_lock(&cell->napi_skbs.lock);
-
-        __skb_queue_tail(&cell->napi_skbs, skb);
-        if (skb_queue_len(&cell->napi_skbs) == 1)
-                napi_schedule(&cell->napi);
-
-        spin_unlock(&cell->napi_skbs.lock);
-}
-
-/* called unser BH context */
-static inline int gro_cell_poll(struct napi_struct *napi, int budget)
-{
-        struct gro_cell *cell = container_of(napi, struct gro_cell, napi);
-        struct sk_buff *skb;
-        int work_done = 0;
-
-        spin_lock(&cell->napi_skbs.lock);
-        while (work_done < budget) {
-                skb = __skb_dequeue(&cell->napi_skbs);
-                if (!skb)
-                        break;
-                spin_unlock(&cell->napi_skbs.lock);
-                napi_gro_receive(napi, skb);
-                work_done++;
-                spin_lock(&cell->napi_skbs.lock);
-        }
-
-        if (work_done < budget)
-                napi_complete(napi);
-        spin_unlock(&cell->napi_skbs.lock);
-        return work_done;
-}
-
-static inline int gro_cells_init(struct gro_cells *gcells, struct net_device *dev)
-{
-        int i;
-
-        gcells->gro_cells_mask = roundup_pow_of_two(netif_get_num_default_rss_queues()) - 1;
-        gcells->cells = kcalloc(sizeof(struct gro_cell),
-                                gcells->gro_cells_mask + 1,
-                                GFP_KERNEL);
-        if (!gcells->cells)
-                return -ENOMEM;
-
-        for (i = 0; i <= gcells->gro_cells_mask; i++) {
-                struct gro_cell *cell = gcells->cells + i;
-
-                skb_queue_head_init(&cell->napi_skbs);
-                netif_napi_add(dev, &cell->napi, gro_cell_poll, 64);
-                napi_enable(&cell->napi);
-        }
-        return 0;
-}
-
-static inline void gro_cells_destroy(struct gro_cells *gcells)
-{
-        struct gro_cell *cell = gcells->cells;
-        int i;
-
-        if (!cell)
-                return;
-        for (i = 0; i <= gcells->gro_cells_mask; i++,cell++) {
-                netif_napi_del(&cell->napi);
-                skb_queue_purge(&cell->napi_skbs);
-        }
-        kfree(gcells->cells);
-        gcells->cells = NULL;
-}
-
-#endif
diff --git a/include/net/icmp.h b/include/net/icmp.h
index 9ac2524d140..f0698b955b7 100644
--- a/include/net/icmp.h
+++ b/include/net/icmp.h
@@ -25,14 +25,14 @@
 
 struct icmp_err {
   int           errno;
-  unsigned int  fatal:1;
+  unsigned      fatal:1;
 };
 
 extern const struct icmp_err icmp_err_convert[];
 #define ICMP_INC_STATS(net, field)      SNMP_INC_STATS((net)->mib.icmp_statistics, field)
 #define ICMP_INC_STATS_BH(net, field)   SNMP_INC_STATS_BH((net)->mib.icmp_statistics, field)
-#define ICMPMSGOUT_INC_STATS(net, field)        SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field+256)
-#define ICMPMSGIN_INC_STATS_BH(net, field)      SNMP_INC_STATS_ATOMIC_LONG((net)->mib.icmpmsg_statistics, field)
+#define ICMPMSGOUT_INC_STATS(net, field)        SNMP_INC_STATS((net)->mib.icmpmsg_statistics, field+256)
+#define ICMPMSGIN_INC_STATS_BH(net, field)      SNMP_INC_STATS_BH((net)->mib.icmpmsg_statistics, field)
 
 struct dst_entry;
 struct net_proto_family;
@@ -41,6 +41,7 @@ struct net;
 
 extern void     icmp_send(struct sk_buff *skb_in,  int type, int code, __be32 info);
 extern int      icmp_rcv(struct sk_buff *skb);
+extern int      icmp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int      icmp_init(void);
 extern void     icmp_out_count(struct net *net, unsigned char type);
 
diff --git a/include/net/ieee80211_radiotap.h b/include/net/ieee80211_radiotap.h
index c3999632e61..b0be5fb9de1 100644
--- a/include/net/ieee80211_radiotap.h
+++ b/include/net/ieee80211_radiotap.h
@@ -183,13 +183,6 @@ struct ieee80211_radiotap_header {
  *     Contains a bitmap of known fields/flags, the flags, and
  *     the MCS index.
  *
- * IEEE80211_RADIOTAP_AMPDU_STATUS      u32, u16, u8, u8        unitless
- *
- *      Contains the AMPDU information for the subframe.
- *
- * IEEE80211_RADIOTAP_VHT       u16, u8, u8, u8[4], u8, u8, u16
- *
- *      Contains VHT information about this frame.
  */
 enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_TSFT = 0,
@@ -212,8 +205,6 @@ enum ieee80211_radiotap_type {
         IEEE80211_RADIOTAP_DATA_RETRIES = 17,
 
         IEEE80211_RADIOTAP_MCS = 19,
-        IEEE80211_RADIOTAP_AMPDU_STATUS = 20,
-        IEEE80211_RADIOTAP_VHT = 21,
 
         /* valid in every it_present bitmap, even vendor namespaces */
         IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE = 29,
@@ -260,7 +251,6 @@ enum ieee80211_radiotap_type {
                                                  * retries */
 #define IEEE80211_RADIOTAP_F_TX_CTS     0x0002  /* used cts 'protection' */
 #define IEEE80211_RADIOTAP_F_TX_RTS     0x0004  /* used rts/cts handshake */
-#define IEEE80211_RADIOTAP_F_TX_NOACK   0x0008  /* don't expect an ack */
 
 
 /* For IEEE80211_RADIOTAP_MCS */
@@ -279,32 +269,14 @@ enum ieee80211_radiotap_type {
 #define IEEE80211_RADIOTAP_MCS_FMT_GF           0x08
 #define IEEE80211_RADIOTAP_MCS_FEC_LDPC         0x10
 
-/* For IEEE80211_RADIOTAP_AMPDU_STATUS */
-#define IEEE80211_RADIOTAP_AMPDU_REPORT_ZEROLEN         0x0001
-#define IEEE80211_RADIOTAP_AMPDU_IS_ZEROLEN             0x0002
-#define IEEE80211_RADIOTAP_AMPDU_LAST_KNOWN             0x0004
-#define IEEE80211_RADIOTAP_AMPDU_IS_LAST                0x0008
-#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR          0x0010
-#define IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN        0x0020
-
-/* For IEEE80211_RADIOTAP_VHT */
-#define IEEE80211_RADIOTAP_VHT_KNOWN_STBC                       0x0001
-#define IEEE80211_RADIOTAP_VHT_KNOWN_TXOP_PS_NA                 0x0002
-#define IEEE80211_RADIOTAP_VHT_KNOWN_GI                         0x0004
-#define IEEE80211_RADIOTAP_VHT_KNOWN_SGI_NSYM_DIS               0x0008
-#define IEEE80211_RADIOTAP_VHT_KNOWN_LDPC_EXTRA_OFDM_SYM        0x0010
-#define IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED                 0x0020
-#define IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH                  0x0040
-#define IEEE80211_RADIOTAP_VHT_KNOWN_GROUP_ID                   0x0080
-#define IEEE80211_RADIOTAP_VHT_KNOWN_PARTIAL_AID                0x0100
-
-#define IEEE80211_RADIOTAP_VHT_FLAG_STBC                        0x01
-#define IEEE80211_RADIOTAP_VHT_FLAG_TXOP_PS_NA                  0x02
-#define IEEE80211_RADIOTAP_VHT_FLAG_SGI                         0x04
-#define IEEE80211_RADIOTAP_VHT_FLAG_SGI_NSYM_M10_9              0x08
-#define IEEE80211_RADIOTAP_VHT_FLAG_LDPC_EXTRA_OFDM_SYM         0x10
-#define IEEE80211_RADIOTAP_VHT_FLAG_BEAMFORMED                  0x20
 
+/* Ugly macro to convert literal channel numbers into their mhz equivalents
+ * There are certianly some conditions that will break this (like feeding it '30')
+ * but they shouldn't arise since nothing talks on channel 30. */
+#define ieee80211chan2mhz(x) \
+        (((x) <= 14) ? \
+        (((x) == 14) ? 2484 : ((x) * 5) + 2407) : \
+        ((x) + 1000) * 5)
 
 /* helpers */
 static inline int ieee80211_get_radiotap_len(unsigned char *data)
diff --git a/include/net/ieee802154.h b/include/net/ieee802154.h
index ee59f8b188d..d52685defb1 100644
--- a/include/net/ieee802154.h
+++ b/include/net/ieee802154.h
@@ -21,14 +21,11 @@
  * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
  * Maxim Osipov <maxim.osipov@siemens.com>
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
  */
 
 #ifndef NET_IEEE802154_H
 #define NET_IEEE802154_H
 
-#define IEEE802154_MTU                  127
-
 #define IEEE802154_FC_TYPE_BEACON       0x0     /* Frame is beacon */
 #define IEEE802154_FC_TYPE_DATA         0x1     /* Frame is data */
 #define IEEE802154_FC_TYPE_ACK          0x2     /* Frame is acknowledgment */
@@ -59,9 +56,6 @@
         (((x) & IEEE802154_FC_DAMODE_MASK) >> IEEE802154_FC_DAMODE_SHIFT)
 
 
-/* MAC footer size */
-#define IEEE802154_MFR_SIZE     2 /* 2 octets */
-
 /* MAC's Command Frames Identifiers */
 #define IEEE802154_CMD_ASSOCIATION_REQ          0x01
 #define IEEE802154_CMD_ASSOCIATION_RESP         0x02
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index d104c882fc2..57430555487 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -1,7 +1,7 @@
 /*
  * An interface between IEEE802.15.4 device and rest of the kernel.
  *
- * Copyright (C) 2007-2012 Siemens AG
+ * Copyright (C) 2007, 2008, 2009 Siemens AG
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -21,14 +21,11 @@
  * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
  * Maxim Osipov <maxim.osipov@siemens.com>
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
- * Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
  */
 
 #ifndef IEEE802154_NETDEVICE_H
 #define IEEE802154_NETDEVICE_H
 
-#include <net/af_ieee802154.h>
-
 /*
  * A control block of skb passed between the ARPHRD_IEEE802154 device
  * and other stack parts.
@@ -113,26 +110,12 @@ struct ieee802154_mlme_ops {
         u8 (*get_bsn)(const struct net_device *dev);
 };
 
-/* The IEEE 802.15.4 standard defines 2 type of the devices:
- * - FFD - full functionality device
- * - RFD - reduce functionality device
- *
- * So 2 sets of mlme operations are needed
- */
-struct ieee802154_reduced_mlme_ops {
-        struct wpan_phy *(*get_phy)(const struct net_device *dev);
-};
-
-static inline struct ieee802154_mlme_ops *
-ieee802154_mlme_ops(const struct net_device *dev)
-{
-        return dev->ml_priv;
-}
-
-static inline struct ieee802154_reduced_mlme_ops *
-ieee802154_reduced_mlme_ops(const struct net_device *dev)
+static inline struct ieee802154_mlme_ops *ieee802154_mlme_ops(
+                const struct net_device *dev)
 {
         return dev->ml_priv;
 }
 
 #endif
+
+
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 93563221d29..51a7031b4aa 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -120,7 +120,7 @@ struct ifmcaddr6 {
         unsigned char           mca_crcount;
         unsigned long           mca_sfcount[2];
         struct timer_list       mca_timer;
-        unsigned int            mca_flags;
+        unsigned                mca_flags;
         int                     mca_users;
         atomic_t                mca_refcnt;
         spinlock_t              mca_lock;
@@ -209,6 +209,60 @@ static inline void ipv6_eth_mc_map(const struct in6_addr *addr, char *buf)
         memcpy(buf + 2, &addr->s6_addr32[3], sizeof(__u32));
 }
 
+static inline void ipv6_tr_mc_map(const struct in6_addr *addr, char *buf)
+{
+        /* All nodes FF01::1, FF02::1, FF02::1:FFxx:xxxx */
+
+        if (((addr->s6_addr[0] == 0xFF) &&
+            ((addr->s6_addr[1] == 0x01) || (addr->s6_addr[1] == 0x02)) &&
+             (addr->s6_addr16[1] == 0) &&
+             (addr->s6_addr32[1] == 0) &&
+             (addr->s6_addr32[2] == 0) &&
+             (addr->s6_addr16[6] == 0) &&
+             (addr->s6_addr[15] == 1)) ||
+            ((addr->s6_addr[0] == 0xFF) &&
+             (addr->s6_addr[1] == 0x02) &&
+             (addr->s6_addr16[1] == 0) &&
+             (addr->s6_addr32[1] == 0) &&
+             (addr->s6_addr16[4] == 0) &&
+             (addr->s6_addr[10] == 0) &&
+             (addr->s6_addr[11] == 1) &&
+             (addr->s6_addr[12] == 0xff)))
+        {
+                buf[0]=0xC0;
+                buf[1]=0x00;
+                buf[2]=0x01;
+                buf[3]=0x00;
+                buf[4]=0x00;
+                buf[5]=0x00;
+        /* All routers FF0x::2 */
+        } else if ((addr->s6_addr[0] ==0xff) &&
+                ((addr->s6_addr[1] & 0xF0) == 0) &&
+                (addr->s6_addr16[1] == 0) &&
+                (addr->s6_addr32[1] == 0) &&
+                (addr->s6_addr32[2] == 0) &&
+                (addr->s6_addr16[6] == 0) &&
+                (addr->s6_addr[15] == 2))
+        {
+                buf[0]=0xC0;
+                buf[1]=0x00;
+                buf[2]=0x02;
+                buf[3]=0x00;
+                buf[4]=0x00;
+                buf[5]=0x00;
+        } else {
+                unsigned char i ; 
+                
+                i = addr->s6_addr[15] & 7 ; 
+                buf[0]=0xC0;
+                buf[1]=0x00;
+                buf[2]=0x00;
+                buf[3]=0x01 << i ; 
+                buf[4]=0x00;
+                buf[5]=0x00;
+        }
+}
+
 static inline void ipv6_arcnet_mc_map(const struct in6_addr *addr, char *buf)
 {
         buf[0] = 0x00;
diff --git a/include/net/inet6_connection_sock.h b/include/net/inet6_connection_sock.h
index 04642c92043..3207e58ee01 100644
--- a/include/net/inet6_connection_sock.h
+++ b/include/net/inet6_connection_sock.h
@@ -23,10 +23,9 @@ struct sock;
 struct sockaddr;
 
 extern int inet6_csk_bind_conflict(const struct sock *sk,
-                                   const struct inet_bind_bucket *tb, bool relax);
+                                   const struct inet_bind_bucket *tb);
 
 extern struct dst_entry* inet6_csk_route_req(struct sock *sk,
-                                             struct flowi6 *fl6,
                                              const struct request_sock *req);
 
 extern struct request_sock *inet6_csk_search_req(const struct sock *sk,
@@ -43,6 +42,4 @@ extern void inet6_csk_reqsk_queue_hash_add(struct sock *sk,
 extern void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);
 
 extern int inet6_csk_xmit(struct sk_buff *skb, struct flowi *fl);
-
-extern struct dst_entry *inet6_csk_update_pmtu(struct sock *sk, u32 mtu);
 #endif /* _INET6_CONNECTION_SOCK_H */
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index 9e34c877a77..e46674d5dae 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -15,7 +15,7 @@
 #define _INET6_HASHTABLES_H
 
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 #include <linux/in6.h>
 #include <linux/ipv6.h>
 #include <linux/types.h>
@@ -96,20 +96,19 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
                                               const __be16 sport,
                                               const __be16 dport)
 {
-        struct sock *sk = skb_steal_sock(skb);
+        struct sock *sk;
 
-        if (sk)
+        if (unlikely(sk = skb_steal_sock(skb)))
                 return sk;
-
-        return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
-                              &ipv6_hdr(skb)->saddr, sport,
-                              &ipv6_hdr(skb)->daddr, ntohs(dport),
-                              inet6_iif(skb));
+        else return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
+                                   &ipv6_hdr(skb)->saddr, sport,
+                                   &ipv6_hdr(skb)->daddr, ntohs(dport),
+                                   inet6_iif(skb));
 }
 
 extern struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
                                  const struct in6_addr *saddr, const __be16 sport,
                                  const struct in6_addr *daddr, const __be16 dport,
                                  const int dif);
-#endif /* IS_ENABLED(CONFIG_IPV6) */
+#endif /* defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) */
 #endif /* _INET6_HASHTABLES_H */
diff --git a/include/net/inet_common.h b/include/net/inet_common.h
index 234008782c8..22fac9892b1 100644
--- a/include/net/inet_common.h
+++ b/include/net/inet_common.h
@@ -14,11 +14,9 @@ struct sockaddr;
 struct socket;
 
 extern int inet_release(struct socket *sock);
-extern int inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
+extern int inet_stream_connect(struct socket *sock, struct sockaddr * uaddr,
                                int addr_len, int flags);
-extern int __inet_stream_connect(struct socket *sock, struct sockaddr *uaddr,
-                                 int addr_len, int flags);
-extern int inet_dgram_connect(struct socket *sock, struct sockaddr *uaddr,
+extern int inet_dgram_connect(struct socket *sock, struct sockaddr * uaddr,
                               int addr_len, int flags);
 extern int inet_accept(struct socket *sock, struct socket *newsock, int flags);
 extern int inet_sendmsg(struct kiocb *iocb, struct socket *sock,
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 183292722f6..e6db62e756d 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -39,13 +39,12 @@ struct inet_connection_sock_af_ops {
         int         (*queue_xmit)(struct sk_buff *skb, struct flowi *fl);
         void        (*send_check)(struct sock *sk, struct sk_buff *skb);
         int         (*rebuild_header)(struct sock *sk);
-        void        (*sk_rx_dst_set)(struct sock *sk, const struct sk_buff *skb);
         int         (*conn_request)(struct sock *sk, struct sk_buff *skb);
         struct sock *(*syn_recv_sock)(struct sock *sk, struct sk_buff *skb,
                                       struct request_sock *req,
                                       struct dst_entry *dst);
+        struct inet_peer *(*get_peer)(struct sock *sk, bool *release_it);
         u16         net_header_len;
-        u16         net_frag_header_len;
         u16         sockaddr_len;
         int         (*setsockopt)(struct sock *sk, int level, int optname, 
                                   char __user *optval, unsigned int optlen);
@@ -61,7 +60,7 @@ struct inet_connection_sock_af_ops {
 #endif
         void        (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
         int         (*bind_conflict)(const struct sock *sk,
-                                     const struct inet_bind_bucket *tb, bool relax);
+                                     const struct inet_bind_bucket *tb);
 };
 
 /** inet_connection_sock - INET connection oriented sock
@@ -144,9 +143,9 @@ static inline void *inet_csk_ca(const struct sock *sk)
         return (void *)inet_csk(sk)->icsk_ca_priv;
 }
 
-extern struct sock *inet_csk_clone_lock(const struct sock *sk,
-                                        const struct request_sock *req,
-                                        const gfp_t priority);
+extern struct sock *inet_csk_clone(struct sock *sk,
+                                   const struct request_sock *req,
+                                   const gfp_t priority);
 
 enum inet_csk_ack_state_t {
         ICSK_ACK_SCHED  = 1,
@@ -246,7 +245,7 @@ extern struct request_sock *inet_csk_search_req(const struct sock *sk,
                                                 const __be32 raddr,
                                                 const __be32 laddr);
 extern int inet_csk_bind_conflict(const struct sock *sk,
-                                  const struct inet_bind_bucket *tb, bool relax);
+                                  const struct inet_bind_bucket *tb);
 extern int inet_csk_get_port(struct sock *sk, unsigned short snum);
 
 extern struct dst_entry* inet_csk_route_req(struct sock *sk,
@@ -318,7 +317,6 @@ extern void inet_csk_reqsk_queue_prune(struct sock *parent,
                                        const unsigned long max_rto);
 
 extern void inet_csk_destroy_sock(struct sock *sk);
-extern void inet_csk_prepare_forced_close(struct sock *sk);
 
 /*
  * LISTEN is a special case for poll..
@@ -338,6 +336,4 @@ extern int inet_csk_compat_getsockopt(struct sock *sk, int level, int optname,
                                       char __user *optval, int __user *optlen);
 extern int inet_csk_compat_setsockopt(struct sock *sk, int level, int optname,
                                       char __user *optval, unsigned int optlen);
-
-extern struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu);
 #endif /* _INET_CONNECTION_SOCK_H */
diff --git a/include/net/inet_ecn.h b/include/net/inet_ecn.h
index aab73757bc4..2fa8d1341a0 100644
--- a/include/net/inet_ecn.h
+++ b/include/net/inet_ecn.h
@@ -15,8 +15,6 @@ enum {
         INET_ECN_MASK = 3,
 };
 
-extern int sysctl_tunnel_ecn_log;
-
 static inline int INET_ECN_is_ce(__u8 dsfield)
 {
         return (dsfield & INET_ECN_MASK) == INET_ECN_CE;
@@ -32,14 +30,6 @@ static inline int INET_ECN_is_capable(__u8 dsfield)
         return dsfield & INET_ECN_ECT_0;
 }
 
-/*
- * RFC 3168 9.1.1
- *  The full-functionality option for ECN encapsulation is to copy the
- *  ECN codepoint of the inside header to the outside header on
- *  encapsulation if the inside header is not-ECT or ECT, and to set the
- *  ECN codepoint of the outside header to ECT(0) if the ECN codepoint of
- *  the inside header is CE.
- */
 static inline __u8 INET_ECN_encapsulate(__u8 outer, __u8 inner)
 {
         outer &= ~INET_ECN_MASK;
@@ -147,78 +137,4 @@ static inline int INET_ECN_set_ce(struct sk_buff *skb)
         return 0;
 }
 
-/*
- * RFC 6080 4.2
- *  To decapsulate the inner header at the tunnel egress, a compliant
- *  tunnel egress MUST set the outgoing ECN field to the codepoint at the
- *  intersection of the appropriate arriving inner header (row) and outer
- *  header (column) in Figure 4
- *
- *      +---------+------------------------------------------------+
- *      |Arriving |            Arriving Outer Header               |
- *      |   Inner +---------+------------+------------+------------+
- *      |  Header | Not-ECT | ECT(0)     | ECT(1)     |     CE     |
- *      +---------+---------+------------+------------+------------+
- *      | Not-ECT | Not-ECT |Not-ECT(!!!)|Not-ECT(!!!)| <drop>(!!!)|
- *      |  ECT(0) |  ECT(0) | ECT(0)     | ECT(1)     |     CE     |
- *      |  ECT(1) |  ECT(1) | ECT(1) (!) | ECT(1)     |     CE     |
- *      |    CE   |      CE |     CE     |     CE(!!!)|     CE     |
- *      +---------+---------+------------+------------+------------+
- *
- *             Figure 4: New IP in IP Decapsulation Behaviour
- *
- *  returns 0 on success
- *          1 if something is broken and should be logged (!!! above)
- *          2 if packet should be dropped
- */
-static inline int INET_ECN_decapsulate(struct sk_buff *skb,
-                                       __u8 outer, __u8 inner)
-{
-        if (INET_ECN_is_not_ect(inner)) {
-                switch (outer & INET_ECN_MASK) {
-                case INET_ECN_NOT_ECT:
-                        return 0;
-                case INET_ECN_ECT_0:
-                case INET_ECN_ECT_1:
-                        return 1;
-                case INET_ECN_CE:
-                        return 2;
-                }
-        }
-
-        if (INET_ECN_is_ce(outer))
-                INET_ECN_set_ce(skb);
-
-        return 0;
-}
-
-static inline int IP_ECN_decapsulate(const struct iphdr *oiph,
-                                     struct sk_buff *skb)
-{
-        __u8 inner;
-
-        if (skb->protocol == htons(ETH_P_IP))
-                inner = ip_hdr(skb)->tos;
-        else if (skb->protocol == htons(ETH_P_IPV6))
-                inner = ipv6_get_dsfield(ipv6_hdr(skb));
-        else
-                return 0;
-
-        return INET_ECN_decapsulate(skb, oiph->tos, inner);
-}
-
-static inline int IP6_ECN_decapsulate(const struct ipv6hdr *oipv6h,
-                                      struct sk_buff *skb)
-{
-        __u8 inner;
-
-        if (skb->protocol == htons(ETH_P_IP))
-                inner = ip_hdr(skb)->tos;
-        else if (skb->protocol == htons(ETH_P_IPV6))
-                inner = ipv6_get_dsfield(ipv6_hdr(skb));
-        else
-                return 0;
-
-        return INET_ECN_decapsulate(skb, ipv6_get_dsfield(oipv6h), inner);
-}
 #endif
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 32786a04471..16ff29a7bb3 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -29,8 +29,6 @@ struct inet_frag_queue {
 #define INET_FRAG_COMPLETE      4
 #define INET_FRAG_FIRST_IN      2
 #define INET_FRAG_LAST_IN       1
-
-        u16                     max_size;
 };
 
 #define INETFRAGS_HASHSZ                64
@@ -48,7 +46,8 @@ struct inet_frags {
                                                 void *arg);
         void                    (*destructor)(struct inet_frag_queue *);
         void                    (*skb_free)(struct sk_buff *);
-        bool                    (*match)(struct inet_frag_queue *q, void *arg);
+        int                     (*match)(struct inet_frag_queue *q,
+                                                void *arg);
         void                    (*frag_expire)(unsigned long data);
 };
 
@@ -61,7 +60,7 @@ void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f);
 void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);
 void inet_frag_destroy(struct inet_frag_queue *q,
                                 struct inet_frags *f, int *work);
-int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f, bool force);
+int inet_frag_evictor(struct netns_frags *nf, struct inet_frags *f);
 struct inet_frag_queue *inet_frag_find(struct netns_frags *nf,
                 struct inet_frags *f, void *key, unsigned int hash)
         __releases(&f->lock);
diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index 67a8fa098e3..808fc5f76b0 100644
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -277,6 +277,7 @@ static inline struct sock *inet_lookup_listener(struct net *net,
    On 64bit targets we combine comparisons with pair of adjacent __be32
    fields in the same way.
 */
+typedef __u32 __bitwise __portpair;
 #ifdef __BIG_ENDIAN
 #define INET_COMBINED_PORTS(__sport, __dport) \
         ((__force __portpair)(((__force __u32)(__be16)(__sport) << 16) | (__u32)(__dport)))
@@ -286,6 +287,7 @@ static inline struct sock *inet_lookup_listener(struct net *net,
 #endif
 
 #if (BITS_PER_LONG == 64)
+typedef __u64 __bitwise __addrpair;
 #ifdef __BIG_ENDIAN
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr) \
         const __addrpair __name = (__force __addrpair) ( \
@@ -297,34 +299,30 @@ static inline struct sock *inet_lookup_listener(struct net *net,
                                    (((__force __u64)(__be32)(__daddr)) << 32) | \
                                    ((__force __u64)(__be32)(__saddr)));
 #endif /* __BIG_ENDIAN */
-#define INET_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif)     \
-        ((inet_sk(__sk)->inet_portpair == (__ports))            &&      \
-         (inet_sk(__sk)->inet_addrpair == (__cookie))           &&      \
-         (!(__sk)->sk_bound_dev_if      ||                              \
-           ((__sk)->sk_bound_dev_if == (__dif)))                &&      \
-         net_eq(sock_net(__sk), (__net)))
-#define INET_TW_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif)\
-        ((inet_twsk(__sk)->tw_portpair == (__ports))    &&              \
-         (inet_twsk(__sk)->tw_addrpair == (__cookie))   &&              \
-         (!(__sk)->sk_bound_dev_if      ||                              \
-           ((__sk)->sk_bound_dev_if == (__dif)))        &&              \
-         net_eq(sock_net(__sk), (__net)))
+#define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
+         ((*((__addrpair *)&(inet_sk(__sk)->inet_daddr))) == (__cookie))  &&    \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports))   &&    \
+         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
+#define INET_TW_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)\
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net)) &&    \
+         ((*((__addrpair *)&(inet_twsk(__sk)->tw_daddr))) == (__cookie)) &&     \
+         ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&      \
+         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #else /* 32-bit arch */
 #define INET_ADDR_COOKIE(__name, __saddr, __daddr)
-#define INET_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif) \
-        ((inet_sk(__sk)->inet_portpair == (__ports))    &&              \
-         (inet_sk(__sk)->inet_daddr     == (__saddr))   &&              \
-         (inet_sk(__sk)->inet_rcv_saddr == (__daddr))   &&              \
-         (!(__sk)->sk_bound_dev_if      ||                              \
-           ((__sk)->sk_bound_dev_if == (__dif)))        &&              \
-         net_eq(sock_net(__sk), (__net)))
-#define INET_TW_MATCH(__sk, __net, __cookie, __saddr, __daddr, __ports, __dif) \
-        ((inet_twsk(__sk)->tw_portpair == (__ports))    &&              \
-         (inet_twsk(__sk)->tw_daddr     == (__saddr))   &&              \
-         (inet_twsk(__sk)->tw_rcv_saddr == (__daddr))   &&              \
-         (!(__sk)->sk_bound_dev_if      ||                              \
-           ((__sk)->sk_bound_dev_if == (__dif)))        &&              \
-         net_eq(sock_net(__sk), (__net)))
+#define INET_MATCH(__sk, __net, __hash, __cookie, __saddr, __daddr, __ports, __dif)     \
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
+         (inet_sk(__sk)->inet_daddr     == (__saddr))           &&      \
+         (inet_sk(__sk)->inet_rcv_saddr == (__daddr))           &&      \
+         ((*((__portpair *)&(inet_sk(__sk)->inet_dport))) == (__ports)) &&      \
+         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
+#define INET_TW_MATCH(__sk, __net, __hash,__cookie, __saddr, __daddr, __ports, __dif)   \
+        (((__sk)->sk_hash == (__hash)) && net_eq(sock_net(__sk), (__net))       &&      \
+         (inet_twsk(__sk)->tw_daddr     == (__saddr))           &&      \
+         (inet_twsk(__sk)->tw_rcv_saddr == (__daddr))           &&      \
+         ((*((__portpair *)&(inet_twsk(__sk)->tw_dport))) == (__ports)) &&      \
+         (!((__sk)->sk_bound_dev_if) || ((__sk)->sk_bound_dev_if == (__dif))))
 #endif /* 64-bit arch */
 
 /*
@@ -381,10 +379,10 @@ static inline struct sock *__inet_lookup_skb(struct inet_hashinfo *hashinfo,
                                              const __be16 sport,
                                              const __be16 dport)
 {
-        struct sock *sk = skb_steal_sock(skb);
+        struct sock *sk;
         const struct iphdr *iph = ip_hdr(skb);
 
-        if (sk)
+        if (unlikely(sk = skb_steal_sock(skb)))
                 return sk;
         else
                 return __inet_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
diff --git a/include/net/inet_sock.h b/include/net/inet_sock.h
index a4196cbc84e..b897d6e6d0a 100644
--- a/include/net/inet_sock.h
+++ b/include/net/inet_sock.h
@@ -31,7 +31,6 @@
 /** struct ip_options - IP Options
  *
  * @faddr - Saved first hop address
- * @nexthop - Saved nexthop address in LSRR and SSRR
  * @is_data - Options in __data, rather than skb
  * @is_strictroute - Strict source route
  * @srr_is_hit - Packet destination addr was our one
@@ -42,7 +41,6 @@
  */
 struct ip_options {
         __be32          faddr;
-        __be32          nexthop;
         unsigned char   optlen;
         unsigned char   srr;
         unsigned char   rr;
@@ -71,7 +69,7 @@ struct ip_options_data {
 
 struct inet_request_sock {
         struct request_sock     req;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         u16                     inet6_rsk_offset;
 #endif
         __be16                  loc_port;
@@ -101,8 +99,10 @@ struct inet_cork {
         __be32                  addr;
         struct ip_options       *opt;
         unsigned int            fragsize;
-        int                     length; /* Total length of all frames */
         struct dst_entry        *dst;
+        int                     length; /* Total length of all frames */
+        struct page             *page;
+        u32                     off;
         u8                      tx_flags;
 };
 
@@ -130,7 +130,6 @@ struct rtable;
  * @tos - TOS
  * @mc_ttl - Multicasting TTL
  * @is_icsk - is this an inet_connection_sock?
- * @uc_index - Unicast outgoing device index
  * @mc_index - Multicast device index
  * @mc_list - Group array
  * @cork - info to build ip hdr on each ip frag while socket is corked
@@ -138,17 +137,15 @@ struct rtable;
 struct inet_sock {
         /* sk and pinet6 has to be the first two members of inet_sock */
         struct sock             sk;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct ipv6_pinfo       *pinet6;
 #endif
         /* Socket demultiplex comparisons on incoming packets. */
 #define inet_daddr              sk.__sk_common.skc_daddr
 #define inet_rcv_saddr          sk.__sk_common.skc_rcv_saddr
-#define inet_addrpair           sk.__sk_common.skc_addrpair
-#define inet_dport              sk.__sk_common.skc_dport
-#define inet_num                sk.__sk_common.skc_num
-#define inet_portpair           sk.__sk_common.skc_portpair
 
+        __be16                  inet_dport;
+        __u16                   inet_num;
         __be32                  inet_saddr;
         __s16                   uc_ttl;
         __u16                   cmsg_flags;
@@ -156,7 +153,6 @@ struct inet_sock {
         __u16                   inet_id;
 
         struct ip_options_rcu __rcu     *inet_opt;
-        int                     rx_dst_ifindex;
         __u8                    tos;
         __u8                    min_ttl;
         __u8                    mc_ttl;
@@ -169,8 +165,6 @@ struct inet_sock {
                                 transparent:1,
                                 mc_all:1,
                                 nodefrag:1;
-        __u8                    rcv_tos;
-        int                     uc_index;
         int                     mc_index;
         __be32                  mc_addr;
         struct ip_mc_socklist __rcu     *mc_list;
@@ -192,7 +186,7 @@ static inline void __inet_sk_copy_descendant(struct sock *sk_to,
         memcpy(inet_sk(sk_to) + 1, inet_sk(sk_from) + 1,
                sk_from->sk_prot->obj_size - ancestor_size);
 }
-#if !(IS_ENABLED(CONFIG_IPV6))
+#if !(defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE))
 static inline void inet_sk_copy_descendant(struct sock *sk_to,
                                            const struct sock *sk_from)
 {
@@ -246,6 +240,8 @@ static inline __u8 inet_sk_flowi_flags(const struct sock *sk)
 
         if (inet_sk(sk)->transparent || inet_sk(sk)->hdrincl)
                 flags |= FLOWI_FLAG_ANYSRC;
+        if (sk->sk_protocol == IPPROTO_TCP)
+                flags |= FLOWI_FLAG_PRECOW_METRICS;
         return flags;
 }
 
diff --git a/include/net/inet_timewait_sock.h b/include/net/inet_timewait_sock.h
index 7d658d57736..f1a770977c4 100644
--- a/include/net/inet_timewait_sock.h
+++ b/include/net/inet_timewait_sock.h
@@ -18,6 +18,7 @@
 
 #include <linux/kmemcheck.h>
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/timer.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
@@ -112,11 +113,6 @@ struct inet_timewait_sock {
 #define tw_net                  __tw_common.skc_net
 #define tw_daddr                __tw_common.skc_daddr
 #define tw_rcv_saddr            __tw_common.skc_rcv_saddr
-#define tw_addrpair             __tw_common.skc_addrpair
-#define tw_dport                __tw_common.skc_dport
-#define tw_num                  __tw_common.skc_num
-#define tw_portpair             __tw_common.skc_portpair
-
         int                     tw_timeout;
         volatile unsigned char  tw_substate;
         unsigned char           tw_rcv_wscale;
@@ -124,19 +120,19 @@ struct inet_timewait_sock {
         /* Socket demultiplex comparisons on incoming packets. */
         /* these three are in inet_sock */
         __be16                  tw_sport;
+        __be16                  tw_dport;
+        __u16                   tw_num;
         kmemcheck_bitfield_begin(flags);
         /* And these are ours. */
         unsigned int            tw_ipv6only     : 1,
                                 tw_transparent  : 1,
-                                tw_pad          : 6,    /* 6 bits hole */
-                                tw_tos          : 8,
+                                tw_pad          : 14,   /* 14 bits hole */
                                 tw_ipv6_offset  : 16;
         kmemcheck_bitfield_end(flags);
         unsigned long           tw_ttd;
         struct inet_bind_bucket *tw_tb;
         struct hlist_node       tw_death_node;
 };
-#define tw_tclass tw_tos
 
 static inline void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw,
                                       struct hlist_nulls_head *list)
@@ -221,12 +217,20 @@ extern void inet_twsk_purge(struct inet_hashinfo *hashinfo,
 static inline
 struct net *twsk_net(const struct inet_timewait_sock *twsk)
 {
-        return read_pnet(&twsk->tw_net);
+#ifdef CONFIG_NET_NS
+        return rcu_dereference_raw(twsk->tw_net); /* protected by locking, */
+                                                  /* reference counting, */
+                                                  /* initialization, or RCU. */
+#else
+        return &init_net;
+#endif
 }
 
 static inline
 void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
 {
-        write_pnet(&twsk->tw_net, net);
+#ifdef CONFIG_NET_NS
+        rcu_assign_pointer(twsk->tw_net, net);
+#endif
 }
 #endif  /* _INET_TIMEWAIT_SOCK_ */
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 53f464d7cdd..e9ff3fc5e68 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -35,20 +35,23 @@ struct inet_peer {
 
         u32                     metrics[RTAX_MAX];
         u32                     rate_tokens;    /* rate limiting for ICMP */
+        int                     redirect_genid;
         unsigned long           rate_last;
-        union {
-                struct list_head        gc_list;
-                struct rcu_head     gc_rcu;
-        };
+        unsigned long           pmtu_expires;
+        u32                     pmtu_orig;
+        u32                     pmtu_learned;
+        struct inetpeer_addr_base redirect_learned;
         /*
          * Once inet_peer is queued for deletion (refcnt == -1), following fields
-         * are not available: rid, ip_id_count
+         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
          * We can share memory with rcu_head to help keep inet_peer small.
          */
         union {
                 struct {
                         atomic_t                        rid;            /* Frag reception counter */
                         atomic_t                        ip_id_count;    /* IP ID for the next packet */
+                        __u32                           tcp_ts;
+                        __u32                           tcp_ts_stamp;
                 };
                 struct rcu_head         rcu;
                 struct inet_peer        *gc_next;
@@ -59,69 +62,6 @@ struct inet_peer {
         atomic_t                refcnt;
 };
 
-struct inet_peer_base {
-        struct inet_peer __rcu  *root;
-        seqlock_t               lock;
-        u32                     flush_seq;
-        int                     total;
-};
-
-#define INETPEER_BASE_BIT       0x1UL
-
-static inline struct inet_peer *inetpeer_ptr(unsigned long val)
-{
-        BUG_ON(val & INETPEER_BASE_BIT);
-        return (struct inet_peer *) val;
-}
-
-static inline struct inet_peer_base *inetpeer_base_ptr(unsigned long val)
-{
-        if (!(val & INETPEER_BASE_BIT))
-                return NULL;
-        val &= ~INETPEER_BASE_BIT;
-        return (struct inet_peer_base *) val;
-}
-
-static inline bool inetpeer_ptr_is_peer(unsigned long val)
-{
-        return !(val & INETPEER_BASE_BIT);
-}
-
-static inline void __inetpeer_ptr_set_peer(unsigned long *val, struct inet_peer *peer)
-{
-        /* This implicitly clears INETPEER_BASE_BIT */
-        *val = (unsigned long) peer;
-}
-
-static inline bool inetpeer_ptr_set_peer(unsigned long *ptr, struct inet_peer *peer)
-{
-        unsigned long val = (unsigned long) peer;
-        unsigned long orig = *ptr;
-
-        if (!(orig & INETPEER_BASE_BIT) ||
-            cmpxchg(ptr, orig, val) != orig)
-                return false;
-        return true;
-}
-
-static inline void inetpeer_init_ptr(unsigned long *ptr, struct inet_peer_base *base)
-{
-        *ptr = (unsigned long) base | INETPEER_BASE_BIT;
-}
-
-static inline void inetpeer_transfer_peer(unsigned long *to, unsigned long *from)
-{
-        unsigned long val = *from;
-
-        *to = val;
-        if (inetpeer_ptr_is_peer(val)) {
-                struct inet_peer *peer = inetpeer_ptr(val);
-                atomic_inc(&peer->refcnt);
-        }
-}
-
-extern void inet_peer_base_init(struct inet_peer_base *);
-
 void                    inet_initpeers(void) __init;
 
 #define INETPEER_METRICS_NEW    (~(u32) 0)
@@ -132,39 +72,30 @@ static inline bool inet_metrics_new(const struct inet_peer *p)
 }
 
 /* can be called with or without local BH being disabled */
-struct inet_peer *inet_getpeer(struct inet_peer_base *base,
-                               const struct inetpeer_addr *daddr,
-                               int create);
+struct inet_peer        *inet_getpeer(const struct inetpeer_addr *daddr, int create);
 
-static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
-                                                __be32 v4daddr,
-                                                int create)
+static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
 {
         struct inetpeer_addr daddr;
 
         daddr.addr.a4 = v4daddr;
         daddr.family = AF_INET;
-        return inet_getpeer(base, &daddr, create);
+        return inet_getpeer(&daddr, create);
 }
 
-static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
-                                                const struct in6_addr *v6daddr,
-                                                int create)
+static inline struct inet_peer *inet_getpeer_v6(const struct in6_addr *v6daddr, int create)
 {
         struct inetpeer_addr daddr;
 
-        *(struct in6_addr *)daddr.addr.a6 = *v6daddr;
+        ipv6_addr_copy((struct in6_addr *)daddr.addr.a6, v6daddr);
         daddr.family = AF_INET6;
-        return inet_getpeer(base, &daddr, create);
+        return inet_getpeer(&daddr, create);
 }
 
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
 extern bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
 
-extern void inetpeer_invalidate_tree(struct inet_peer_base *);
-extern void inetpeer_invalidate_family(int family);
-
 /*
  * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,
  * tcp_ts_stamp if no refcount is taken on inet_peer
diff --git a/include/net/ip.h b/include/net/ip.h
index 0707fb9551a..aa76c7a4d9c 100644
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -42,8 +42,6 @@ struct inet_skb_parm {
 #define IPSKB_XFRM_TRANSFORMED  4
 #define IPSKB_FRAG_COMPLETE     8
 #define IPSKB_REROUTED          16
-
-        u16                     frag_max_size;
 };
 
 static inline unsigned int ip_hdrlen(const struct sk_buff *skb)
@@ -122,7 +120,7 @@ extern struct sk_buff  *__ip_make_skb(struct sock *sk,
                                       struct flowi4 *fl4,
                                       struct sk_buff_head *queue,
                                       struct inet_cork *cork);
-extern int              ip_send_skb(struct net *net, struct sk_buff *skb);
+extern int              ip_send_skb(struct sk_buff *skb);
 extern int              ip_push_pending_frames(struct sock *sk, struct flowi4 *fl4);
 extern void             ip_flush_pending_frames(struct sock *sk);
 extern struct sk_buff  *ip_make_skb(struct sock *sk,
@@ -143,6 +141,23 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)
 extern int              ip4_datagram_connect(struct sock *sk, 
                                              struct sockaddr *uaddr, int addr_len);
 
+/*
+ *      Map a multicast IP onto multicast MAC for type Token Ring.
+ *      This conforms to RFC1469 Option 2 Multicasting i.e.
+ *      using a functional address to transmit / receive 
+ *      multicast packets.
+ */
+
+static inline void ip_tr_mc_map(__be32 addr, char *buf)
+{
+        buf[0]=0xC0;
+        buf[1]=0x00;
+        buf[2]=0x00;
+        buf[3]=0x04;
+        buf[4]=0x00;
+        buf[5]=0x00;
+}
+
 struct ip_reply_arg {
         struct kvec iov[1];   
         int         flags;
@@ -150,7 +165,6 @@ struct ip_reply_arg {
         int         csumoffset; /* u16 offset of csum in iov[0].iov_base */
                                 /* -1 if not needed */ 
         int         bound_dev_if;
-        u8          tos;
 }; 
 
 #define IP_REPLY_ARG_NOSRCCHECK 1
@@ -160,9 +174,8 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
         return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0;
 }
 
-void ip_send_unicast_reply(struct net *net, struct sk_buff *skb, __be32 daddr,
-                           __be32 saddr, const struct ip_reply_arg *arg,
-                           unsigned int len);
+void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
+                   struct ip_reply_arg *arg, unsigned int len);
 
 struct ipv4_config {
         int     log_martians;
@@ -208,14 +221,14 @@ static inline int inet_is_reserved_local_port(int port)
 
 extern int sysctl_ip_nonlocal_bind;
 
+extern struct ctl_path net_core_path[];
+extern struct ctl_path net_ipv4_ctl_path[];
+
 /* From inetpeer.c */
 extern int inet_peer_threshold;
 extern int inet_peer_minttl;
 extern int inet_peer_maxttl;
 
-/* From ip_input.c */
-extern int sysctl_ip_early_demux;
-
 /* From ip_output.c */
 extern int sysctl_ip_dynaddr;
 
@@ -339,14 +352,14 @@ static inline void ip_ipgre_mc_map(__be32 naddr, const unsigned char *broadcast,
                 memcpy(buf, &naddr, sizeof(naddr));
 }
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 #include <linux/ipv6.h>
 #endif
 
 static __inline__ void inet_reset_saddr(struct sock *sk)
 {
         inet_sk(sk)->inet_rcv_saddr = inet_sk(sk)->inet_saddr = 0;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         if (sk->sk_family == PF_INET6) {
                 struct ipv6_pinfo *np = inet6_sk(sk);
 
@@ -365,7 +378,7 @@ static inline int sk_mc_loop(struct sock *sk)
         switch (sk->sk_family) {
         case AF_INET:
                 return inet_sk(sk)->mc_loop;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         case AF_INET6:
                 return inet6_sk(sk)->mc_loop;
 #endif
@@ -374,7 +387,7 @@ static inline int sk_mc_loop(struct sock *sk)
         return 1;
 }
 
-extern bool ip_call_ra_chain(struct sk_buff *skb);
+extern int      ip_call_ra_chain(struct sk_buff *skb);
 
 /*
  *      Functions provided by ip_fragment.c
@@ -393,18 +406,9 @@ enum ip_defrag_users {
         IP_DEFRAG_VS_OUT,
         IP_DEFRAG_VS_FWD,
         IP_DEFRAG_AF_PACKET,
-        IP_DEFRAG_MACVLAN,
 };
 
 int ip_defrag(struct sk_buff *skb, u32 user);
-#ifdef CONFIG_INET
-struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user);
-#else
-static inline struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user)
-{
-        return skb;
-}
-#endif
 int ip_frag_mem(struct net *net);
 int ip_frag_nqueues(struct net *net);
 
@@ -436,7 +440,7 @@ extern int ip_options_rcv_srr(struct sk_buff *skb);
  *      Functions provided by ip_sockglue.c
  */
 
-extern void     ipv4_pktinfo_prepare(struct sk_buff *skb);
+extern int      ip_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 extern void     ip_cmsg_recv(struct msghdr *msg, struct sk_buff *skb);
 extern int      ip_cmsg_send(struct net *net,
                              struct msghdr *msg, struct ipcm_cookie *ipc);
diff --git a/include/net/ip6_checksum.h b/include/net/ip6_checksum.h
index 652d3d30935..bc1b0fda2b0 100644
--- a/include/net/ip6_checksum.h
+++ b/include/net/ip6_checksum.h
@@ -31,8 +31,6 @@
 #include <net/ip.h>
 #include <asm/checksum.h>
 #include <linux/in6.h>
-#include <linux/tcp.h>
-#include <linux/ipv6.h>
 
 #ifndef _HAVE_ARCH_IPV6_CSUM
 
@@ -93,37 +91,4 @@ static __inline__ __sum16 csum_ipv6_magic(const struct in6_addr *saddr,
 }
 
 #endif
-
-static __inline__ __sum16 tcp_v6_check(int len,
-                                   const struct in6_addr *saddr,
-                                   const struct in6_addr *daddr,
-                                   __wsum base)
-{
-        return csum_ipv6_magic(saddr, daddr, len, IPPROTO_TCP, base);
-}
-
-static inline void __tcp_v6_send_check(struct sk_buff *skb,
-                                       const struct in6_addr *saddr,
-                                       const struct in6_addr *daddr)
-{
-        struct tcphdr *th = tcp_hdr(skb);
-
-        if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                th->check = ~tcp_v6_check(skb->len, saddr, daddr, 0);
-                skb->csum_start = skb_transport_header(skb) - skb->head;
-                skb->csum_offset = offsetof(struct tcphdr, check);
-        } else {
-                th->check = tcp_v6_check(skb->len, saddr, daddr,
-                                         csum_partial(th, th->doff << 2,
-                                                      skb->csum));
-        }
-}
-
-static inline void tcp_v6_send_check(struct sock *sk, struct sk_buff *skb)
-{
-        struct ipv6_pinfo *np = inet6_sk(sk);
-
-        __tcp_v6_send_check(skb, &np->saddr, &np->daddr);
-}
-
 #endif
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index fdc48a94a06..5735a0f979c 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -37,7 +37,6 @@ struct fib6_config {
         int             fc_ifindex;
         u32             fc_flags;
         u32             fc_protocol;
-        u32             fc_type;        /* only 8 bits are used */
 
         struct in6_addr fc_dst;
         struct in6_addr fc_src;
@@ -47,8 +46,6 @@ struct fib6_config {
         unsigned long   fc_expires;
         struct nlattr   *fc_mx;
         int             fc_mx_len;
-        int             fc_mp_len;
-        struct nlattr   *fc_mp;
 
         struct nl_info  fc_nlinfo;
 };
@@ -89,7 +86,8 @@ struct fib6_table;
 struct rt6_info {
         struct dst_entry                dst;
 
-        struct neighbour                *n;
+#define rt6i_dev                        dst.dev
+#define rt6i_expires                    dst.expires
 
         /*
          * Tail elements of dst_entry (__refcnt etc.)
@@ -101,14 +99,6 @@ struct rt6_info {
 
         struct in6_addr                 rt6i_gateway;
 
-        /* Multipath routes:
-         * siblings is a list of rt6_info that have the the same metric/weight,
-         * destination, but not the same gateway. nsiblings is just a cache
-         * to speed up lookup.
-         */
-        struct list_head                rt6i_siblings;
-        unsigned int                    rt6i_nsiblings;
-
         atomic_t                        rt6i_ref;
 
         /* These are in a separate cache line. */
@@ -117,110 +107,25 @@ struct rt6_info {
         struct rt6key                   rt6i_src;
         struct rt6key                   rt6i_prefsrc;
         u32                             rt6i_metric;
+        u32                             rt6i_peer_genid;
 
         struct inet6_dev                *rt6i_idev;
-        unsigned long                   _rt6i_peer;
-
-        u32                             rt6i_genid;
+        struct inet_peer                *rt6i_peer;
 
+#ifdef CONFIG_XFRM
+        u32                             rt6i_flow_cache_genid;
+#endif
         /* more non-fragment space at head required */
         unsigned short                  rt6i_nfheader_len;
 
         u8                              rt6i_protocol;
 };
 
-static inline struct inet_peer *rt6_peer_ptr(struct rt6_info *rt)
-{
-        return inetpeer_ptr(rt->_rt6i_peer);
-}
-
-static inline bool rt6_has_peer(struct rt6_info *rt)
-{
-        return inetpeer_ptr_is_peer(rt->_rt6i_peer);
-}
-
-static inline void __rt6_set_peer(struct rt6_info *rt, struct inet_peer *peer)
-{
-        __inetpeer_ptr_set_peer(&rt->_rt6i_peer, peer);
-}
-
-static inline bool rt6_set_peer(struct rt6_info *rt, struct inet_peer *peer)
-{
-        return inetpeer_ptr_set_peer(&rt->_rt6i_peer, peer);
-}
-
-static inline void rt6_init_peer(struct rt6_info *rt, struct inet_peer_base *base)
-{
-        inetpeer_init_ptr(&rt->_rt6i_peer, base);
-}
-
-static inline void rt6_transfer_peer(struct rt6_info *rt, struct rt6_info *ort)
-{
-        inetpeer_transfer_peer(&rt->_rt6i_peer, &ort->_rt6i_peer);
-}
-
 static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
 {
         return ((struct rt6_info *)dst)->rt6i_idev;
 }
 
-static inline void rt6_clean_expires(struct rt6_info *rt)
-{
-        if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from)
-                dst_release(rt->dst.from);
-
-        rt->rt6i_flags &= ~RTF_EXPIRES;
-        rt->dst.from = NULL;
-}
-
-static inline void rt6_set_expires(struct rt6_info *rt, unsigned long expires)
-{
-        if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from)
-                dst_release(rt->dst.from);
-
-        rt->rt6i_flags |= RTF_EXPIRES;
-        rt->dst.expires = expires;
-}
-
-static inline void rt6_update_expires(struct rt6_info *rt, int timeout)
-{
-        if (!(rt->rt6i_flags & RTF_EXPIRES)) {
-                if (rt->dst.from)
-                        dst_release(rt->dst.from);
-                /* dst_set_expires relies on expires == 0 
-                 * if it has not been set previously.
-                 */
-                rt->dst.expires = 0;
-        }
-
-        dst_set_expires(&rt->dst, timeout);
-        rt->rt6i_flags |= RTF_EXPIRES;
-}
-
-static inline void rt6_set_from(struct rt6_info *rt, struct rt6_info *from)
-{
-        struct dst_entry *new = (struct dst_entry *) from;
-
-        if (!(rt->rt6i_flags & RTF_EXPIRES) && rt->dst.from) {
-                if (new == rt->dst.from)
-                        return;
-                dst_release(rt->dst.from);
-        }
-
-        rt->rt6i_flags &= ~RTF_EXPIRES;
-        rt->dst.from = new;
-        dst_hold(new);
-}
-
-static inline void ip6_rt_put(struct rt6_info *rt)
-{
-        /* dst_release() accepts a NULL parameter.
-         * We rely on dst being first structure in struct rt6_info
-         */
-        BUILD_BUG_ON(offsetof(struct rt6_info, dst) != 0);
-        dst_release(&rt->dst);
-}
-
 struct fib6_walker_t {
         struct list_head lh;
         struct fib6_node *root, *node;
@@ -257,7 +162,6 @@ struct fib6_table {
         u32                     tb6_id;
         rwlock_t                tb6_lock;
         struct fib6_node        tb6_root;
-        struct inet_peer_base   tb6_peers;
 };
 
 #define RT6_TABLE_UNSPEC        RT_TABLE_UNSPEC
@@ -298,10 +202,6 @@ struct fib6_node		*fib6_locate(struct fib6_node *root,
                                              const struct in6_addr *daddr, int dst_len,
                                              const struct in6_addr *saddr, int src_len);
 
-extern void                     fib6_clean_all_ro(struct net *net,
-                                               int (*func)(struct rt6_info *, void *arg),
-                                               int prune, void *arg);
-
 extern void                     fib6_clean_all(struct net *net,
                                                int (*func)(struct rt6_info *, void *arg),
                                                int prune, void *arg);
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h
index 27d83183e61..5e91b72fc71 100644
--- a/include/net/ip6_route.h
+++ b/include/net/ip6_route.h
@@ -1,6 +1,9 @@
 #ifndef _NET_IP6_ROUTE_H
 #define _NET_IP6_ROUTE_H
 
+#define IP6_RT_PRIO_USER        1024
+#define IP6_RT_PRIO_ADDRCONF    256
+
 struct route_info {
         __u8                    type;
         __u8                    length;
@@ -50,25 +53,16 @@ static inline unsigned int rt6_flags2srcprefs(int flags)
         return (flags >> 3) & 7;
 }
 
-extern void rt6_bind_peer(struct rt6_info *rt, int create);
-
-static inline struct inet_peer *__rt6_get_peer(struct rt6_info *rt, int create)
-{
-        if (rt6_has_peer(rt))
-                return rt6_peer_ptr(rt);
-
-        rt6_bind_peer(rt, create);
-        return (rt6_has_peer(rt) ? rt6_peer_ptr(rt) : NULL);
-}
+extern void                     rt6_bind_peer(struct rt6_info *rt,
+                                              int create);
 
 static inline struct inet_peer *rt6_get_peer(struct rt6_info *rt)
 {
-        return __rt6_get_peer(rt, 0);
-}
+        if (rt->rt6i_peer)
+                return rt->rt6i_peer;
 
-static inline struct inet_peer *rt6_get_peer_create(struct rt6_info *rt)
-{
-        return __rt6_get_peer(rt, 1);
+        rt6_bind_peer(rt, 0);
+        return rt->rt6i_peer;
 }
 
 extern void                     ip6_route_input(struct sk_buff *skb);
@@ -76,8 +70,6 @@ extern void			ip6_route_input(struct sk_buff *skb);
 extern struct dst_entry *       ip6_route_output(struct net *net,
                                                  const struct sock *sk,
                                                  struct flowi6 *fl6);
-extern struct dst_entry *       ip6_route_lookup(struct net *net,
-                                                 struct flowi6 *fl6, int flags);
 
 extern int                      ip6_route_init(void);
 extern void                     ip6_route_cleanup(void);
@@ -103,14 +95,14 @@ extern struct rt6_info		*rt6_lookup(struct net *net,
 
 extern struct dst_entry *icmp6_dst_alloc(struct net_device *dev,
                                          struct neighbour *neigh,
-                                         struct flowi6 *fl6);
+                                         const struct in6_addr *addr);
 extern int icmp6_dst_gc(void);
 
 extern void fib6_force_start_gc(struct net *net);
 
 extern struct rt6_info *addrconf_dst_alloc(struct inet6_dev *idev,
                                            const struct in6_addr *addr,
-                                           bool anycast);
+                                           int anycast);
 
 extern int                      ip6_dst_hoplimit(struct dst_entry *dst);
 
@@ -130,12 +122,17 @@ extern int			rt6_route_rcv(struct net_device *dev,
                                               u8 *opt, int len,
                                               const struct in6_addr *gwaddr);
 
-extern void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu,
-                            int oif, u32 mark);
-extern void ip6_sk_update_pmtu(struct sk_buff *skb, struct sock *sk,
-                               __be32 mtu);
-extern void ip6_redirect(struct sk_buff *skb, struct net *net, int oif, u32 mark);
-extern void ip6_sk_redirect(struct sk_buff *skb, struct sock *sk);
+extern void                     rt6_redirect(const struct in6_addr *dest,
+                                             const struct in6_addr *src,
+                                             const struct in6_addr *saddr,
+                                             struct neighbour *neigh,
+                                             u8 *lladdr,
+                                             int on_link);
+
+extern void                     rt6_pmtu_discovery(const struct in6_addr *daddr,
+                                                   const struct in6_addr *saddr,
+                                                   struct net_device *dev,
+                                                   u32 pmtu);
 
 struct netlink_callback;
 
@@ -147,7 +144,7 @@ struct rt6_rtnl_dump_arg {
 
 extern int rt6_dump_route(struct rt6_info *rt, void *p_arg);
 extern void rt6_ifdown(struct net *net, struct net_device *dev);
-extern void rt6_mtu_change(struct net_device *dev, unsigned int mtu);
+extern void rt6_mtu_change(struct net_device *dev, unsigned mtu);
 extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
 
 
@@ -155,8 +152,7 @@ extern void rt6_remove_prefsrc(struct inet6_ifaddr *ifp);
  *      Store a destination cache entry in a socket
  */
 static inline void __ip6_dst_store(struct sock *sk, struct dst_entry *dst,
-                                   const struct in6_addr *daddr,
-                                   const struct in6_addr *saddr)
+                                   struct in6_addr *daddr, struct in6_addr *saddr)
 {
         struct ipv6_pinfo *np = inet6_sk(sk);
         struct rt6_info *rt = (struct rt6_info *) dst;
@@ -177,7 +173,7 @@ static inline void ip6_dst_store(struct sock *sk, struct dst_entry *dst,
         spin_unlock(&sk->sk_dst_lock);
 }
 
-static inline bool ipv6_unicast_destination(const struct sk_buff *skb)
+static inline int ipv6_unicast_destination(struct sk_buff *skb)
 {
         struct rt6_info *rt = (struct rt6_info *) skb_dst(skb);
 
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index e03047f7090..fc73e667b50 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -5,49 +5,20 @@
 #include <linux/netdevice.h>
 #include <linux/ip6_tunnel.h>
 
-#define IP6TUNNEL_ERR_TIMEO (30*HZ)
-
 /* capable of sending packets */
 #define IP6_TNL_F_CAP_XMIT 0x10000
 /* capable of receiving packets */
 #define IP6_TNL_F_CAP_RCV 0x20000
-/* determine capability on a per-packet basis */
-#define IP6_TNL_F_CAP_PER_PACKET 0x40000
-
-struct __ip6_tnl_parm {
-        char name[IFNAMSIZ];    /* name of tunnel device */
-        int link;               /* ifindex of underlying L2 interface */
-        __u8 proto;             /* tunnel protocol */
-        __u8 encap_limit;       /* encapsulation limit for tunnel */
-        __u8 hop_limit;         /* hop limit for tunnel */
-        __be32 flowinfo;        /* traffic class and flowlabel for tunnel */
-        __u32 flags;            /* tunnel flags */
-        struct in6_addr laddr;  /* local tunnel end-point address */
-        struct in6_addr raddr;  /* remote tunnel end-point address */
-
-        __be16                  i_flags;
-        __be16                  o_flags;
-        __be32                  i_key;
-        __be32                  o_key;
-};
 
 /* IPv6 tunnel */
+
 struct ip6_tnl {
         struct ip6_tnl __rcu *next;     /* next tunnel in list */
         struct net_device *dev; /* virtual device associated with tunnel */
-        struct __ip6_tnl_parm parms;    /* tunnel configuration parameters */
+        struct ip6_tnl_parm parms;      /* tunnel configuration parameters */
         struct flowi fl;        /* flowi template for xmit */
         struct dst_entry *dst_cache;    /* cached dst */
         u32 dst_cookie;
-
-        int err_count;
-        unsigned long err_time;
-
-        /* These fields used only by GRE */
-        __u32 i_seqno;  /* The last seen seqno  */
-        __u32 o_seqno;  /* The last output seqno */
-        int hlen;       /* Precalculated GRE header length */
-        int mlink;
 };
 
 /* Tunnel encapsulation limit destination sub-option */
@@ -58,14 +29,4 @@ struct ipv6_tlv_tnl_enc_lim {
         __u8 encap_limit;       /* tunnel encapsulation limit   */
 } __packed;
 
-struct dst_entry *ip6_tnl_dst_check(struct ip6_tnl *t);
-void ip6_tnl_dst_reset(struct ip6_tnl *t);
-void ip6_tnl_dst_store(struct ip6_tnl *t, struct dst_entry *dst);
-int ip6_tnl_rcv_ctl(struct ip6_tnl *t, const struct in6_addr *laddr,
-                const struct in6_addr *raddr);
-int ip6_tnl_xmit_ctl(struct ip6_tnl *t);
-__u16 ip6_tnl_parse_tlv_enc_lim(struct sk_buff *skb, __u8 *raw);
-__u32 ip6_tnl_get_cap(struct ip6_tnl *t, const struct in6_addr *laddr,
-                             const struct in6_addr *raddr);
-
 #endif
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 9497be1ad4c..10422ef14e2 100644
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -18,10 +18,7 @@
 
 #include <net/flow.h>
 #include <linux/seq_file.h>
-#include <linux/rcupdate.h>
 #include <net/fib_rules.h>
-#include <net/inetpeer.h>
-#include <linux/percpu.h>
 
 struct fib_config {
         u8                      fc_dst_len;
@@ -47,30 +44,12 @@ struct fib_config {
  };
 
 struct fib_info;
-struct rtable;
-
-struct fib_nh_exception {
-        struct fib_nh_exception __rcu   *fnhe_next;
-        __be32                          fnhe_daddr;
-        u32                             fnhe_pmtu;
-        __be32                          fnhe_gw;
-        unsigned long                   fnhe_expires;
-        struct rtable __rcu             *fnhe_rth;
-        unsigned long                   fnhe_stamp;
-};
-
-struct fnhe_hash_bucket {
-        struct fib_nh_exception __rcu   *chain;
-};
-
-#define FNHE_HASH_SIZE          2048
-#define FNHE_RECLAIM_DEPTH      5
 
 struct fib_nh {
         struct net_device       *nh_dev;
         struct hlist_node       nh_hash;
         struct fib_info         *nh_parent;
-        unsigned int            nh_flags;
+        unsigned                nh_flags;
         unsigned char           nh_scope;
 #ifdef CONFIG_IP_ROUTE_MULTIPATH
         int                     nh_weight;
@@ -83,9 +62,6 @@ struct fib_nh {
         __be32                  nh_gw;
         __be32                  nh_saddr;
         int                     nh_saddr_genid;
-        struct rtable __rcu * __percpu *nh_pcpu_rth_output;
-        struct rtable __rcu     *nh_rth_input;
-        struct fnhe_hash_bucket *nh_exceptions;
 };
 
 /*
@@ -98,11 +74,10 @@ struct fib_info {
         struct net              *fib_net;
         int                     fib_treeref;
         atomic_t                fib_clntref;
-        unsigned int            fib_flags;
+        unsigned                fib_flags;
         unsigned char           fib_dead;
         unsigned char           fib_protocol;
         unsigned char           fib_scope;
-        unsigned char           fib_type;
         __be32                  fib_prefsrc;
         u32                     fib_priority;
         u32                     *fib_metrics;
@@ -130,10 +105,12 @@ struct fib_result {
         unsigned char   nh_sel;
         unsigned char   type;
         unsigned char   scope;
-        u32             tclassid;
         struct fib_info *fi;
         struct fib_table *table;
         struct list_head *fa_head;
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+        struct fib_rule *r;
+#endif
 };
 
 struct fib_result_nl {
@@ -180,11 +157,11 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
                                          FIB_RES_SADDR(net, res))
 
 struct fib_table {
-        struct hlist_node       tb_hlist;
-        u32                     tb_id;
-        int                     tb_default;
-        int                     tb_num_default;
-        unsigned long           tb_data[0];
+        struct hlist_node tb_hlist;
+        u32             tb_id;
+        int             tb_default;
+        int             tb_num_default;
+        unsigned long   tb_data[0];
 };
 
 extern int fib_table_lookup(struct fib_table *tb, const struct flowi4 *flp,
@@ -237,55 +214,24 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp,
 extern int __net_init fib4_rules_init(struct net *net);
 extern void __net_exit fib4_rules_exit(struct net *net);
 
-extern struct fib_table *fib_new_table(struct net *net, u32 id);
-extern struct fib_table *fib_get_table(struct net *net, u32 id);
+#ifdef CONFIG_IP_ROUTE_CLASSID
+extern u32 fib_rules_tclass(const struct fib_result *res);
+#endif
 
-extern int __fib_lookup(struct net *net, struct flowi4 *flp,
-                        struct fib_result *res);
+extern int fib_lookup(struct net *n, struct flowi4 *flp, struct fib_result *res);
 
-static inline int fib_lookup(struct net *net, struct flowi4 *flp,
-                             struct fib_result *res)
-{
-        if (!net->ipv4.fib_has_custom_rules) {
-                res->tclassid = 0;
-                if (net->ipv4.fib_local &&
-                    !fib_table_lookup(net->ipv4.fib_local, flp, res,
-                                      FIB_LOOKUP_NOREF))
-                        return 0;
-                if (net->ipv4.fib_main &&
-                    !fib_table_lookup(net->ipv4.fib_main, flp, res,
-                                      FIB_LOOKUP_NOREF))
-                        return 0;
-                if (net->ipv4.fib_default &&
-                    !fib_table_lookup(net->ipv4.fib_default, flp, res,
-                                      FIB_LOOKUP_NOREF))
-                        return 0;
-                return -ENETUNREACH;
-        }
-        return __fib_lookup(net, flp, res);
-}
+extern struct fib_table *fib_new_table(struct net *net, u32 id);
+extern struct fib_table *fib_get_table(struct net *net, u32 id);
 
 #endif /* CONFIG_IP_MULTIPLE_TABLES */
 
 /* Exported by fib_frontend.c */
 extern const struct nla_policy rtm_ipv4_policy[];
 extern void             ip_fib_init(void);
-extern __be32 fib_compute_spec_dst(struct sk_buff *skb);
 extern int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
                                u8 tos, int oif, struct net_device *dev,
-                               struct in_device *idev, u32 *itag);
+                               __be32 *spec_dst, u32 *itag);
 extern void fib_select_default(struct fib_result *res);
-#ifdef CONFIG_IP_ROUTE_CLASSID
-static inline int fib_num_tclassid_users(struct net *net)
-{
-        return net->ipv4.fib_num_tclassid_users;
-}
-#else
-static inline int fib_num_tclassid_users(struct net *net)
-{
-        return 0;
-}
-#endif
 
 /* Exported by fib_semantics.c */
 extern int ip_fib_check_default(__be32 gw, struct net_device *dev);
@@ -307,7 +253,7 @@ static inline void fib_combine_itag(u32 *itag, const struct fib_result *res)
 #endif
         *itag = FIB_RES_NH(*res).nh_tclassid<<16;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
-        rtag = res->tclassid;
+        rtag = fib_rules_tclass(res);
         if (*itag == 0)
                 *itag = (rtag<<16);
         *itag |= (rtag>>16);
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 68c69d54d39..8fa4430f99c 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -10,22 +10,19 @@
 
 #include <asm/types.h>                  /* for __uXX types */
 
+#include <linux/sysctl.h>               /* for ctl_path */
 #include <linux/list.h>                 /* for struct list_head */
 #include <linux/spinlock.h>             /* for struct rwlock_t */
 #include <linux/atomic.h>                 /* for struct atomic_t */
 #include <linux/compiler.h>
 #include <linux/timer.h>
-#include <linux/bug.h>
 
 #include <net/checksum.h>
 #include <linux/netfilter.h>            /* for union nf_inet_addr */
 #include <linux/ip.h>
 #include <linux/ipv6.h>                 /* for struct ipv6hdr */
-#include <net/ipv6.h>
-#if IS_ENABLED(CONFIG_IP_VS_IPV6)
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#endif
-#if IS_ENABLED(CONFIG_NF_CONNTRACK)
+#include <net/ipv6.h>                   /* for ipv6_addr_copy */
+#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
 #include <net/netfilter/nf_conntrack.h>
 #endif
 #include <net/net_namespace.h>          /* Netw namespace */
@@ -106,117 +103,30 @@ static inline struct net *seq_file_single_net(struct seq_file *seq)
 /* Connections' size value needed by ip_vs_ctl.c */
 extern int ip_vs_conn_tab_size;
 
+
 struct ip_vs_iphdr {
-        __u32 len;      /* IPv4 simply where L4 starts
-                           IPv6 where L4 Transport Header starts */
-        __u32 thoff_reasm; /* Transport Header Offset in nfct_reasm skb */
-        __u16 fragoffs; /* IPv6 fragment offset, 0 if first frag (or not frag)*/
-        __s16 protocol;
-        __s32 flags;
+        int len;
+        __u8 protocol;
         union nf_inet_addr saddr;
         union nf_inet_addr daddr;
 };
 
-/* Dependency to module: nf_defrag_ipv6 */
-#if defined(CONFIG_NF_DEFRAG_IPV6) || defined(CONFIG_NF_DEFRAG_IPV6_MODULE)
-static inline struct sk_buff *skb_nfct_reasm(const struct sk_buff *skb)
-{
-        return skb->nfct_reasm;
-}
-static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset,
-                                      int len, void *buffer,
-                                      const struct ip_vs_iphdr *ipvsh)
-{
-        if (unlikely(ipvsh->fragoffs && skb_nfct_reasm(skb)))
-                return skb_header_pointer(skb_nfct_reasm(skb),
-                                          ipvsh->thoff_reasm, len, buffer);
-
-        return skb_header_pointer(skb, offset, len, buffer);
-}
-#else
-static inline struct sk_buff *skb_nfct_reasm(const struct sk_buff *skb)
-{
-        return NULL;
-}
-static inline void *frag_safe_skb_hp(const struct sk_buff *skb, int offset,
-                                      int len, void *buffer,
-                                      const struct ip_vs_iphdr *ipvsh)
-{
-        return skb_header_pointer(skb, offset, len, buffer);
-}
-#endif
-
 static inline void
-ip_vs_fill_ip4hdr(const void *nh, struct ip_vs_iphdr *iphdr)
-{
-        const struct iphdr *iph = nh;
-
-        iphdr->len      = iph->ihl * 4;
-        iphdr->fragoffs = 0;
-        iphdr->protocol = iph->protocol;
-        iphdr->saddr.ip = iph->saddr;
-        iphdr->daddr.ip = iph->daddr;
-}
-
-/* This function handles filling *ip_vs_iphdr, both for IPv4 and IPv6.
- * IPv6 requires some extra work, as finding proper header position,
- * depend on the IPv6 extension headers.
- */
-static inline void
-ip_vs_fill_iph_skb(int af, const struct sk_buff *skb, struct ip_vs_iphdr *iphdr)
+ip_vs_fill_iphdr(int af, const void *nh, struct ip_vs_iphdr *iphdr)
 {
 #ifdef CONFIG_IP_VS_IPV6
         if (af == AF_INET6) {
-                const struct ipv6hdr *iph =
-                        (struct ipv6hdr *)skb_network_header(skb);
-                iphdr->saddr.in6 = iph->saddr;
-                iphdr->daddr.in6 = iph->daddr;
-                /* ipv6_find_hdr() updates len, flags, thoff_reasm */
-                iphdr->thoff_reasm = 0;
-                iphdr->len       = 0;
-                iphdr->flags     = 0;
-                iphdr->protocol  = ipv6_find_hdr(skb, &iphdr->len, -1,
-                                                 &iphdr->fragoffs,
-                                                 &iphdr->flags);
-                /* get proto from re-assembled packet and it's offset */
-                if (skb_nfct_reasm(skb))
-                        iphdr->protocol = ipv6_find_hdr(skb_nfct_reasm(skb),
-                                                        &iphdr->thoff_reasm,
-                                                        -1, NULL, NULL);
-
+                const struct ipv6hdr *iph = nh;
+                iphdr->len = sizeof(struct ipv6hdr);
+                iphdr->protocol = iph->nexthdr;
+                ipv6_addr_copy(&iphdr->saddr.in6, &iph->saddr);
+                ipv6_addr_copy(&iphdr->daddr.in6, &iph->daddr);
         } else
 #endif
         {
-                const struct iphdr *iph =
-                        (struct iphdr *)skb_network_header(skb);
-                iphdr->len      = iph->ihl * 4;
-                iphdr->fragoffs = 0;
-                iphdr->protocol = iph->protocol;
-                iphdr->saddr.ip = iph->saddr;
-                iphdr->daddr.ip = iph->daddr;
-        }
-}
-
-/* This function is a faster version of ip_vs_fill_iph_skb().
- * Where we only populate {s,d}addr (and avoid calling ipv6_find_hdr()).
- * This is used by the some of the ip_vs_*_schedule() functions.
- * (Mostly done to avoid ABI breakage of external schedulers)
- */
-static inline void
-ip_vs_fill_iph_addr_only(int af, const struct sk_buff *skb,
-                         struct ip_vs_iphdr *iphdr)
-{
-#ifdef CONFIG_IP_VS_IPV6
-        if (af == AF_INET6) {
-                const struct ipv6hdr *iph =
-                        (struct ipv6hdr *)skb_network_header(skb);
-                iphdr->saddr.in6 = iph->saddr;
-                iphdr->daddr.in6 = iph->daddr;
-        } else
-#endif
-        {
-                const struct iphdr *iph =
-                        (struct iphdr *)skb_network_header(skb);
+                const struct iphdr *iph = nh;
+                iphdr->len = iph->ihl * 4;
+                iphdr->protocol = iph->protocol;
                 iphdr->saddr.ip = iph->saddr;
                 iphdr->daddr.ip = iph->daddr;
         }
@@ -227,7 +137,7 @@ static inline void ip_vs_addr_copy(int af, union nf_inet_addr *dst,
 {
 #ifdef CONFIG_IP_VS_IPV6
         if (af == AF_INET6)
-                dst->in6 = src->in6;
+                ipv6_addr_copy(&dst->in6, &src->in6);
         else
 #endif
         dst->ip = src->ip;
@@ -255,7 +165,7 @@ 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, "[%pI6c]",
+                len = snprintf(&buf[*idx], buf_len - *idx, "[%pI6]",
                                &addr->in6) + 1;
         else
 #endif
@@ -482,41 +392,42 @@ struct ip_vs_protocol {
 
         void (*exit)(struct ip_vs_protocol *pp);
 
-        int (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);
+        void (*init_netns)(struct net *net, struct ip_vs_proto_data *pd);
 
         void (*exit_netns)(struct net *net, struct ip_vs_proto_data *pd);
 
         int (*conn_schedule)(int af, struct sk_buff *skb,
                              struct ip_vs_proto_data *pd,
-                             int *verdict, struct ip_vs_conn **cpp,
-                             struct ip_vs_iphdr *iph);
+                             int *verdict, struct ip_vs_conn **cpp);
 
         struct ip_vs_conn *
         (*conn_in_get)(int af,
                        const struct sk_buff *skb,
                        const struct ip_vs_iphdr *iph,
+                       unsigned int proto_off,
                        int inverse);
 
         struct ip_vs_conn *
         (*conn_out_get)(int af,
                         const struct sk_buff *skb,
                         const struct ip_vs_iphdr *iph,
+                        unsigned int proto_off,
                         int inverse);
 
-        int (*snat_handler)(struct sk_buff *skb, struct ip_vs_protocol *pp,
-                            struct ip_vs_conn *cp, struct ip_vs_iphdr *iph);
+        int (*snat_handler)(struct sk_buff *skb,
+                            struct ip_vs_protocol *pp, struct ip_vs_conn *cp);
 
-        int (*dnat_handler)(struct sk_buff *skb, struct ip_vs_protocol *pp,
-                            struct ip_vs_conn *cp, struct ip_vs_iphdr *iph);
+        int (*dnat_handler)(struct sk_buff *skb,
+                            struct ip_vs_protocol *pp, struct ip_vs_conn *cp);
 
         int (*csum_check)(int af, struct sk_buff *skb,
                           struct ip_vs_protocol *pp);
 
         const char *(*state_name)(int state);
 
-        void (*state_transition)(struct ip_vs_conn *cp, int direction,
-                                 const struct sk_buff *skb,
-                                 struct ip_vs_proto_data *pd);
+        int (*state_transition)(struct ip_vs_conn *cp, int direction,
+                                const struct sk_buff *skb,
+                                struct ip_vs_proto_data *pd);
 
         int (*register_app)(struct net *net, struct ip_vs_app *inc);
 
@@ -593,7 +504,6 @@ struct ip_vs_conn {
                                                  * state transition triggerd
                                                  * synchronization
                                                  */
-        unsigned long           sync_endtime;   /* jiffies + sent_retries */
 
         /* Control members */
         struct ip_vs_conn       *control;       /* Master control connection */
@@ -607,7 +517,7 @@ struct ip_vs_conn {
            NF_ACCEPT can be returned when destination is local.
          */
         int (*packet_xmit)(struct sk_buff *skb, struct ip_vs_conn *cp,
-                           struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
+                           struct ip_vs_protocol *pp);
 
         /* Note: we can group the following members into a structure,
            in order to save more space, and the following members are
@@ -669,8 +579,8 @@ struct ip_vs_service_user_kern {
         /* virtual service options */
         char                    *sched_name;
         char                    *pe_name;
-        unsigned int            flags;          /* virtual service flags */
-        unsigned int            timeout;        /* persistent timeout in sec */
+        unsigned                flags;          /* virtual service flags */
+        unsigned                timeout;        /* persistent timeout in sec */
         u32                     netmask;        /* persistent netmask */
 };
 
@@ -681,7 +591,7 @@ struct ip_vs_dest_user_kern {
         u16                     port;
 
         /* real server options */
-        unsigned int            conn_flags;     /* connection flags */
+        unsigned                conn_flags;     /* connection flags */
         int                     weight;         /* destination weight */
 
         /* thresholds for active connections */
@@ -705,8 +615,8 @@ struct ip_vs_service {
         union nf_inet_addr      addr;     /* IP address for virtual service */
         __be16                  port;     /* port number for the service */
         __u32                   fwmark;   /* firewall mark of the service */
-        unsigned int            flags;    /* service status flags */
-        unsigned int            timeout;  /* persistent timeout in ticks */
+        unsigned                flags;    /* service status flags */
+        unsigned                timeout;  /* persistent timeout in ticks */
         __be32                  netmask;  /* grouping granularity */
         struct net              *net;
 
@@ -736,7 +646,7 @@ struct ip_vs_dest {
         u16                     af;             /* address family */
         __be16                  port;           /* port number of the server */
         union nf_inet_addr      addr;           /* IP address of the server */
-        volatile unsigned int   flags;          /* dest status flags */
+        volatile unsigned       flags;          /* dest status flags */
         atomic_t                conn_flags;     /* flags to copy to conn */
         atomic_t                weight;         /* server weight */
 
@@ -858,11 +768,13 @@ struct ip_vs_app {
 
         struct ip_vs_conn *
         (*conn_in_get)(const struct sk_buff *skb, struct ip_vs_app *app,
-                       const struct iphdr *iph, int inverse);
+                       const struct iphdr *iph, unsigned int proto_off,
+                       int inverse);
 
         struct ip_vs_conn *
         (*conn_out_get)(const struct sk_buff *skb, struct ip_vs_app *app,
-                        const struct iphdr *iph, int inverse);
+                        const struct iphdr *iph, unsigned int proto_off,
+                        int inverse);
 
         int (*state_transition)(struct ip_vs_conn *cp, int direction,
                                 const struct sk_buff *skb,
@@ -871,16 +783,6 @@ struct ip_vs_app {
         void (*timeout_change)(struct ip_vs_app *app, int flags);
 };
 
-struct ipvs_master_sync_state {
-        struct list_head        sync_queue;
-        struct ip_vs_sync_buff  *sync_buff;
-        int                     sync_queue_len;
-        unsigned int            sync_queue_delay;
-        struct task_struct      *master_thread;
-        struct delayed_work     master_wakeup_work;
-        struct netns_ipvs       *ipvs;
-};
-
 /* IPVS in network namespace */
 struct netns_ipvs {
         int                     gen;            /* Generation */
@@ -895,6 +797,8 @@ struct netns_ipvs {
         struct list_head        rs_table[IP_VS_RTAB_SIZE];
         /* ip_vs_app */
         struct list_head        app_list;
+        /* ip_vs_ftp */
+        struct ip_vs_app        *ftp_app;
         /* ip_vs_proto */
         #define IP_VS_PROTO_TAB_SIZE    32      /* must be power of 2 */
         struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE];
@@ -965,17 +869,11 @@ struct netns_ipvs {
 #endif
         int                     sysctl_snat_reroute;
         int                     sysctl_sync_ver;
-        int                     sysctl_sync_ports;
-        int                     sysctl_sync_qlen_max;
-        int                     sysctl_sync_sock_size;
         int                     sysctl_cache_bypass;
         int                     sysctl_expire_nodest_conn;
         int                     sysctl_expire_quiescent_template;
         int                     sysctl_sync_threshold[2];
-        unsigned int            sysctl_sync_refresh_period;
-        int                     sysctl_sync_retries;
         int                     sysctl_nat_icmp_send;
-        int                     sysctl_pmtu_disc;
 
         /* ip_vs_lblc */
         int                     sysctl_lblc_expiration;
@@ -990,11 +888,13 @@ struct netns_ipvs {
         spinlock_t              est_lock;
         struct timer_list       est_timer;      /* Estimation timer */
         /* ip_vs_sync */
+        struct list_head        sync_queue;
         spinlock_t              sync_lock;
-        struct ipvs_master_sync_state *ms;
+        struct ip_vs_sync_buff  *sync_buff;
         spinlock_t              sync_buff_lock;
-        struct task_struct      **backup_threads;
-        int                     threads_mask;
+        struct sockaddr_in      sync_mcast_addr;
+        struct task_struct      *master_thread;
+        struct task_struct      *backup_thread;
         int                     send_mesg_maxlen;
         int                     recv_mesg_maxlen;
         volatile int            sync_state;
@@ -1011,14 +911,6 @@ struct netns_ipvs {
 #define DEFAULT_SYNC_THRESHOLD  3
 #define DEFAULT_SYNC_PERIOD     50
 #define DEFAULT_SYNC_VER        1
-#define DEFAULT_SYNC_REFRESH_PERIOD     (0U * HZ)
-#define DEFAULT_SYNC_RETRIES            0
-#define IPVS_SYNC_WAKEUP_RATE   8
-#define IPVS_SYNC_QLEN_MAX      (IPVS_SYNC_WAKEUP_RATE * 4)
-#define IPVS_SYNC_SEND_DELAY    (HZ / 50)
-#define IPVS_SYNC_CHECK_PERIOD  HZ
-#define IPVS_SYNC_FLUSH_TIME    (HZ * 2)
-#define IPVS_SYNC_PORTS_MAX     (1 << 6)
 
 #ifdef CONFIG_SYSCTL
 
@@ -1029,17 +921,7 @@ static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
 
 static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
 {
-        return ACCESS_ONCE(ipvs->sysctl_sync_threshold[1]);
-}
-
-static inline unsigned int sysctl_sync_refresh_period(struct netns_ipvs *ipvs)
-{
-        return ACCESS_ONCE(ipvs->sysctl_sync_refresh_period);
-}
-
-static inline int sysctl_sync_retries(struct netns_ipvs *ipvs)
-{
-        return ipvs->sysctl_sync_retries;
+        return ipvs->sysctl_sync_threshold[1];
 }
 
 static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
@@ -1047,26 +929,6 @@ static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
         return ipvs->sysctl_sync_ver;
 }
 
-static inline int sysctl_sync_ports(struct netns_ipvs *ipvs)
-{
-        return ACCESS_ONCE(ipvs->sysctl_sync_ports);
-}
-
-static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs)
-{
-        return ipvs->sysctl_sync_qlen_max;
-}
-
-static inline int sysctl_sync_sock_size(struct netns_ipvs *ipvs)
-{
-        return ipvs->sysctl_sync_sock_size;
-}
-
-static inline int sysctl_pmtu_disc(struct netns_ipvs *ipvs)
-{
-        return ipvs->sysctl_pmtu_disc;
-}
-
 #else
 
 static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -1079,48 +941,18 @@ static inline int sysctl_sync_period(struct netns_ipvs *ipvs)
         return DEFAULT_SYNC_PERIOD;
 }
 
-static inline unsigned int sysctl_sync_refresh_period(struct netns_ipvs *ipvs)
-{
-        return DEFAULT_SYNC_REFRESH_PERIOD;
-}
-
-static inline int sysctl_sync_retries(struct netns_ipvs *ipvs)
-{
-        return DEFAULT_SYNC_RETRIES & 3;
-}
-
 static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)
 {
         return DEFAULT_SYNC_VER;
 }
 
-static inline int sysctl_sync_ports(struct netns_ipvs *ipvs)
-{
-        return 1;
-}
-
-static inline int sysctl_sync_qlen_max(struct netns_ipvs *ipvs)
-{
-        return IPVS_SYNC_QLEN_MAX;
-}
-
-static inline int sysctl_sync_sock_size(struct netns_ipvs *ipvs)
-{
-        return 0;
-}
-
-static inline int sysctl_pmtu_disc(struct netns_ipvs *ipvs)
-{
-        return 1;
-}
-
 #endif
 
 /*
  *      IPVS core functions
  *      (from ip_vs_core.c)
  */
-extern const char *ip_vs_proto_name(unsigned int proto);
+extern const char *ip_vs_proto_name(unsigned proto);
 extern void ip_vs_init_hash_table(struct list_head *table, int rows);
 #define IP_VS_INIT_HASH_TABLE(t) ip_vs_init_hash_table((t), ARRAY_SIZE((t)))
 
@@ -1161,12 +993,14 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p);
 
 struct ip_vs_conn * ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb,
                                             const struct ip_vs_iphdr *iph,
+                                            unsigned int proto_off,
                                             int inverse);
 
 struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p);
 
 struct ip_vs_conn * ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb,
                                              const struct ip_vs_iphdr *iph,
+                                             unsigned int proto_off,
                                              int inverse);
 
 /* put back the conn without restarting its timer */
@@ -1179,7 +1013,7 @@ extern void ip_vs_conn_fill_cport(struct ip_vs_conn *cp, __be16 cport);
 
 struct ip_vs_conn *ip_vs_conn_new(const struct ip_vs_conn_param *p,
                                   const union nf_inet_addr *daddr,
-                                  __be16 dport, unsigned int flags,
+                                  __be16 dport, unsigned flags,
                                   struct ip_vs_dest *dest, __u32 fwmark);
 extern void ip_vs_conn_expire_now(struct ip_vs_conn *cp);
 
@@ -1273,8 +1107,7 @@ extern void ip_vs_service_net_cleanup(struct net *net);
  *      (from ip_vs_app.c)
  */
 #define IP_VS_APP_MAX_PORTS  8
-extern struct ip_vs_app *register_ip_vs_app(struct net *net,
-                                            struct ip_vs_app *app);
+extern int register_ip_vs_app(struct net *net, struct ip_vs_app *app);
 extern void unregister_ip_vs_app(struct net *net, struct ip_vs_app *app);
 extern int ip_vs_bind_app(struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
 extern void ip_vs_unbind_app(struct ip_vs_conn *cp);
@@ -1293,16 +1126,17 @@ int unregister_ip_vs_pe(struct ip_vs_pe *pe);
 struct ip_vs_pe *ip_vs_pe_getbyname(const char *name);
 struct ip_vs_pe *__ip_vs_pe_getbyname(const char *pe_name);
 
-/*
- * Use a #define to avoid all of module.h just for these trivial ops
- */
-#define ip_vs_pe_get(pe)                        \
-        if (pe && pe->module)                   \
+static inline void ip_vs_pe_get(const struct ip_vs_pe *pe)
+{
+        if (pe && pe->module)
                 __module_get(pe->module);
+}
 
-#define ip_vs_pe_put(pe)                        \
-        if (pe && pe->module)                   \
+static inline void ip_vs_pe_put(const struct ip_vs_pe *pe)
+{
+        if (pe && pe->module)
                 module_put(pe->module);
+}
 
 /*
  *      IPVS protocol functions (from ip_vs_proto.c)
@@ -1339,10 +1173,9 @@ extern struct ip_vs_scheduler *ip_vs_scheduler_get(const char *sched_name);
 extern void ip_vs_scheduler_put(struct ip_vs_scheduler *scheduler);
 extern struct ip_vs_conn *
 ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,
-               struct ip_vs_proto_data *pd, int *ignored,
-               struct ip_vs_iphdr *iph);
+               struct ip_vs_proto_data *pd, int *ignored);
 extern int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
-                        struct ip_vs_proto_data *pd, struct ip_vs_iphdr *iph);
+                        struct ip_vs_proto_data *pd);
 
 extern void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg);
 
@@ -1351,8 +1184,10 @@ extern void ip_vs_scheduler_err(struct ip_vs_service *svc, const char *msg);
  *      IPVS control data and functions (from ip_vs_ctl.c)
  */
 extern struct ip_vs_stats ip_vs_stats;
+extern const struct ctl_path net_vs_ctl_path[];
 extern int sysctl_ip_vs_sync_ver;
 
+extern void ip_vs_sync_switch_mode(struct net *net, int mode);
 extern struct ip_vs_service *
 ip_vs_service_get(struct net *net, int af, __u32 fwmark, __u16 protocol,
                   const union nf_inet_addr *vaddr, __be16 vport);
@@ -1368,14 +1203,12 @@ ip_vs_lookup_real_service(struct net *net, int af, __u16 protocol,
 
 extern int ip_vs_use_count_inc(void);
 extern void ip_vs_use_count_dec(void);
-extern int ip_vs_register_nl_ioctl(void);
-extern void ip_vs_unregister_nl_ioctl(void);
 extern int ip_vs_control_init(void);
 extern void ip_vs_control_cleanup(void);
 extern struct ip_vs_dest *
 ip_vs_find_dest(struct net *net, int af, const union nf_inet_addr *daddr,
                 __be16 dport, const union nf_inet_addr *vaddr, __be16 vport,
-                __u16 protocol, __u32 fwmark, __u32 flags);
+                __u16 protocol, __u32 fwmark);
 extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);
 
 
@@ -1386,7 +1219,7 @@ extern struct ip_vs_dest *ip_vs_try_bind_dest(struct ip_vs_conn *cp);
 extern int start_sync_thread(struct net *net, int state, char *mcast_ifn,
                              __u8 syncid);
 extern int stop_sync_thread(struct net *net, int state);
-extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts);
+extern void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp);
 
 
 /*
@@ -1401,38 +1234,33 @@ extern void ip_vs_read_estimator(struct ip_vs_stats_user *dst,
 /*
  *      Various IPVS packet transmitters (from ip_vs_xmit.c)
  */
-extern int ip_vs_null_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
-                           struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
-extern int ip_vs_bypass_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
-                             struct ip_vs_protocol *pp,
-                             struct ip_vs_iphdr *iph);
-extern int ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
-                          struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
-extern int ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
-                             struct ip_vs_protocol *pp,
-                             struct ip_vs_iphdr *iph);
-extern int ip_vs_dr_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
-                         struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
-extern int ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
-                           struct ip_vs_protocol *pp, int offset,
-                           unsigned int hooknum, struct ip_vs_iphdr *iph);
+extern int ip_vs_null_xmit
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_bypass_xmit
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_nat_xmit
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_tunnel_xmit
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_dr_xmit
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_icmp_xmit
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp,
+ int offset, unsigned int hooknum);
 extern void ip_vs_dst_reset(struct ip_vs_dest *dest);
 
 #ifdef CONFIG_IP_VS_IPV6
-extern int ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
-                                struct ip_vs_protocol *pp,
-                                struct ip_vs_iphdr *iph);
-extern int ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
-                             struct ip_vs_protocol *pp,
-                             struct ip_vs_iphdr *iph);
-extern int ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
-                                struct ip_vs_protocol *pp,
-                                struct ip_vs_iphdr *iph);
-extern int ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
-                            struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
-extern int ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
-                              struct ip_vs_protocol *pp, int offset,
-                              unsigned int hooknum, struct ip_vs_iphdr *iph);
+extern int ip_vs_bypass_xmit_v6
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_nat_xmit_v6
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_tunnel_xmit_v6
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_dr_xmit_v6
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);
+extern int ip_vs_icmp_xmit_v6
+(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp,
+ int offset, unsigned int hooknum);
 #endif
 
 #ifdef CONFIG_SYSCTL
@@ -1526,7 +1354,7 @@ static inline void ip_vs_notrack(struct sk_buff *skb)
         struct nf_conn *ct = nf_ct_get(skb, &ctinfo);
 
         if (!ct || !nf_ct_is_untracked(ct)) {
-                nf_conntrack_put(skb->nfct);
+                nf_reset(skb);
                 skb->nfct = &nf_ct_untracked_get()->ct_general;
                 skb->nfctinfo = IP_CT_NEW;
                 nf_conntrack_get(skb->nfct);
@@ -1550,7 +1378,7 @@ static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs)
 
 extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp,
                                    int outin);
-extern int ip_vs_confirm_conntrack(struct sk_buff *skb);
+extern int ip_vs_confirm_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp);
 extern void ip_vs_nfct_expect_related(struct sk_buff *skb, struct nf_conn *ct,
                                       struct ip_vs_conn *cp, u_int8_t proto,
                                       const __be16 port, int from_rs);
@@ -1568,7 +1396,8 @@ static inline void ip_vs_update_conntrack(struct sk_buff *skb,
 {
 }
 
-static inline int ip_vs_confirm_conntrack(struct sk_buff *skb)
+static inline int ip_vs_confirm_conntrack(struct sk_buff *skb,
+                                          struct ip_vs_conn *cp)
 {
         return NF_ACCEPT;
 }
diff --git a/include/net/ipip.h b/include/net/ipip.h
index 21947cf4fa4..a32654d5273 100644
--- a/include/net/ipip.h
+++ b/include/net/ipip.h
@@ -2,7 +2,6 @@
 #define __NET_IPIP_H 1
 
 #include <linux/if_tunnel.h>
-#include <net/gro_cells.h>
 #include <net/ip.h>
 
 /* Keep error state on tunnel for 30 sec */
@@ -37,8 +36,6 @@ struct ip_tunnel {
 #endif
         struct ip_tunnel_prl_entry __rcu *prl;          /* potential router list */
         unsigned int                    prl_count;      /* # of entries in PRL */
-
-        struct gro_cells                gro_cells;
 };
 
 struct ip_tunnel_prl_entry {
@@ -48,27 +45,23 @@ struct ip_tunnel_prl_entry {
         struct rcu_head                 rcu_head;
 };
 
-static inline void iptunnel_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        int err;
-        struct iphdr *iph = ip_hdr(skb);
-        int pkt_len = skb->len - skb_transport_offset(skb);
-        struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats);
-
-        nf_reset(skb);
-        skb->ip_summed = CHECKSUM_NONE;
-        ip_select_ident(iph, skb_dst(skb), NULL);
+#define __IPTUNNEL_XMIT(stats1, stats2) do {                            \
+        int err;                                                        \
+        int pkt_len = skb->len - skb_transport_offset(skb);             \
+                                                                        \
+        skb->ip_summed = CHECKSUM_NONE;                                 \
+        ip_select_ident(iph, &rt->dst, NULL);                           \
+                                                                        \
+        err = ip_local_out(skb);                                        \
+        if (likely(net_xmit_eval(err) == 0)) {                          \
+                (stats1)->tx_bytes += pkt_len;                          \
+                (stats1)->tx_packets++;                                 \
+        } else {                                                        \
+                (stats2)->tx_errors++;                                  \
+                (stats2)->tx_aborted_errors++;                          \
+        }                                                               \
+} while (0)
 
-        err = ip_local_out(skb);
-        if (likely(net_xmit_eval(err) == 0)) {
-                u64_stats_update_begin(&tstats->syncp);
-                tstats->tx_bytes += pkt_len;
-                tstats->tx_packets++;
-                u64_stats_update_end(&tstats->syncp);
-        } else {
-                dev->stats.tx_errors++;
-                dev->stats.tx_aborted_errors++;
-        }
-}
+#define IPTUNNEL_XMIT() __IPTUNNEL_XMIT(txq, stats)
 
 #endif
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 5af66b26ebd..3b5ac1fbff3 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -34,7 +34,6 @@
 #define NEXTHDR_IPV6            41      /* IPv6 in IPv6 */
 #define NEXTHDR_ROUTING         43      /* Routing header. */
 #define NEXTHDR_FRAGMENT        44      /* Fragmentation/reassembly header. */
-#define NEXTHDR_GRE             47      /* GRE header. */
 #define NEXTHDR_ESP             50      /* Encapsulating security payload. */
 #define NEXTHDR_AUTH            51      /* Authentication header. */
 #define NEXTHDR_ICMP            58      /* ICMP for IPv6. */
@@ -114,6 +113,7 @@ struct frag_hdr {
 
 /* sysctls */
 extern int sysctl_mld_max_msf;
+extern struct ctl_path net_ipv6_ctl_path[];
 
 #define _DEVINC(net, statname, modifier, idev, field)                   \
 ({                                                                      \
@@ -132,15 +132,6 @@ extern int sysctl_mld_max_msf;
         SNMP_INC_STATS##modifier((net)->mib.statname##_statistics, (field));\
 })
 
-/* per device and per net counters are atomic_long_t */
-#define _DEVINC_ATOMIC_ATOMIC(net, statname, idev, field)               \
-({                                                                      \
-        struct inet6_dev *_idev = (idev);                               \
-        if (likely(_idev != NULL))                                      \
-                SNMP_INC_STATS_ATOMIC_LONG((_idev)->stats.statname##dev, (field)); \
-        SNMP_INC_STATS_ATOMIC_LONG((net)->mib.statname##_statistics, (field));\
-})
-
 #define _DEVADD(net, statname, modifier, idev, field, val)              \
 ({                                                                      \
         struct inet6_dev *_idev = (idev);                               \
@@ -177,11 +168,11 @@ extern int sysctl_mld_max_msf;
                 _DEVINCATOMIC(net, icmpv6, _BH, idev, field)
 
 #define ICMP6MSGOUT_INC_STATS(net, idev, field)         \
-        _DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field +256)
+        _DEVINCATOMIC(net, icmpv6msg, , idev, field +256)
 #define ICMP6MSGOUT_INC_STATS_BH(net, idev, field)      \
-        _DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field +256)
+        _DEVINCATOMIC(net, icmpv6msg, _BH, idev, field +256)
 #define ICMP6MSGIN_INC_STATS_BH(net, idev, field)       \
-        _DEVINC_ATOMIC_ATOMIC(net, icmpv6msg, idev, field)
+        _DEVINCATOMIC(net, icmpv6msg, _BH, idev, field)
 
 struct ip6_ra_chain {
         struct ip6_ra_chain     *next;
@@ -223,10 +214,7 @@ struct ip6_flowlabel {
         struct ipv6_txoptions   *opt;
         unsigned long           linger;
         u8                      share;
-        union {
-                struct pid *pid;
-                kuid_t uid;
-        } owner;
+        u32                     owner;
         unsigned long           lastuse;
         unsigned long           expires;
         struct net              *fl_net;
@@ -255,8 +243,6 @@ static inline void fl6_sock_release(struct ip6_flowlabel *fl)
                 atomic_dec(&fl->users);
 }
 
-extern void icmpv6_notify(struct sk_buff *skb, u8 type, u8 code, __be32 info);
-
 extern int                      ip6_ra_control(struct sock *sk, int sel);
 
 extern int                      ipv6_parse_hopopts(struct sk_buff *skb);
@@ -269,28 +255,10 @@ extern struct ipv6_txoptions *	ipv6_renew_options(struct sock *sk, struct ipv6_t
 struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
                                           struct ipv6_txoptions *opt);
 
-extern bool ipv6_opt_accepted(const struct sock *sk, const struct sk_buff *skb);
+extern int ipv6_opt_accepted(struct sock *sk, struct sk_buff *skb);
 
-static inline bool ipv6_accept_ra(struct inet6_dev *idev)
-{
-        /* If forwarding is enabled, RA are not accepted unless the special
-         * hybrid mode (accept_ra=2) is enabled.
-         */
-        return idev->cnf.forwarding ? idev->cnf.accept_ra == 2 :
-            idev->cnf.accept_ra;
-}
-
-#if IS_ENABLED(CONFIG_IPV6)
-static inline int ip6_frag_nqueues(struct net *net)
-{
-        return net->ipv6.frags.nqueues;
-}
-
-static inline int ip6_frag_mem(struct net *net)
-{
-        return atomic_read(&net->ipv6.frags.mem);
-}
-#endif
+int ip6_frag_nqueues(struct net *net);
+int ip6_frag_mem(struct net *net);
 
 #define IPV6_FRAG_HIGH_THRESH   (256 * 1024)    /* 262144 */
 #define IPV6_FRAG_LOW_THRESH    (192 * 1024)    /* 196608 */
@@ -322,23 +290,19 @@ static inline int ipv6_addr_cmp(const struct in6_addr *a1, const struct in6_addr
         return memcmp(a1, a2, sizeof(struct in6_addr));
 }
 
-static inline bool
+static inline int
 ipv6_masked_addr_cmp(const struct in6_addr *a1, const struct in6_addr *m,
                      const struct in6_addr *a2)
 {
-#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
-        const unsigned long *ul1 = (const unsigned long *)a1;
-        const unsigned long *ulm = (const unsigned long *)m;
-        const unsigned long *ul2 = (const unsigned long *)a2;
-
-        return !!(((ul1[0] ^ ul2[0]) & ulm[0]) |
-                  ((ul1[1] ^ ul2[1]) & ulm[1]));
-#else
         return !!(((a1->s6_addr32[0] ^ a2->s6_addr32[0]) & m->s6_addr32[0]) |
                   ((a1->s6_addr32[1] ^ a2->s6_addr32[1]) & m->s6_addr32[1]) |
                   ((a1->s6_addr32[2] ^ a2->s6_addr32[2]) & m->s6_addr32[2]) |
                   ((a1->s6_addr32[3] ^ a2->s6_addr32[3]) & m->s6_addr32[3]));
-#endif
+}
+
+static inline void ipv6_addr_copy(struct in6_addr *a1, const struct in6_addr *a2)
+{
+        memcpy(a1, a2, sizeof(struct in6_addr));
 }
 
 static inline void ipv6_addr_prefix(struct in6_addr *pfx, 
@@ -365,43 +329,36 @@ static inline void ipv6_addr_set(struct in6_addr *addr,
         addr->s6_addr32[3] = w4;
 }
 
-static inline bool ipv6_addr_equal(const struct in6_addr *a1,
-                                   const struct in6_addr *a2)
+static inline int ipv6_addr_equal(const struct in6_addr *a1,
+                                  const struct in6_addr *a2)
 {
-#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
-        const unsigned long *ul1 = (const unsigned long *)a1;
-        const unsigned long *ul2 = (const unsigned long *)a2;
-
-        return ((ul1[0] ^ ul2[0]) | (ul1[1] ^ ul2[1])) == 0UL;
-#else
         return ((a1->s6_addr32[0] ^ a2->s6_addr32[0]) |
                 (a1->s6_addr32[1] ^ a2->s6_addr32[1]) |
                 (a1->s6_addr32[2] ^ a2->s6_addr32[2]) |
                 (a1->s6_addr32[3] ^ a2->s6_addr32[3])) == 0;
-#endif
 }
 
-static inline bool __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
-                                       unsigned int prefixlen)
+static inline int __ipv6_prefix_equal(const __be32 *a1, const __be32 *a2,
+                                      unsigned int prefixlen)
 {
-        unsigned int pdw, pbi;
+        unsigned pdw, pbi;
 
         /* check complete u32 in prefix */
         pdw = prefixlen >> 5;
         if (pdw && memcmp(a1, a2, pdw << 2))
-                return false;
+                return 0;
 
         /* check incomplete u32 in prefix */
         pbi = prefixlen & 0x1f;
         if (pbi && ((a1[pdw] ^ a2[pdw]) & htonl((0xffffffff) << (32 - pbi))))
-                return false;
+                return 0;
 
-        return true;
+        return 1;
 }
 
-static inline bool ipv6_prefix_equal(const struct in6_addr *a1,
-                                     const struct in6_addr *a2,
-                                     unsigned int prefixlen)
+static inline int ipv6_prefix_equal(const struct in6_addr *a1,
+                                    const struct in6_addr *a2,
+                                    unsigned int prefixlen)
 {
         return __ipv6_prefix_equal(a1->s6_addr32, a2->s6_addr32,
                                    prefixlen);
@@ -427,59 +384,21 @@ struct ip6_create_arg {
 };
 
 void ip6_frag_init(struct inet_frag_queue *q, void *a);
-bool ip6_frag_match(struct inet_frag_queue *q, void *a);
-
-/*
- *      Equivalent of ipv4 struct ip
- */
-struct frag_queue {
-        struct inet_frag_queue  q;
+int ip6_frag_match(struct inet_frag_queue *q, void *a);
 
-        __be32                  id;             /* fragment id          */
-        u32                     user;
-        struct in6_addr         saddr;
-        struct in6_addr         daddr;
-
-        int                     iif;
-        unsigned int            csum;
-        __u16                   nhoffset;
-};
-
-void ip6_expire_frag_queue(struct net *net, struct frag_queue *fq,
-                           struct inet_frags *frags);
-
-static inline bool ipv6_addr_any(const struct in6_addr *a)
+static inline int ipv6_addr_any(const struct in6_addr *a)
 {
-#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
-        const unsigned long *ul = (const unsigned long *)a;
-
-        return (ul[0] | ul[1]) == 0UL;
-#else
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                 a->s6_addr32[2] | a->s6_addr32[3]) == 0;
-#endif
 }
 
-static inline u32 ipv6_addr_hash(const struct in6_addr *a)
-{
-#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
-        const unsigned long *ul = (const unsigned long *)a;
-        unsigned long x = ul[0] ^ ul[1];
-
-        return (u32)(x ^ (x >> 32));
-#else
-        return (__force u32)(a->s6_addr32[0] ^ a->s6_addr32[1] ^
-                             a->s6_addr32[2] ^ a->s6_addr32[3]);
-#endif
-}
-
-static inline bool ipv6_addr_loopback(const struct in6_addr *a)
+static inline int ipv6_addr_loopback(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                 a->s6_addr32[2] | (a->s6_addr32[3] ^ htonl(1))) == 0;
 }
 
-static inline bool ipv6_addr_v4mapped(const struct in6_addr *a)
+static inline int ipv6_addr_v4mapped(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] | a->s6_addr32[1] |
                  (a->s6_addr32[2] ^ htonl(0x0000ffff))) == 0;
@@ -489,7 +408,7 @@ static inline bool ipv6_addr_v4mapped(const struct in6_addr *a)
  * Check for a RFC 4843 ORCHID address
  * (Overlay Routable Cryptographic Hash Identifiers)
  */
-static inline bool ipv6_addr_orchid(const struct in6_addr *a)
+static inline int ipv6_addr_orchid(const struct in6_addr *a)
 {
         return (a->s6_addr32[0] & htonl(0xfffffff0)) == htonl(0x20010010);
 }
@@ -567,8 +486,7 @@ extern int			ip6_rcv_finish(struct sk_buff *skb);
 extern int                      ip6_xmit(struct sock *sk,
                                          struct sk_buff *skb,
                                          struct flowi6 *fl6,
-                                         struct ipv6_txoptions *opt,
-                                         int tclass);
+                                         struct ipv6_txoptions *opt);
 
 extern int                      ip6_nd_hdr(struct sock *sk,
                                            struct sk_buff *skb,
@@ -635,19 +553,9 @@ extern void			ipv6_push_frag_opts(struct sk_buff *skb,
                                                     u8 *proto);
 
 extern int                      ipv6_skip_exthdr(const struct sk_buff *, int start,
-                                                 u8 *nexthdrp, __be16 *frag_offp);
-
-extern bool                     ipv6_ext_hdr(u8 nexthdr);
-
-enum {
-        IP6_FH_F_FRAG           = (1 << 0),
-        IP6_FH_F_AUTH           = (1 << 1),
-        IP6_FH_F_SKIP_RH        = (1 << 2),
-};
+                                                 u8 *nexthdrp);
 
-/* find specified header and get offset to it */
-extern int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
-                         int target, unsigned short *fragoff, int *fragflg);
+extern int                      ipv6_ext_hdr(u8 nexthdr);
 
 extern int ipv6_find_tlv(struct sk_buff *skb, int offset, int type);
 
@@ -748,6 +656,8 @@ extern struct ctl_table *ipv6_icmp_sysctl_init(struct net *net);
 extern struct ctl_table *ipv6_route_sysctl_init(struct net *net);
 extern int ipv6_sysctl_register(void);
 extern void ipv6_sysctl_unregister(void);
+extern int ipv6_static_sysctl_register(void);
+extern void ipv6_static_sysctl_unregister(void);
 #endif
 
 #endif /* _NET_IPV6_H */
diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
index 80ffde3bb16..59ba38bc400 100644
--- a/include/net/irda/ircomm_tty.h
+++ b/include/net/irda/ircomm_tty.h
@@ -52,16 +52,21 @@
 /* Same for payload size. See qos.c for the smallest max data size */
 #define IRCOMM_TTY_DATA_UNINITIALISED   (64 - IRCOMM_TTY_HDR_UNINITIALISED)
 
+/* Those are really defined in include/linux/serial.h - Jean II */
+#define ASYNC_B_INITIALIZED     31      /* Serial port was initialized */
+#define ASYNC_B_NORMAL_ACTIVE   29      /* Normal device is active */
+#define ASYNC_B_CLOSING         27      /* Serial port is closing */
+
 /*
  * IrCOMM TTY driver state
  */
 struct ircomm_tty_cb {
         irda_queue_t queue;            /* Must be first */
-        struct tty_port port;
         magic_t magic;
 
         int state;                /* Connect state */
 
+        struct tty_struct *tty;
         struct ircomm_cb *ircomm; /* IrCOMM layer instance */
 
         struct sk_buff *tx_skb;   /* Transmit buffer */
@@ -75,6 +80,7 @@ struct ircomm_tty_cb {
         LOCAL_FLOW flow;          /* IrTTP flow status */
 
         int line;
+        unsigned long flags;
 
         __u8 dlsap_sel;
         __u8 slsap_sel;
@@ -91,10 +97,19 @@ struct ircomm_tty_cb {
         void *skey;
         void *ckey;
 
+        wait_queue_head_t open_wait;
+        wait_queue_head_t close_wait;
         struct timer_list watchdog_timer;
         struct work_struct  tqueue;
 
+        unsigned short    close_delay;
+        unsigned short    closing_wait; /* time to wait before closing */
+
+        int  open_count;
+        int  blocked_open;      /* # of blocked opens */
+
         /* Protect concurent access to :
+         *      o self->open_count
          *      o self->ctrl_skb
          *      o self->tx_skb
          * Maybe other things may gain to be protected as well...
diff --git a/include/net/irda/irlmp.h b/include/net/irda/irlmp.h
index 591f78631f1..fff11b7fe8a 100644
--- a/include/net/irda/irlmp.h
+++ b/include/net/irda/irlmp.h
@@ -134,7 +134,7 @@ typedef struct {
 } CACHE_ENTRY;
 
 /*
- *  Information about each registered IrLAP layer
+ *  Information about each registred IrLAP layer
  */
 struct lap_cb {
         irda_queue_t queue; /* Must be first */
diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
index cc7c1973238..f82a1e87737 100644
--- a/include/net/iucv/af_iucv.h
+++ b/include/net/iucv/af_iucv.h
@@ -14,7 +14,6 @@
 #include <linux/list.h>
 #include <linux/poll.h>
 #include <linux/socket.h>
-#include <net/iucv/iucv.h>
 
 #ifndef AF_IUCV
 #define AF_IUCV         32
@@ -27,13 +26,13 @@ enum {
         IUCV_OPEN,
         IUCV_BOUND,
         IUCV_LISTEN,
+        IUCV_SEVERED,
         IUCV_DISCONN,
         IUCV_CLOSING,
         IUCV_CLOSED
 };
 
 #define IUCV_QUEUELEN_DEFAULT   65535
-#define IUCV_HIPER_MSGLIM_DEFAULT       128
 #define IUCV_CONN_TIMEOUT       (HZ * 40)
 #define IUCV_DISCONN_TIMEOUT    (HZ * 2)
 #define IUCV_CONN_IDLE_TIMEOUT  (HZ * 60)
@@ -58,52 +57,8 @@ struct sock_msg_q {
         spinlock_t              lock;
 };
 
-#define AF_IUCV_FLAG_ACK 0x1
-#define AF_IUCV_FLAG_SYN 0x2
-#define AF_IUCV_FLAG_FIN 0x4
-#define AF_IUCV_FLAG_WIN 0x8
-#define AF_IUCV_FLAG_SHT 0x10
-
-struct af_iucv_trans_hdr {
-        u16 magic;
-        u8 version;
-        u8 flags;
-        u16 window;
-        char destNodeID[8];
-        char destUserID[8];
-        char destAppName[16];
-        char srcNodeID[8];
-        char srcUserID[8];
-        char srcAppName[16];             /* => 70 bytes */
-        struct iucv_message iucv_hdr;    /* => 33 bytes */
-        u8 pad;                          /* total 104 bytes */
-} __packed;
-
-enum iucv_tx_notify {
-        /* transmission of skb is completed and was successful */
-        TX_NOTIFY_OK = 0,
-        /* target is unreachable */
-        TX_NOTIFY_UNREACHABLE = 1,
-        /* transfer pending queue full */
-        TX_NOTIFY_TPQFULL = 2,
-        /* general error */
-        TX_NOTIFY_GENERALERROR = 3,
-        /* transmission of skb is pending - may interleave
-         * with TX_NOTIFY_DELAYED_* */
-        TX_NOTIFY_PENDING = 4,
-        /* transmission of skb was done successfully (delayed) */
-        TX_NOTIFY_DELAYED_OK = 5,
-        /* target unreachable (detected delayed) */
-        TX_NOTIFY_DELAYED_UNREACHABLE = 6,
-        /* general error (detected delayed) */
-        TX_NOTIFY_DELAYED_GENERALERROR = 7,
-};
-
 #define iucv_sk(__sk) ((struct iucv_sock *) __sk)
 
-#define AF_IUCV_TRANS_IUCV 0
-#define AF_IUCV_TRANS_HIPER 1
-
 struct iucv_sock {
         struct sock             sk;
         char                    src_user_id[8];
@@ -114,26 +69,17 @@ struct iucv_sock {
         spinlock_t              accept_q_lock;
         struct sock             *parent;
         struct iucv_path        *path;
-        struct net_device       *hs_dev;
         struct sk_buff_head     send_skb_q;
         struct sk_buff_head     backlog_skb_q;
         struct sock_msg_q       message_q;
         unsigned int            send_tag;
         u8                      flags;
         u16                     msglimit;
-        u16                     msglimit_peer;
-        atomic_t                msg_sent;
-        atomic_t                msg_recv;
-        atomic_t                pendings;
-        int                     transport;
-        void                    (*sk_txnotify)(struct sk_buff *skb,
-                                               enum iucv_tx_notify n);
 };
 
 /* iucv socket options (SOL_IUCV) */
 #define SO_IPRMDATA_MSG 0x0080          /* send/recv IPRM_DATA msgs */
 #define SO_MSGLIMIT     0x1000          /* get/set IUCV MSGLIMIT */
-#define SO_MSGSIZE      0x0800          /* get maximum msgsize */
 
 /* iucv related control messages (scm) */
 #define SCM_IUCV_TRGCLS 0x0001          /* target class control message */
@@ -148,6 +94,7 @@ unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
                             poll_table *wait);
 void iucv_sock_link(struct iucv_sock_list *l, struct sock *s);
 void iucv_sock_unlink(struct iucv_sock_list *l, struct sock *s);
+int  iucv_sock_wait_cnt(struct sock *sk, unsigned long timeo);
 void iucv_accept_enqueue(struct sock *parent, struct sock *sk);
 void iucv_accept_unlink(struct sock *sk);
 struct sock *iucv_accept_dequeue(struct sock *parent, struct socket *newsock);
diff --git a/include/net/iucv/iucv.h b/include/net/iucv/iucv.h
index 0894ced3195..1121baa9f69 100644
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
@@ -120,7 +120,7 @@ struct iucv_message {
         u32 reply_size;
         u8  rmmsg[8];
         u8  flags;
-} __packed;
+};
 
 /*
  * struct iucv_handler
@@ -459,37 +459,3 @@ int __iucv_message_send(struct iucv_path *path, struct iucv_message *msg,
 int iucv_message_send2way(struct iucv_path *path, struct iucv_message *msg,
                           u8 flags, u32 srccls, void *buffer, size_t size,
                           void *answer, size_t asize, size_t *residual);
-
-struct iucv_interface {
-        int (*message_receive)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, void *buffer, size_t size, size_t *residual);
-        int (*__message_receive)(struct iucv_path *path,
-                struct iucv_message *msg, u8 flags, void *buffer, size_t size,
-                size_t *residual);
-        int (*message_reply)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, void *reply, size_t size);
-        int (*message_reject)(struct iucv_path *path, struct iucv_message *msg);
-        int (*message_send)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, u32 srccls, void *buffer, size_t size);
-        int (*__message_send)(struct iucv_path *path, struct iucv_message *msg,
-                u8 flags, u32 srccls, void *buffer, size_t size);
-        int (*message_send2way)(struct iucv_path *path,
-                struct iucv_message *msg, u8 flags, u32 srccls, void *buffer,
-                size_t size, void *answer, size_t asize, size_t *residual);
-        int (*message_purge)(struct iucv_path *path, struct iucv_message *msg,
-                u32 srccls);
-        int (*path_accept)(struct iucv_path *path, struct iucv_handler *handler,
-                u8 userdata[16], void *private);
-        int (*path_connect)(struct iucv_path *path,
-                struct iucv_handler *handler,
-                u8 userid[8], u8 system[8], u8 userdata[16], void *private);
-        int (*path_quiesce)(struct iucv_path *path, u8 userdata[16]);
-        int (*path_resume)(struct iucv_path *path, u8 userdata[16]);
-        int (*path_sever)(struct iucv_path *path, u8 userdata[16]);
-        int (*iucv_register)(struct iucv_handler *handler, int smp);
-        void (*iucv_unregister)(struct iucv_handler *handler, int smp);
-        struct bus_type *bus;
-        struct device *root;
-};
-
-extern struct iucv_interface iucv_if;
diff --git a/include/net/lapb.h b/include/net/lapb.h
index df892a94f2c..96cb5ddaa9f 100644
--- a/include/net/lapb.h
+++ b/include/net/lapb.h
@@ -95,7 +95,7 @@ struct lapb_cb {
         struct sk_buff_head     write_queue;
         struct sk_buff_head     ack_queue;
         unsigned char           window;
-        const struct lapb_register_struct *callbacks;
+        struct lapb_register_struct callbacks;
 
         /* FRMR control information */
         struct lapb_frame       frmr_data;
@@ -149,10 +149,4 @@ extern int  lapb_t1timer_running(struct lapb_cb *lapb);
  */
 #define LAPB_DEBUG      0
 
-#define lapb_dbg(level, fmt, ...)                       \
-do {                                                    \
-        if (level < LAPB_DEBUG)                         \
-                pr_debug(fmt, ##__VA_ARGS__);           \
-} while (0)
-
 #endif
diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index d178c26a555..b95bbb083ee 100644
--- a/include/net/lib80211.h
+++ b/include/net/lib80211.h
@@ -25,6 +25,7 @@
 
 #include <linux/types.h>
 #include <linux/list.h>
+#include <linux/module.h>
 #include <linux/atomic.h>
 #include <linux/if.h>
 #include <linux/skbuff.h>
@@ -41,8 +42,6 @@ enum {
         IEEE80211_CRYPTO_TKIP_COUNTERMEASURES = (1 << 0),
 };
 
-struct module;
-
 struct lib80211_crypto_ops {
         const char *name;
         struct list_head list;
@@ -118,7 +117,10 @@ void lib80211_crypt_info_free(struct lib80211_crypt_info *info);
 int lib80211_register_crypto_ops(struct lib80211_crypto_ops *ops);
 int lib80211_unregister_crypto_ops(struct lib80211_crypto_ops *ops);
 struct lib80211_crypto_ops *lib80211_get_crypto_ops(const char *name);
+void lib80211_crypt_deinit_entries(struct lib80211_crypt_info *, int);
+void lib80211_crypt_deinit_handler(unsigned long);
 void lib80211_crypt_delayed_deinit(struct lib80211_crypt_info *info,
                                     struct lib80211_crypt_data **crypt);
+void lib80211_crypt_quiescing(struct lib80211_crypt_info *info);
 
 #endif /* LIB80211_H */
diff --git a/include/net/llc.h b/include/net/llc.h
index 9e7d7f08ef7..226c846cab0 100644
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -133,7 +133,7 @@ extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
 extern void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
 extern void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
 
-extern void llc_station_init(void);
+extern int llc_station_init(void);
 extern void llc_station_exit(void);
 
 #ifdef CONFIG_PROC_FS
@@ -151,6 +151,7 @@ extern int sysctl_llc2_ack_timeout;
 extern int sysctl_llc2_busy_timeout;
 extern int sysctl_llc2_p_timeout;
 extern int sysctl_llc2_rej_timeout;
+extern int sysctl_llc_station_ack_timeout;
 #else
 #define llc_sysctl_init() (0)
 #define llc_sysctl_exit() do { } while(0)
diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
index 6ca3113df39..23a409381fa 100644
--- a/include/net/llc_c_ev.h
+++ b/include/net/llc_c_ev.h
@@ -264,6 +264,6 @@ extern int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk,
 static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb)
 {
         return atomic_read(&sk->sk_rmem_alloc) + skb->truesize <
-               (unsigned int)sk->sk_rcvbuf;
+               (unsigned)sk->sk_rcvbuf;
 }
 #endif /* LLC_C_EV_H */
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index 5a93d13ac95..f57e7d46a45 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -13,6 +13,7 @@
  */
 
 #include <linux/if_ether.h>
+#include <linux/if_tr.h>
 
 /* Lengths of frame formats */
 #define LLC_PDU_LEN_I   4       /* header and 2 control bytes */
@@ -252,6 +253,10 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
 {
         if (skb->protocol == htons(ETH_P_802_2))
                 memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
+        else if (skb->protocol == htons(ETH_P_TR_802_2)) {
+                memcpy(sa, tr_hdr(skb)->saddr, ETH_ALEN);
+                *sa &= 0x7F;
+        }
 }
 
 /**
@@ -265,6 +270,8 @@ static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
 {
         if (skb->protocol == htons(ETH_P_802_2))
                 memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
+        else if (skb->protocol == htons(ETH_P_TR_802_2))
+                memcpy(da, tr_hdr(skb)->daddr, ETH_ALEN);
 }
 
 /**
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ee50c5eba50..9259e97864d 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -13,10 +13,11 @@
 #ifndef MAC80211_H
 #define MAC80211_H
 
-#include <linux/bug.h>
 #include <linux/kernel.h>
 #include <linux/if_ether.h>
 #include <linux/skbuff.h>
+#include <linux/wireless.h>
+#include <linux/device.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 #include <asm/unaligned.h>
@@ -87,19 +88,15 @@
  *
  */
 
-struct device;
-
 /**
  * enum ieee80211_max_queues - maximum number of queues
  *
  * @IEEE80211_MAX_QUEUES: Maximum number of regular device queues.
  */
 enum ieee80211_max_queues {
-        IEEE80211_MAX_QUEUES =          16,
+        IEEE80211_MAX_QUEUES =          4,
 };
 
-#define IEEE80211_INVAL_HW_QUEUE        0xff
-
 /**
  * enum ieee80211_ac_numbers - AC numbers as used in mac80211
  * @IEEE80211_AC_VO: voice
@@ -113,7 +110,6 @@ enum ieee80211_ac_numbers {
         IEEE80211_AC_BE         = 2,
         IEEE80211_AC_BK         = 3,
 };
-#define IEEE80211_NUM_ACS       4
 
 /**
  * struct ieee80211_tx_queue_params - transmit queue configuration
@@ -144,39 +140,6 @@ struct ieee80211_low_level_stats {
 };
 
 /**
- * enum ieee80211_chanctx_change - change flag for channel context
- * @IEEE80211_CHANCTX_CHANGE_WIDTH: The channel width changed
- * @IEEE80211_CHANCTX_CHANGE_RX_CHAINS: The number of RX chains changed
- */
-enum ieee80211_chanctx_change {
-        IEEE80211_CHANCTX_CHANGE_WIDTH          = BIT(0),
-        IEEE80211_CHANCTX_CHANGE_RX_CHAINS      = BIT(1),
-};
-
-/**
- * struct ieee80211_chanctx_conf - channel context that vifs may be tuned to
- *
- * This is the driver-visible part. The ieee80211_chanctx
- * that contains it is visible in mac80211 only.
- *
- * @def: the channel definition
- * @rx_chains_static: The number of RX chains that must always be
- *      active on the channel to receive MIMO transmissions
- * @rx_chains_dynamic: The number of RX chains that must be enabled
- *      after RTS/CTS handshake to receive SMPS MIMO transmissions;
- *      this will always be >= @rx_chains_static.
- * @drv_priv: data area for driver use, will always be aligned to
- *      sizeof(void *), size is determined in hw information.
- */
-struct ieee80211_chanctx_conf {
-        struct cfg80211_chan_def def;
-
-        u8 rx_chains_static, rx_chains_dynamic;
-
-        u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
-};
-
-/**
  * enum ieee80211_bss_change - BSS change notification flags
  *
  * These flags are used with the bss_info_changed() callback
@@ -202,19 +165,13 @@ struct ieee80211_chanctx_conf {
  * @BSS_CHANGED_QOS: QoS for this association was enabled/disabled. Note
  *      that it is only ever disabled for station mode.
  * @BSS_CHANGED_IDLE: Idle changed for this BSS/interface.
- * @BSS_CHANGED_SSID: SSID changed for this BSS (AP mode)
- * @BSS_CHANGED_AP_PROBE_RESP: Probe Response changed for this BSS (AP mode)
- * @BSS_CHANGED_PS: PS changed for this BSS (STA mode)
- * @BSS_CHANGED_TXPOWER: TX power setting changed for this interface
- * @BSS_CHANGED_P2P_PS: P2P powersave settings (CTWindow, opportunistic PS)
- *      changed (currently only in P2P client mode, GO mode will be later)
  */
 enum ieee80211_bss_change {
         BSS_CHANGED_ASSOC               = 1<<0,
         BSS_CHANGED_ERP_CTS_PROT        = 1<<1,
         BSS_CHANGED_ERP_PREAMBLE        = 1<<2,
         BSS_CHANGED_ERP_SLOT            = 1<<3,
-        BSS_CHANGED_HT                  = 1<<4,
+        BSS_CHANGED_HT                  = 1<<4,
         BSS_CHANGED_BASIC_RATES         = 1<<5,
         BSS_CHANGED_BEACON_INT          = 1<<6,
         BSS_CHANGED_BSSID               = 1<<7,
@@ -225,11 +182,6 @@ enum ieee80211_bss_change {
         BSS_CHANGED_ARP_FILTER          = 1<<12,
         BSS_CHANGED_QOS                 = 1<<13,
         BSS_CHANGED_IDLE                = 1<<14,
-        BSS_CHANGED_SSID                = 1<<15,
-        BSS_CHANGED_AP_PROBE_RESP       = 1<<16,
-        BSS_CHANGED_PS                  = 1<<17,
-        BSS_CHANGED_TXPOWER             = 1<<18,
-        BSS_CHANGED_P2P_PS              = 1<<19,
 
         /* when adding here, make sure to change ieee80211_reconfig */
 };
@@ -261,7 +213,6 @@ enum ieee80211_rssi_event {
  * @assoc: association status
  * @ibss_joined: indicates whether this station is part of an IBSS
  *      or not
- * @ibss_creator: indicates if a new IBSS network is being created
  * @aid: association ID number, valid only when @assoc is true
  * @use_cts_prot: use CTS protection
  * @use_short_preamble: use 802.11b short preamble;
@@ -274,10 +225,7 @@ enum ieee80211_rssi_event {
  *      valid in station mode only while @assoc is true and if also
  *      requested by %IEEE80211_HW_NEED_DTIM_PERIOD (cf. also hw conf
  *      @ps_dtim_period)
- * @sync_tsf: last beacon's/probe response's TSF timestamp (could be old
- *      as it may have been received during scanning long ago)
- * @sync_device_ts: the device timestamp corresponding to the sync_tsf,
- *      the driver/device can use this to calculate synchronisation
+ * @timestamp: beacon timestamp
  * @beacon_int: beacon interval
  * @assoc_capability: capabilities taken from assoc resp
  * @basic_rates: bitmap of basic rates, each bit stands for an
@@ -286,9 +234,10 @@ enum ieee80211_rssi_event {
  * @mcast_rate: per-band multicast rate index + 1 (0: disabled)
  * @bssid: The BSSID for this BSS
  * @enable_beacon: whether beaconing should be enabled or not
- * @chandef: Channel definition for this BSS -- the hardware might be
- *      configured a higher bandwidth than this BSS uses, for example.
- * @ht_operation_mode: HT operation mode like in &struct ieee80211_ht_operation.
+ * @channel_type: Channel type for this BSS -- the hardware might be
+ *      configured for HT40+ while this BSS only uses no-HT, for
+ *      example.
+ * @ht_operation_mode: HT operation mode (like in &struct ieee80211_ht_info).
  *      This field is only valid when the channel type is one of the HT types.
  * @cqm_rssi_thold: Connection quality monitor RSSI threshold, a zero value
  *      implies disabled
@@ -306,20 +255,11 @@ enum ieee80211_rssi_event {
  * @idle: This interface is idle. There's also a global idle flag in the
  *      hardware config which may be more appropriate depending on what
  *      your driver/device needs to do.
- * @ps: power-save mode (STA only). This flag is NOT affected by
- *      offchannel/dynamic_ps operations.
- * @ssid: The SSID of the current vif. Only valid in AP-mode.
- * @ssid_len: Length of SSID given in @ssid.
- * @hidden_ssid: The SSID of the current vif is hidden. Only valid in AP-mode.
- * @txpower: TX power in dBm
- * @p2p_ctwindow: P2P CTWindow, only for P2P client interfaces
- * @p2p_oppps: P2P opportunistic PS is enabled
  */
 struct ieee80211_bss_conf {
         const u8 *bssid;
         /* association related data */
         bool assoc, ibss_joined;
-        bool ibss_creator;
         u16 aid;
         /* erp related data */
         bool use_cts_prot;
@@ -329,26 +269,18 @@ struct ieee80211_bss_conf {
         u8 dtim_period;
         u16 beacon_int;
         u16 assoc_capability;
-        u64 sync_tsf;
-        u32 sync_device_ts;
+        u64 timestamp;
         u32 basic_rates;
         int mcast_rate[IEEE80211_NUM_BANDS];
         u16 ht_operation_mode;
         s32 cqm_rssi_thold;
         u32 cqm_rssi_hyst;
-        struct cfg80211_chan_def chandef;
+        enum nl80211_channel_type channel_type;
         __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN];
         u8 arp_addr_cnt;
         bool arp_filter_enabled;
         bool qos;
         bool idle;
-        bool ps;
-        u8 ssid[IEEE80211_MAX_SSID_LEN];
-        size_t ssid_len;
-        bool hidden_ssid;
-        int txpower;
-        u8 p2p_ctwindow;
-        bool p2p_oppps;
 };
 
 /**
@@ -399,9 +331,9 @@ struct ieee80211_bss_conf {
  *      used to indicate that a frame was already retried due to PS
  * @IEEE80211_TX_INTFL_DONT_ENCRYPT: completely internal to mac80211,
  *      used to indicate frame should not be encrypted
- * @IEEE80211_TX_CTL_NO_PS_BUFFER: This frame is a response to a poll
- *      frame (PS-Poll or uAPSD) or a non-bufferable MMPDU and must
- *      be sent although the station is in powersave mode.
+ * @IEEE80211_TX_CTL_PSPOLL_RESPONSE: (internal?)
+ *      This frame is a response to a PS-poll frame and should be sent
+ *      although the station is in powersave mode.
  * @IEEE80211_TX_CTL_MORE_FRAMES: More frames will be passed to the
  *      transmit function after the current frame, this can be used
  *      by drivers to kick the DMA queue only if unset or when the
@@ -409,6 +341,8 @@ struct ieee80211_bss_conf {
  * @IEEE80211_TX_INTFL_RETRANSMISSION: This frame is being retransmitted
  *      after TX status because the destination was asleep, it must not
  *      be modified again (no seqno assignment, crypto, etc.)
+ * @IEEE80211_TX_INTFL_HAS_RADIOTAP: This frame was injected and still
+ *      has a radiotap header at skb->data.
  * @IEEE80211_TX_INTFL_NL80211_FRAME_TX: Frame was requested through nl80211
  *      MLME command (internal to mac80211 to figure out whether to send TX
  *      status to user space)
@@ -422,20 +356,6 @@ struct ieee80211_bss_conf {
  * @IEEE80211_TX_INTFL_TKIP_MIC_FAILURE: Marks this packet to be used for TKIP
  *      testing. It will be sent out with incorrect Michael MIC key to allow
  *      TKIP countermeasures to be tested.
- * @IEEE80211_TX_CTL_NO_CCK_RATE: This frame will be sent at non CCK rate.
- *      This flag is actually used for management frame especially for P2P
- *      frames not being sent at CCK rate in 2GHz band.
- * @IEEE80211_TX_STATUS_EOSP: This packet marks the end of service period,
- *      when its status is reported the service period ends. For frames in
- *      an SP that mac80211 transmits, it is already set; for driver frames
- *      the driver may set this flag. It is also used to do the same for
- *      PS-Poll responses.
- * @IEEE80211_TX_CTL_USE_MINRATE: This frame will be sent at lowest rate.
- *      This flag is used to send nullfunc frame at minimum rate when
- *      the nullfunc is used for connection monitoring purpose.
- * @IEEE80211_TX_CTL_DONTFRAG: Don't fragment this packet even if it
- *      would be fragmented by size (this is optional, only used for
- *      monitor injection).
  *
  * Note: If you have to add new flags to the enumeration, then don't
  *       forget to update %IEEE80211_TX_TEMPORARY_FLAGS when necessary.
@@ -457,19 +377,15 @@ enum mac80211_tx_control_flags {
         IEEE80211_TX_INTFL_NEED_TXPROCESSING    = BIT(14),
         IEEE80211_TX_INTFL_RETRIED              = BIT(15),
         IEEE80211_TX_INTFL_DONT_ENCRYPT         = BIT(16),
-        IEEE80211_TX_CTL_NO_PS_BUFFER           = BIT(17),
+        IEEE80211_TX_CTL_PSPOLL_RESPONSE        = BIT(17),
         IEEE80211_TX_CTL_MORE_FRAMES            = BIT(18),
         IEEE80211_TX_INTFL_RETRANSMISSION       = BIT(19),
-        /* hole at 20, use later */
+        IEEE80211_TX_INTFL_HAS_RADIOTAP         = BIT(20),
         IEEE80211_TX_INTFL_NL80211_FRAME_TX     = BIT(21),
         IEEE80211_TX_CTL_LDPC                   = BIT(22),
         IEEE80211_TX_CTL_STBC                   = BIT(23) | BIT(24),
         IEEE80211_TX_CTL_TX_OFFCHAN             = BIT(25),
         IEEE80211_TX_INTFL_TKIP_MIC_FAILURE     = BIT(26),
-        IEEE80211_TX_CTL_NO_CCK_RATE            = BIT(27),
-        IEEE80211_TX_STATUS_EOSP                = BIT(28),
-        IEEE80211_TX_CTL_USE_MINRATE            = BIT(29),
-        IEEE80211_TX_CTL_DONTFRAG               = BIT(30),
 };
 
 #define IEEE80211_TX_CTL_STBC_SHIFT             23
@@ -483,9 +399,9 @@ enum mac80211_tx_control_flags {
         IEEE80211_TX_CTL_SEND_AFTER_DTIM | IEEE80211_TX_CTL_AMPDU |           \
         IEEE80211_TX_STAT_TX_FILTERED | IEEE80211_TX_STAT_ACK |               \
         IEEE80211_TX_STAT_AMPDU | IEEE80211_TX_STAT_AMPDU_NO_BACK |           \
-        IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_NO_PS_BUFFER |    \
+        IEEE80211_TX_CTL_RATE_CTRL_PROBE | IEEE80211_TX_CTL_PSPOLL_RESPONSE | \
         IEEE80211_TX_CTL_MORE_FRAMES | IEEE80211_TX_CTL_LDPC |                \
-        IEEE80211_TX_CTL_STBC | IEEE80211_TX_STATUS_EOSP)
+        IEEE80211_TX_CTL_STBC)
 
 /**
  * enum mac80211_rate_control_flags - per-rate flags set by the
@@ -499,14 +415,9 @@ enum mac80211_tx_control_flags {
  *      This is set if the current BSS requires ERP protection.
  * @IEEE80211_TX_RC_USE_SHORT_PREAMBLE: Use short preamble.
  * @IEEE80211_TX_RC_MCS: HT rate.
- * @IEEE80211_TX_RC_VHT_MCS: VHT MCS rate, in this case the idx field is split
- *      into a higher 4 bits (Nss) and lower 4 bits (MCS number)
  * @IEEE80211_TX_RC_GREEN_FIELD: Indicates whether this rate should be used in
  *      Greenfield mode.
  * @IEEE80211_TX_RC_40_MHZ_WIDTH: Indicates if the Channel Width should be 40 MHz.
- * @IEEE80211_TX_RC_80_MHZ_WIDTH: Indicates 80 MHz transmission
- * @IEEE80211_TX_RC_160_MHZ_WIDTH: Indicates 160 MHz transmission
- *      (80+80 isn't supported yet)
  * @IEEE80211_TX_RC_DUP_DATA: The frame should be transmitted on both of the
  *      adjacent 20 MHz channels, if the current channel type is
  *      NL80211_CHAN_HT40MINUS or NL80211_CHAN_HT40PLUS.
@@ -517,15 +428,12 @@ enum mac80211_rate_control_flags {
         IEEE80211_TX_RC_USE_CTS_PROTECT         = BIT(1),
         IEEE80211_TX_RC_USE_SHORT_PREAMBLE      = BIT(2),
 
-        /* rate index is an HT/VHT MCS instead of an index */
+        /* rate index is an MCS rate number instead of an index */
         IEEE80211_TX_RC_MCS                     = BIT(3),
         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),
-        IEEE80211_TX_RC_VHT_MCS                 = BIT(8),
-        IEEE80211_TX_RC_80_MHZ_WIDTH            = BIT(9),
-        IEEE80211_TX_RC_160_MHZ_WIDTH           = BIT(10),
 };
 
 
@@ -536,7 +444,7 @@ enum mac80211_rate_control_flags {
 #define IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE 24
 
 /* maximum number of rate stages */
-#define IEEE80211_TX_MAX_RATES  4
+#define IEEE80211_TX_MAX_RATES  5
 
 /**
  * struct ieee80211_tx_rate - rate selection/status
@@ -568,32 +476,10 @@ enum mac80211_rate_control_flags {
  */
 struct ieee80211_tx_rate {
         s8 idx;
-        u16 count:5,
-            flags:11;
+        u8 count;
+        u8 flags;
 } __packed;
 
-#define IEEE80211_MAX_TX_RETRY          31
-
-static inline void ieee80211_rate_set_vht(struct ieee80211_tx_rate *rate,
-                                          u8 mcs, u8 nss)
-{
-        WARN_ON(mcs & ~0xF);
-        WARN_ON(nss & ~0x7);
-        rate->idx = (nss << 4) | mcs;
-}
-
-static inline u8
-ieee80211_rate_get_vht_mcs(const struct ieee80211_tx_rate *rate)
-{
-        return rate->idx & 0xF;
-}
-
-static inline u8
-ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate)
-{
-        return rate->idx >> 4;
-}
-
 /**
  * struct ieee80211_tx_info - skb transmit information
  *
@@ -602,10 +488,13 @@ ieee80211_rate_get_vht_nss(const struct ieee80211_tx_rate *rate)
  *  (2) driver internal use (if applicable)
  *  (3) TX status information - driver tells mac80211 what happened
  *
+ * The TX control's sta pointer is only valid during the ->tx call,
+ * it may be NULL.
+ *
  * @flags: transmit info flags, defined above
  * @band: the band to transmit on (use for checking for races)
- * @hw_queue: HW queue to put the frame on, skb_get_queue_mapping() gives the AC
- * @ack_frame_id: internal frame ID for TX status, used internally
+ * @antenna_sel_tx: antenna to use, 0 for automatic diversity
+ * @pad: padding, ignore
  * @control: union for control data
  * @status: union for status data
  * @driver_data: array of driver_data pointers
@@ -620,9 +509,10 @@ struct ieee80211_tx_info {
         u32 flags;
         u8 band;
 
-        u8 hw_queue;
+        u8 antenna_sel_tx;
 
-        u16 ack_frame_id;
+        /* 2 byte hole */
+        u8 pad[2];
 
         union {
                 struct {
@@ -632,7 +522,6 @@ struct ieee80211_tx_info {
                                         struct ieee80211_tx_rate rates[
                                                 IEEE80211_TX_MAX_RATES];
                                         s8 rts_cts_rate_idx;
-                                        /* 3 bytes free */
                                 };
                                 /* only needed before rate control */
                                 unsigned long jiffies;
@@ -640,15 +529,14 @@ struct ieee80211_tx_info {
                         /* NB: vif can be NULL for injected frames */
                         struct ieee80211_vif *vif;
                         struct ieee80211_key_conf *hw_key;
-                        /* 8 bytes free */
+                        struct ieee80211_sta *sta;
                 } control;
                 struct {
                         struct ieee80211_tx_rate rates[IEEE80211_TX_MAX_RATES];
-                        int ack_signal;
                         u8 ampdu_ack_len;
+                        int ack_signal;
                         u8 ampdu_len;
-                        u8 antenna;
-                        /* 21 bytes free */
+                        /* 15 bytes free */
                 } status;
                 struct {
                         struct ieee80211_tx_rate driver_rates[
@@ -715,7 +603,7 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
                 info->status.rates[i].count = 0;
 
         BUILD_BUG_ON(
-            offsetof(struct ieee80211_tx_info, status.ack_signal) != 20);
+            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));
@@ -738,66 +626,27 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info)
  *      the frame.
  * @RX_FLAG_FAILED_PLCP_CRC: Set this flag if the PCLP check failed on
  *      the frame.
- * @RX_FLAG_MACTIME_START: The timestamp passed in the RX status (@mactime
+ * @RX_FLAG_MACTIME_MPDU: The timestamp passed in the RX status (@mactime
  *      field) is valid and contains the time the first symbol of the MPDU
  *      was received. This is useful in monitor mode and for proper IBSS
  *      merging.
- * @RX_FLAG_MACTIME_END: The timestamp passed in the RX status (@mactime
- *      field) is valid and contains the time the last symbol of the MPDU
- *      (including FCS) was received.
  * @RX_FLAG_SHORTPRE: Short preamble was used for this frame
  * @RX_FLAG_HT: HT MCS was used and rate_idx is MCS index
- * @RX_FLAG_VHT: VHT MCS was used and rate_index is MCS index
  * @RX_FLAG_40MHZ: HT40 (40 MHz) was used
- * @RX_FLAG_80MHZ: 80 MHz was used
- * @RX_FLAG_80P80MHZ: 80+80 MHz was used
- * @RX_FLAG_160MHZ: 160 MHz was used
  * @RX_FLAG_SHORT_GI: Short guard interval was used
- * @RX_FLAG_NO_SIGNAL_VAL: The signal strength value is not present.
- *      Valid only for data frames (mainly A-MPDU)
- * @RX_FLAG_HT_GF: This frame was received in a HT-greenfield transmission, if
- *      the driver fills this value it should add %IEEE80211_RADIOTAP_MCS_HAVE_FMT
- *      to hw.radiotap_mcs_details to advertise that fact
- * @RX_FLAG_AMPDU_DETAILS: A-MPDU details are known, in particular the reference
- *      number (@ampdu_reference) must be populated and be a distinct number for
- *      each A-MPDU
- * @RX_FLAG_AMPDU_REPORT_ZEROLEN: driver reports 0-length subframes
- * @RX_FLAG_AMPDU_IS_ZEROLEN: This is a zero-length subframe, for
- *      monitoring purposes only
- * @RX_FLAG_AMPDU_LAST_KNOWN: last subframe is known, should be set on all
- *      subframes of a single A-MPDU
- * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU
- * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected
- *      on this subframe
- * @RX_FLAG_AMPDU_DELIM_CRC_KNOWN: The delimiter CRC field is known (the CRC
- *      is stored in the @ampdu_delimiter_crc field)
  */
 enum mac80211_rx_flags {
-        RX_FLAG_MMIC_ERROR              = BIT(0),
-        RX_FLAG_DECRYPTED               = BIT(1),
-        RX_FLAG_MMIC_STRIPPED           = BIT(3),
-        RX_FLAG_IV_STRIPPED             = BIT(4),
-        RX_FLAG_FAILED_FCS_CRC          = BIT(5),
-        RX_FLAG_FAILED_PLCP_CRC         = BIT(6),
-        RX_FLAG_MACTIME_START           = BIT(7),
-        RX_FLAG_SHORTPRE                = BIT(8),
-        RX_FLAG_HT                      = BIT(9),
-        RX_FLAG_40MHZ                   = BIT(10),
-        RX_FLAG_SHORT_GI                = BIT(11),
-        RX_FLAG_NO_SIGNAL_VAL           = BIT(12),
-        RX_FLAG_HT_GF                   = BIT(13),
-        RX_FLAG_AMPDU_DETAILS           = BIT(14),
-        RX_FLAG_AMPDU_REPORT_ZEROLEN    = BIT(15),
-        RX_FLAG_AMPDU_IS_ZEROLEN        = BIT(16),
-        RX_FLAG_AMPDU_LAST_KNOWN        = BIT(17),
-        RX_FLAG_AMPDU_IS_LAST           = BIT(18),
-        RX_FLAG_AMPDU_DELIM_CRC_ERROR   = BIT(19),
-        RX_FLAG_AMPDU_DELIM_CRC_KNOWN   = BIT(20),
-        RX_FLAG_MACTIME_END             = BIT(21),
-        RX_FLAG_VHT                     = BIT(22),
-        RX_FLAG_80MHZ                   = BIT(23),
-        RX_FLAG_80P80MHZ                = BIT(24),
-        RX_FLAG_160MHZ                  = BIT(25),
+        RX_FLAG_MMIC_ERROR      = 1<<0,
+        RX_FLAG_DECRYPTED       = 1<<1,
+        RX_FLAG_MMIC_STRIPPED   = 1<<3,
+        RX_FLAG_IV_STRIPPED     = 1<<4,
+        RX_FLAG_FAILED_FCS_CRC  = 1<<5,
+        RX_FLAG_FAILED_PLCP_CRC = 1<<6,
+        RX_FLAG_MACTIME_MPDU    = 1<<7,
+        RX_FLAG_SHORTPRE        = 1<<8,
+        RX_FLAG_HT              = 1<<9,
+        RX_FLAG_40MHZ           = 1<<10,
+        RX_FLAG_SHORT_GI        = 1<<11,
 };
 
 /**
@@ -809,8 +658,6 @@ enum mac80211_rx_flags {
  *
  * @mactime: value in microseconds of the 64-bit Time Synchronization Function
  *      (TSF) timer when the first data symbol (MPDU) arrived at the hardware.
- * @device_timestamp: arbitrary timestamp for the device, mac80211 doesn't use
- *      it but can store it and pass it back to the driver for synchronisation
  * @band: the active band when this frame was received
  * @freq: frequency the radio was tuned to when receiving this frame, in MHz
  * @signal: signal strength when receiving this frame, either in dBm, in dB or
@@ -818,39 +665,19 @@ enum mac80211_rx_flags {
  *      @IEEE80211_HW_SIGNAL_*
  * @antenna: antenna used
  * @rate_idx: index of data rate into band's supported rates or MCS index if
- *      HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT)
- * @vht_nss: number of streams (VHT only)
+ *      HT rates are use (RX_FLAG_HT)
  * @flag: %RX_FLAG_*
  * @rx_flags: internal RX flags for mac80211
- * @ampdu_reference: A-MPDU reference number, must be a different value for
- *      each A-MPDU but the same for each subframe within one A-MPDU
- * @ampdu_delimiter_crc: A-MPDU delimiter CRC
- * @vendor_radiotap_bitmap: radiotap vendor namespace presence bitmap
- * @vendor_radiotap_len: radiotap vendor namespace length
- * @vendor_radiotap_align: radiotap vendor namespace alignment. Note
- *      that the actual data must be at the start of the SKB data
- *      already.
- * @vendor_radiotap_oui: radiotap vendor namespace OUI
- * @vendor_radiotap_subns: radiotap vendor sub namespace
  */
 struct ieee80211_rx_status {
         u64 mactime;
-        u32 device_timestamp;
-        u32 ampdu_reference;
-        u32 flag;
-        u32 vendor_radiotap_bitmap;
-        u16 vendor_radiotap_len;
-        u16 freq;
-        u8 rate_idx;
-        u8 vht_nss;
-        u8 rx_flags;
-        u8 band;
-        u8 antenna;
-        s8 signal;
-        u8 ampdu_delimiter_crc;
-        u8 vendor_radiotap_align;
-        u8 vendor_radiotap_oui[3];
-        u8 vendor_radiotap_subns;
+        enum ieee80211_band band;
+        int freq;
+        int signal;
+        int antenna;
+        int rate_idx;
+        int flag;
+        unsigned int rx_flags;
 };
 
 /**
@@ -895,8 +722,6 @@ enum ieee80211_conf_flags {
  * @IEEE80211_CONF_CHANGE_RETRY_LIMITS: retry limits changed
  * @IEEE80211_CONF_CHANGE_IDLE: Idle flag changed
  * @IEEE80211_CONF_CHANGE_SMPS: Spatial multiplexing powersave mode changed
- *      Note that this is only valid if channel contexts are not used,
- *      otherwise each channel context has the number of chains listed.
  */
 enum ieee80211_conf_changed {
         IEEE80211_CONF_CHANGE_SMPS              = BIT(1),
@@ -948,8 +773,7 @@ enum ieee80211_smps_mode {
  *      powersave documentation below. This variable is valid only when
  *      the CONF_PS flag is set.
  *
- * @power_level: requested transmit power (in dBm), backward compatibility
- *      value only that is set to the minimum of all interfaces
+ * @power_level: requested transmit power (in dBm)
  *
  * @channel: the channel to tune to
  * @channel_type: the channel (HT) type
@@ -963,9 +787,7 @@ enum ieee80211_smps_mode {
  *
  * @smps_mode: spatial multiplexing powersave mode; note that
  *      %IEEE80211_SMPS_STATIC is used when the device is not
- *      configured for an HT channel.
- *      Note that this is only valid if channel contexts are not used,
- *      otherwise each channel context has the number of chains listed.
+ *      configured for an HT channel
  */
 struct ieee80211_conf {
         u32 flags;
@@ -1005,21 +827,6 @@ struct ieee80211_channel_switch {
 };
 
 /**
- * enum ieee80211_vif_flags - virtual interface flags
- *
- * @IEEE80211_VIF_BEACON_FILTER: the device performs beacon filtering
- *      on this virtual interface to avoid unnecessary CPU wakeups
- * @IEEE80211_VIF_SUPPORTS_CQM_RSSI: the device can do connection quality
- *      monitoring on this virtual interface -- i.e. it can monitor
- *      connection quality related parameters, such as the RSSI level and
- *      provide notifications if configured trigger levels are reached.
- */
-enum ieee80211_vif_flags {
-        IEEE80211_VIF_BEACON_FILTER             = BIT(0),
-        IEEE80211_VIF_SUPPORTS_CQM_RSSI         = BIT(1),
-};
-
-/**
  * struct ieee80211_vif - per-interface data
  *
  * Data in this structure is continually present for driver
@@ -1031,17 +838,6 @@ enum ieee80211_vif_flags {
  * @addr: address of this interface
  * @p2p: indicates whether this AP or STA interface is a p2p
  *      interface, i.e. a GO or p2p-sta respectively
- * @driver_flags: flags/capabilities the driver has for this interface,
- *      these need to be set (or cleared) when the interface is added
- *      or, if supported by the driver, the interface type is changed
- *      at runtime, mac80211 will never touch this field
- * @hw_queue: hardware queue for each AC
- * @cab_queue: content-after-beacon (DTIM beacon really) queue, AP mode only
- * @chanctx_conf: The channel context this interface is assigned to, or %NULL
- *      when it is not assigned. This pointer is RCU-protected due to the TX
- *      path needing to access it; even though the netdev carrier will always
- *      be off when it is %NULL there can still be races and packets could be
- *      processed after it switches back to %NULL.
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *).
  */
@@ -1050,14 +846,6 @@ struct ieee80211_vif {
         struct ieee80211_bss_conf bss_conf;
         u8 addr[ETH_ALEN];
         bool p2p;
-
-        u8 cab_queue;
-        u8 hw_queue[IEEE80211_NUM_ACS];
-
-        struct ieee80211_chanctx_conf __rcu *chanctx_conf;
-
-        u32 driver_flags;
-
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
@@ -1086,29 +874,16 @@ static inline bool ieee80211_vif_is_mesh(struct ieee80211_vif *vif)
  *      generation in software.
  * @IEEE80211_KEY_FLAG_PAIRWISE: Set by mac80211, this flag indicates
  *      that the key is pairwise rather then a shared key.
- * @IEEE80211_KEY_FLAG_SW_MGMT_TX: This flag should be set by the driver for a
+ * @IEEE80211_KEY_FLAG_SW_MGMT: This flag should be set by the driver for a
  *      CCMP key if it requires CCMP encryption of management frames (MFP) to
  *      be done in software.
- * @IEEE80211_KEY_FLAG_PUT_IV_SPACE: This flag should be set by the driver
- *      if space should be prepared for the IV, but the IV
- *      itself should not be generated. Do not set together with
- *      @IEEE80211_KEY_FLAG_GENERATE_IV on the same key.
- * @IEEE80211_KEY_FLAG_RX_MGMT: This key will be used to decrypt received
- *      management frames. The flag can help drivers that have a hardware
- *      crypto implementation that doesn't deal with management frames
- *      properly by allowing them to not upload the keys to hardware and
- *      fall back to software crypto. Note that this flag deals only with
- *      RX, if your crypto engine can't deal with TX you can also set the
- *      %IEEE80211_KEY_FLAG_SW_MGMT_TX flag to encrypt such frames in SW.
  */
 enum ieee80211_key_flags {
         IEEE80211_KEY_FLAG_WMM_STA      = 1<<0,
         IEEE80211_KEY_FLAG_GENERATE_IV  = 1<<1,
         IEEE80211_KEY_FLAG_GENERATE_MMIC= 1<<2,
         IEEE80211_KEY_FLAG_PAIRWISE     = 1<<3,
-        IEEE80211_KEY_FLAG_SW_MGMT_TX   = 1<<4,
-        IEEE80211_KEY_FLAG_PUT_IV_SPACE = 1<<5,
-        IEEE80211_KEY_FLAG_RX_MGMT      = 1<<6,
+        IEEE80211_KEY_FLAG_SW_MGMT      = 1<<4,
 };
 
 /**
@@ -1157,25 +932,6 @@ enum set_key_cmd {
 };
 
 /**
- * enum ieee80211_sta_state - station state
- *
- * @IEEE80211_STA_NOTEXIST: station doesn't exist at all,
- *      this is a special state for add/remove transitions
- * @IEEE80211_STA_NONE: station exists without special state
- * @IEEE80211_STA_AUTH: station is authenticated
- * @IEEE80211_STA_ASSOC: station is associated
- * @IEEE80211_STA_AUTHORIZED: station is authorized (802.1X)
- */
-enum ieee80211_sta_state {
-        /* NOTE: These need to be ordered correctly! */
-        IEEE80211_STA_NOTEXIST,
-        IEEE80211_STA_NONE,
-        IEEE80211_STA_AUTH,
-        IEEE80211_STA_ASSOC,
-        IEEE80211_STA_AUTHORIZED,
-};
-
-/**
  * struct ieee80211_sta - station table entry
  *
  * A station table entry represents a station we are possibly
@@ -1189,24 +945,16 @@ enum ieee80211_sta_state {
  * @aid: AID we assigned to the station if we're an AP
  * @supp_rates: Bitmap of supported rates (per band)
  * @ht_cap: HT capabilities of this STA; restricted to our own TX capabilities
- * @vht_cap: VHT capabilities of this STA; Not restricting any capabilities
- *      of remote STA. Taking as is.
  * @wme: indicates whether the STA supports WME. Only valid during AP-mode.
  * @drv_priv: data area for driver use, will always be aligned to
  *      sizeof(void *), size is determined in hw information.
- * @uapsd_queues: bitmap of queues configured for uapsd. Only valid
- *      if wme is supported.
- * @max_sp: max Service Period. Only valid if wme is supported.
  */
 struct ieee80211_sta {
         u32 supp_rates[IEEE80211_NUM_BANDS];
         u8 addr[ETH_ALEN];
         u16 aid;
         struct ieee80211_sta_ht_cap ht_cap;
-        struct ieee80211_sta_vht_cap vht_cap;
         bool wme;
-        u8 uapsd_queues;
-        u8 max_sp;
 
         /* must be last */
         u8 drv_priv[0] __attribute__((__aligned__(sizeof(void *))));
@@ -1226,16 +974,6 @@ enum sta_notify_cmd {
 };
 
 /**
- * struct ieee80211_tx_control - TX control data
- *
- * @sta: station table entry, this sta pointer may be NULL and
- *      it is not allowed to copy the pointer, due to RCU.
- */
-struct ieee80211_tx_control {
-        struct ieee80211_sta *sta;
-};
-
-/**
  * enum ieee80211_hw_flags - hardware flags
  *
  * These flags are used to indicate hardware capabilities to
@@ -1306,6 +1044,10 @@ struct ieee80211_tx_control {
  * @IEEE80211_HW_MFP_CAPABLE:
  *      Hardware supports management frame protection (MFP, IEEE 802.11w).
  *
+ * @IEEE80211_HW_BEACON_FILTER:
+ *      Hardware supports dropping of irrelevant beacon frames to
+ *      avoid waking up cpu.
+ *
  * @IEEE80211_HW_SUPPORTS_STATIC_SMPS:
  *      Hardware supports static spatial multiplexing powersave,
  *      ie. can turn off all but one chain even on HT connections
@@ -1331,6 +1073,11 @@ struct ieee80211_tx_control {
  *      When this flag is set, signaling beacon-loss will cause an immediate
  *      change to disassociated state.
  *
+ * @IEEE80211_HW_SUPPORTS_CQM_RSSI:
+ *      Hardware can do connection quality monitoring - i.e. it can monitor
+ *      connection quality related parameters, such as the RSSI level and
+ *      provide notifications if configured trigger levels are reached.
+ *
  * @IEEE80211_HW_NEED_DTIM_PERIOD:
  *      This device needs to know the DTIM period for the BSS before
  *      associating.
@@ -1348,31 +1095,6 @@ struct ieee80211_tx_control {
  *      stations based on the PM bit of incoming frames.
  *      Use ieee80211_start_ps()/ieee8021_end_ps() to manually configure
  *      the PS mode of connected stations.
- *
- * @IEEE80211_HW_TX_AMPDU_SETUP_IN_HW: The device handles TX A-MPDU session
- *      setup strictly in HW. mac80211 should not attempt to do this in
- *      software.
- *
- * @IEEE80211_HW_SCAN_WHILE_IDLE: The device can do hw scan while
- *      being idle (i.e. mac80211 doesn't have to go idle-off during the
- *      the scan).
- *
- * @IEEE80211_HW_WANT_MONITOR_VIF: The driver would like to be informed of
- *      a virtual monitor interface when monitor interfaces are the only
- *      active interfaces.
- *
- * @IEEE80211_HW_QUEUE_CONTROL: The driver wants to control per-interface
- *      queue mapping in order to use different queues (not just one per AC)
- *      for different virtual interfaces. See the doc section on HW queue
- *      control for more details.
- *
- * @IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF: Use the P2P Device address for any
- *      P2P Interface. This will be honoured even if more than one interface
- *      is supported.
- *
- * @IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL: On this hardware TX BA session
- *      should be tear down once BAR frame will not be acked.
- *
  */
 enum ieee80211_hw_flags {
         IEEE80211_HW_HAS_RATE_CONTROL                   = 1<<0,
@@ -1389,19 +1111,15 @@ enum ieee80211_hw_flags {
         IEEE80211_HW_PS_NULLFUNC_STACK                  = 1<<11,
         IEEE80211_HW_SUPPORTS_DYNAMIC_PS                = 1<<12,
         IEEE80211_HW_MFP_CAPABLE                        = 1<<13,
-        IEEE80211_HW_WANT_MONITOR_VIF                   = 1<<14,
+        IEEE80211_HW_BEACON_FILTER                      = 1<<14,
         IEEE80211_HW_SUPPORTS_STATIC_SMPS               = 1<<15,
         IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS              = 1<<16,
         IEEE80211_HW_SUPPORTS_UAPSD                     = 1<<17,
         IEEE80211_HW_REPORTS_TX_ACK_STATUS              = 1<<18,
         IEEE80211_HW_CONNECTION_MONITOR                 = 1<<19,
-        IEEE80211_HW_QUEUE_CONTROL                      = 1<<20,
+        IEEE80211_HW_SUPPORTS_CQM_RSSI                  = 1<<20,
         IEEE80211_HW_SUPPORTS_PER_STA_GTK               = 1<<21,
         IEEE80211_HW_AP_LINK_PS                         = 1<<22,
-        IEEE80211_HW_TX_AMPDU_SETUP_IN_HW               = 1<<23,
-        IEEE80211_HW_SCAN_WHILE_IDLE                    = 1<<24,
-        IEEE80211_HW_P2P_DEV_ADDR_FOR_INTF              = 1<<25,
-        IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAIL          = 1<<26,
 };
 
 /**
@@ -1446,8 +1164,6 @@ enum ieee80211_hw_flags {
  *      within &struct ieee80211_vif.
  * @sta_data_size: size (in bytes) of the drv_priv data area
  *      within &struct ieee80211_sta.
- * @chanctx_data_size: size (in bytes) of the drv_priv data area
- *      within &struct ieee80211_chanctx_conf.
  *
  * @max_rates: maximum number of alternate rate retry stages the hw
  *      can handle.
@@ -1469,22 +1185,6 @@ enum ieee80211_hw_flags {
  * @max_tx_aggregation_subframes: maximum number of subframes in an
  *      aggregate an HT driver will transmit, used by the peer as a
  *      hint to size its reorder buffer.
- *
- * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX
- *      (if %IEEE80211_HW_QUEUE_CONTROL is set)
- *
- * @radiotap_mcs_details: lists which MCS information can the HW
- *      reports, by default it is set to _MCS, _GI and _BW but doesn't
- *      include _FMT. Use %IEEE80211_RADIOTAP_MCS_HAVE_* values, only
- *      adding _BW is supported today.
- *
- * @radiotap_vht_details: lists which VHT MCS information the HW reports,
- *      the default is _GI | _BANDWIDTH.
- *      Use the %IEEE80211_RADIOTAP_VHT_KNOWN_* values.
- *
- * @netdev_features: netdev features to be set in each netdev created
- *      from this HW. Note only HW checksum features are currently
- *      compatible with mac80211. Other feature bits will be rejected.
  */
 struct ieee80211_hw {
         struct ieee80211_conf conf;
@@ -1496,7 +1196,6 @@ struct ieee80211_hw {
         int channel_change_time;
         int vif_data_size;
         int sta_data_size;
-        int chanctx_data_size;
         int napi_weight;
         u16 queues;
         u16 max_listen_interval;
@@ -1506,10 +1205,6 @@ struct ieee80211_hw {
         u8 max_rate_tries;
         u8 max_rx_aggregation_subframes;
         u8 max_tx_aggregation_subframes;
-        u8 offchannel_tx_hw_queue;
-        u8 radiotap_mcs_details;
-        u16 radiotap_vht_details;
-        netdev_features_t netdev_features;
 };
 
 /**
@@ -1551,7 +1246,7 @@ static inline struct ieee80211_rate *
 ieee80211_get_tx_rate(const struct ieee80211_hw *hw,
                       const struct ieee80211_tx_info *c)
 {
-        if (WARN_ON_ONCE(c->control.rates[0].idx < 0))
+        if (WARN_ON(c->control.rates[0].idx < 0))
                 return NULL;
         return &hw->wiphy->bands[c->band]->bitrates[c->control.rates[0].idx];
 }
@@ -1575,16 +1270,6 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
 }
 
 /**
- * ieee80211_free_txskb - free TX skb
- * @hw: the hardware
- * @skb: the skb
- *
- * Free a transmit skb. Use this funtion when some failure
- * to transmit happened and thus status cannot be reported.
- */
-void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
-
-/**
  * DOC: Hardware crypto acceleration
  *
  * mac80211 is capable of taking advantage of many hardware
@@ -1704,15 +1389,15 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  * DOC: Beacon filter support
  *
  * Some hardware have beacon filter support to reduce host cpu wakeups
- * which will reduce system power consumption. It usually works so that
+ * which will reduce system power consumption. It usuallly works so that
  * the firmware creates a checksum of the beacon but omits all constantly
  * changing elements (TSF, TIM etc). Whenever the checksum changes the
  * beacon is forwarded to the host, otherwise it will be just dropped. That
  * way the host will only receive beacons where some relevant information
  * (for example ERP protection or WMM settings) have changed.
  *
- * Beacon filter support is advertised with the %IEEE80211_VIF_BEACON_FILTER
- * interface capability. The driver needs to enable beacon filter support
+ * Beacon filter support is advertised with the %IEEE80211_HW_BEACON_FILTER
+ * hardware capability. The driver needs to enable beacon filter support
  * whenever power save is enabled, that is %IEEE80211_CONF_PS is set. When
  * power save is enabled, the stack will not check for beacon loss and the
  * driver needs to notify about loss of beacons with ieee80211_beacon_loss().
@@ -1826,153 +1511,6 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
  */
 
 /**
- * DOC: AP support for powersaving clients
- *
- * In order to implement AP and P2P GO modes, mac80211 has support for
- * client powersaving, both "legacy" PS (PS-Poll/null data) and uAPSD.
- * There currently is no support for sAPSD.
- *
- * There is one assumption that mac80211 makes, namely that a client
- * will not poll with PS-Poll and trigger with uAPSD at the same time.
- * Both are supported, and both can be used by the same client, but
- * they can't be used concurrently by the same client. This simplifies
- * the driver code.
- *
- * The first thing to keep in mind is that there is a flag for complete
- * driver implementation: %IEEE80211_HW_AP_LINK_PS. If this flag is set,
- * mac80211 expects the driver to handle most of the state machine for
- * powersaving clients and will ignore the PM bit in incoming frames.
- * Drivers then use ieee80211_sta_ps_transition() to inform mac80211 of
- * stations' powersave transitions. In this mode, mac80211 also doesn't
- * handle PS-Poll/uAPSD.
- *
- * In the mode without %IEEE80211_HW_AP_LINK_PS, mac80211 will check the
- * PM bit in incoming frames for client powersave transitions. When a
- * station goes to sleep, we will stop transmitting to it. There is,
- * however, a race condition: a station might go to sleep while there is
- * data buffered on hardware queues. If the device has support for this
- * it will reject frames, and the driver should give the frames back to
- * mac80211 with the %IEEE80211_TX_STAT_TX_FILTERED flag set which will
- * cause mac80211 to retry the frame when the station wakes up. The
- * driver is also notified of powersave transitions by calling its
- * @sta_notify callback.
- *
- * When the station is asleep, it has three choices: it can wake up,
- * it can PS-Poll, or it can possibly start a uAPSD service period.
- * Waking up is implemented by simply transmitting all buffered (and
- * filtered) frames to the station. This is the easiest case. When
- * the station sends a PS-Poll or a uAPSD trigger frame, mac80211
- * will inform the driver of this with the @allow_buffered_frames
- * callback; this callback is optional. mac80211 will then transmit
- * the frames as usual and set the %IEEE80211_TX_CTL_NO_PS_BUFFER
- * on each frame. The last frame in the service period (or the only
- * response to a PS-Poll) also has %IEEE80211_TX_STATUS_EOSP set to
- * indicate that it ends the service period; as this frame must have
- * TX status report it also sets %IEEE80211_TX_CTL_REQ_TX_STATUS.
- * When TX status is reported for this frame, the service period is
- * marked has having ended and a new one can be started by the peer.
- *
- * Additionally, non-bufferable MMPDUs can also be transmitted by
- * mac80211 with the %IEEE80211_TX_CTL_NO_PS_BUFFER set in them.
- *
- * Another race condition can happen on some devices like iwlwifi
- * when there are frames queued for the station and it wakes up
- * or polls; the frames that are already queued could end up being
- * transmitted first instead, causing reordering and/or wrong
- * processing of the EOSP. The cause is that allowing frames to be
- * transmitted to a certain station is out-of-band communication to
- * the device. To allow this problem to be solved, the driver can
- * call ieee80211_sta_block_awake() if frames are buffered when it
- * is notified that the station went to sleep. When all these frames
- * have been filtered (see above), it must call the function again
- * to indicate that the station is no longer blocked.
- *
- * If the driver buffers frames in the driver for aggregation in any
- * way, it must use the ieee80211_sta_set_buffered() call when it is
- * notified of the station going to sleep to inform mac80211 of any
- * TIDs that have frames buffered. Note that when a station wakes up
- * this information is reset (hence the requirement to call it when
- * informed of the station going to sleep). Then, when a service
- * period starts for any reason, @release_buffered_frames is called
- * with the number of frames to be released and which TIDs they are
- * to come from. In this case, the driver is responsible for setting
- * the EOSP (for uAPSD) and MORE_DATA bits in the released frames,
- * to help the @more_data paramter is passed to tell the driver if
- * there is more data on other TIDs -- the TIDs to release frames
- * from are ignored since mac80211 doesn't know how many frames the
- * buffers for those TIDs contain.
- *
- * If the driver also implement GO mode, where absence periods may
- * shorten service periods (or abort PS-Poll responses), it must
- * filter those response frames except in the case of frames that
- * are buffered in the driver -- those must remain buffered to avoid
- * reordering. Because it is possible that no frames are released
- * in this case, the driver must call ieee80211_sta_eosp_irqsafe()
- * to indicate to mac80211 that the service period ended anyway.
- *
- * Finally, if frames from multiple TIDs are released from mac80211
- * but the driver might reorder them, it must clear & set the flags
- * appropriately (only the last frame may have %IEEE80211_TX_STATUS_EOSP)
- * and also take care of the EOSP and MORE_DATA bits in the frame.
- * The driver may also use ieee80211_sta_eosp_irqsafe() in this case.
- */
-
-/**
- * DOC: HW queue control
- *
- * Before HW queue control was introduced, mac80211 only had a single static
- * assignment of per-interface AC software queues to hardware queues. This
- * was problematic for a few reasons:
- * 1) off-channel transmissions might get stuck behind other frames
- * 2) multiple virtual interfaces couldn't be handled correctly
- * 3) after-DTIM frames could get stuck behind other frames
- *
- * To solve this, hardware typically uses multiple different queues for all
- * the different usages, and this needs to be propagated into mac80211 so it
- * won't have the same problem with the software queues.
- *
- * Therefore, mac80211 now offers the %IEEE80211_HW_QUEUE_CONTROL capability
- * flag that tells it that the driver implements its own queue control. To do
- * so, the driver will set up the various queues in each &struct ieee80211_vif
- * and the offchannel queue in &struct ieee80211_hw. In response, mac80211 will
- * use those queue IDs in the hw_queue field of &struct ieee80211_tx_info and
- * if necessary will queue the frame on the right software queue that mirrors
- * the hardware queue.
- * Additionally, the driver has to then use these HW queue IDs for the queue
- * management functions (ieee80211_stop_queue() et al.)
- *
- * The driver is free to set up the queue mappings as needed, multiple virtual
- * interfaces may map to the same hardware queues if needed. The setup has to
- * happen during add_interface or change_interface callbacks. For example, a
- * driver supporting station+station and station+AP modes might decide to have
- * 10 hardware queues to handle different scenarios:
- *
- * 4 AC HW queues for 1st vif: 0, 1, 2, 3
- * 4 AC HW queues for 2nd vif: 4, 5, 6, 7
- * after-DTIM queue for AP:   8
- * off-channel queue:         9
- *
- * It would then set up the hardware like this:
- *   hw.offchannel_tx_hw_queue = 9
- *
- * and the first virtual interface that is added as follows:
- *   vif.hw_queue[IEEE80211_AC_VO] = 0
- *   vif.hw_queue[IEEE80211_AC_VI] = 1
- *   vif.hw_queue[IEEE80211_AC_BE] = 2
- *   vif.hw_queue[IEEE80211_AC_BK] = 3
- *   vif.cab_queue = 8 // if AP mode, otherwise %IEEE80211_INVAL_HW_QUEUE
- * and the second virtual interface with 4-7.
- *
- * If queue 6 gets full, for example, mac80211 would only stop the second
- * virtual interface's BE queue since virtual interface queues are per AC.
- *
- * Note that the vif.cab_queue value should be set to %IEEE80211_INVAL_HW_QUEUE
- * whenever the queue is not used (i.e. the interface is not in AP mode) if the
- * queue could potentially be shared since mac80211 will look at cab_queue when
- * a queue is stopped/woken even if the interface is not in AP mode.
- */
-
-/**
  * enum ieee80211_filter_flags - hardware filter flags
  *
  * These flags determine what the filter in hardware should be
@@ -2048,30 +1586,17 @@ enum ieee80211_ampdu_mlme_action {
 };
 
 /**
- * enum ieee80211_frame_release_type - frame release reason
- * @IEEE80211_FRAME_RELEASE_PSPOLL: frame released for PS-Poll
- * @IEEE80211_FRAME_RELEASE_UAPSD: frame(s) released due to
- *      frame received on trigger-enabled AC
- */
-enum ieee80211_frame_release_type {
-        IEEE80211_FRAME_RELEASE_PSPOLL,
-        IEEE80211_FRAME_RELEASE_UAPSD,
-};
-
-/**
- * enum ieee80211_rate_control_changed - flags to indicate what changed
- *
- * @IEEE80211_RC_BW_CHANGED: The bandwidth that can be used to transmit
- *      to this station changed.
- * @IEEE80211_RC_SMPS_CHANGED: The SMPS state of the station changed.
- * @IEEE80211_RC_SUPP_RATES_CHANGED: The supported rate set of this peer
- *      changed (in IBSS mode) due to discovering more information about
- *      the peer.
- */
-enum ieee80211_rate_control_changed {
-        IEEE80211_RC_BW_CHANGED         = BIT(0),
-        IEEE80211_RC_SMPS_CHANGED       = BIT(1),
-        IEEE80211_RC_SUPP_RATES_CHANGED = BIT(2),
+ * enum ieee80211_tx_sync_type - TX sync type
+ * @IEEE80211_TX_SYNC_AUTH: sync TX for authentication
+ *      (and possibly also before direct probe)
+ * @IEEE80211_TX_SYNC_ASSOC: sync TX for association
+ * @IEEE80211_TX_SYNC_ACTION: sync TX for action frame
+ *      (not implemented yet)
+ */
+enum ieee80211_tx_sync_type {
+        IEEE80211_TX_SYNC_AUTH,
+        IEEE80211_TX_SYNC_ASSOC,
+        IEEE80211_TX_SYNC_ACTION,
 };
 
 /**
@@ -2085,8 +1610,11 @@ enum ieee80211_rate_control_changed {
  *      skb contains the buffer starting from the IEEE 802.11 header.
  *      The low-level driver should send the frame out based on
  *      configuration in the TX control data. This handler should,
- *      preferably, never fail and stop queues appropriately.
- *      Must be atomic.
+ *      preferably, never fail and stop queues appropriately, more
+ *      importantly, however, it must never fail for A-MPDU-queues.
+ *      This function should return NETDEV_TX_OK except in very
+ *      limited cases.
+ *      Must be implemented and atomic.
  *
  * @start: Called before the first netdevice attached to the hardware
  *      is enabled. This should turn on the hardware and must turn on
@@ -2122,11 +1650,6 @@ enum ieee80211_rate_control_changed {
  *      to also unregister the device. If it returns 1, then mac80211
  *      will also go through the regular complete restart on resume.
  *
- * @set_wakeup: Enable or disable wakeup when WoWLAN configuration is
- *      modified. The reason is that device_set_wakeup_enable() is
- *      supposed to be called when the configuration changes, not only
- *      in suspend().
- *
  * @add_interface: Called when a netdevice attached to the hardware is
  *      enabled. Because it is not called for monitor mode devices, @start
  *      and @stop must be implemented.
@@ -2165,6 +1688,26 @@ enum ieee80211_rate_control_changed {
  *      of the bss parameters has changed when a call is made. The callback
  *      can sleep.
  *
+ * @tx_sync: Called before a frame is sent to an AP/GO. In the GO case, the
+ *      driver should sync with the GO's powersaving so the device doesn't
+ *      transmit the frame while the GO is asleep. In the regular AP case
+ *      it may be used by drivers for devices implementing other restrictions
+ *      on talking to APs, e.g. due to regulatory enforcement or just HW
+ *      restrictions.
+ *      This function is called for every authentication, association and
+ *      action frame separately since applications might attempt to auth
+ *      with multiple APs before chosing one to associate to. If it returns
+ *      an error, the corresponding authentication, association or frame
+ *      transmission is aborted and reported as having failed. It is always
+ *      called after tuning to the correct channel.
+ *      The callback might be called multiple times before @finish_tx_sync
+ *      (but @finish_tx_sync will be called once for each) but in practice
+ *      this is unlikely to happen. It can also refuse in that case if the
+ *      driver cannot handle that situation.
+ *      This callback can sleep.
+ * @finish_tx_sync: Called as a counterpart to @tx_sync, unless that returned
+ *      an error. This callback can sleep.
+ *
  * @prepare_multicast: Prepare for multicast filter configuration.
  *      This callback is optional, and its return value is passed
  *      to configure_filter(). This callback must be atomic.
@@ -2255,34 +1798,11 @@ enum ieee80211_rate_control_changed {
  * @sta_remove: Notifies low level driver about removal of an associated
  *      station, AP, IBSS/WDS/mesh peer etc. This callback can sleep.
  *
- * @sta_add_debugfs: Drivers can use this callback to add debugfs files
- *      when a station is added to mac80211's station list. This callback
- *      and @sta_remove_debugfs should be within a CONFIG_MAC80211_DEBUGFS
- *      conditional. This callback can sleep.
- *
- * @sta_remove_debugfs: Remove the debugfs files which were added using
- *      @sta_add_debugfs. This callback can sleep.
- *
  * @sta_notify: Notifies low level driver about power state transition of an
  *      associated station, AP,  IBSS/WDS/mesh peer etc. For a VIF operating
  *      in AP mode, this callback will not be called when the flag
  *      %IEEE80211_HW_AP_LINK_PS is set. Must be atomic.
  *
- * @sta_state: Notifies low level driver about state transition of a
- *      station (which can be the AP, a client, IBSS/WDS/mesh peer etc.)
- *      This callback is mutually exclusive with @sta_add/@sta_remove.
- *      It must not fail for down transitions but may fail for transitions
- *      up the list of states.
- *      The callback can sleep.
- *
- * @sta_rc_update: Notifies the driver of changes to the bitrates that can be
- *      used to transmit to the station. The changes are advertised with bits
- *      from &enum ieee80211_rate_control_changed and the values are reflected
- *      in the station data. This callback should only be used when the driver
- *      uses hardware rate control (%IEEE80211_HW_HAS_RATE_CONTROL) since
- *      otherwise the rate control algorithm is notified directly.
- *      Must be atomic.
- *
  * @conf_tx: Configure TX queue parameters (EDCF (aifs, cw_min, cw_max),
  *      bursting) for a hardware TX queue.
  *      Returns a negative error code on failure.
@@ -2373,12 +1893,14 @@ enum ieee80211_rate_control_changed {
  *      offload. Frames to transmit on the off-channel channel are transmitted
  *      normally except for the %IEEE80211_TX_CTL_TX_OFFCHAN flag. When the
  *      duration (which will always be non-zero) expires, the driver must call
- *      ieee80211_remain_on_channel_expired().
- *      Note that this callback may be called while the device is in IDLE and
- *      must be accepted in this case.
- *      This callback may sleep.
+ *      ieee80211_remain_on_channel_expired(). This callback may sleep.
  * @cancel_remain_on_channel: Requests that an ongoing off-channel period is
  *      aborted before it expires. This callback may sleep.
+ * @offchannel_tx: Transmit frame on another channel, wait for a response
+ *      and return. Reliable TX status must be reported for the frame. If the
+ *      return value is 1, then the @remain_on_channel will be used with a
+ *      regular transmission (if supported.)
+ * @offchannel_tx_cancel_wait: cancel wait associated with offchannel TX
  *
  * @set_ringparam: Set tx and rx ring sizes.
  *
@@ -2392,100 +1914,14 @@ enum ieee80211_rate_control_changed {
  *      The callback can sleep.
  * @rssi_callback: Notify driver when the average RSSI goes above/below
  *      thresholds that were registered previously. The callback can sleep.
- *
- * @release_buffered_frames: Release buffered frames according to the given
- *      parameters. In the case where the driver buffers some frames for
- *      sleeping stations mac80211 will use this callback to tell the driver
- *      to release some frames, either for PS-poll or uAPSD.
- *      Note that if the @more_data paramter is %false the driver must check
- *      if there are more frames on the given TIDs, and if there are more than
- *      the frames being released then it must still set the more-data bit in
- *      the frame. If the @more_data parameter is %true, then of course the
- *      more-data bit must always be set.
- *      The @tids parameter tells the driver which TIDs to release frames
- *      from, for PS-poll it will always have only a single bit set.
- *      In the case this is used for a PS-poll initiated release, the
- *      @num_frames parameter will always be 1 so code can be shared. In
- *      this case the driver must also set %IEEE80211_TX_STATUS_EOSP flag
- *      on the TX status (and must report TX status) so that the PS-poll
- *      period is properly ended. This is used to avoid sending multiple
- *      responses for a retried PS-poll frame.
- *      In the case this is used for uAPSD, the @num_frames parameter may be
- *      bigger than one, but the driver may send fewer frames (it must send
- *      at least one, however). In this case it is also responsible for
- *      setting the EOSP flag in the QoS header of the frames. Also, when the
- *      service period ends, the driver must set %IEEE80211_TX_STATUS_EOSP
- *      on the last frame in the SP. Alternatively, it may call the function
- *      ieee80211_sta_eosp_irqsafe() to inform mac80211 of the end of the SP.
- *      This callback must be atomic.
- * @allow_buffered_frames: Prepare device to allow the given number of frames
- *      to go out to the given station. The frames will be sent by mac80211
- *      via the usual TX path after this call. The TX information for frames
- *      released will also have the %IEEE80211_TX_CTL_NO_PS_BUFFER flag set
- *      and the last one will also have %IEEE80211_TX_STATUS_EOSP set. In case
- *      frames from multiple TIDs are released and the driver might reorder
- *      them between the TIDs, it must set the %IEEE80211_TX_STATUS_EOSP flag
- *      on the last frame and clear it on all others and also handle the EOSP
- *      bit in the QoS header correctly. Alternatively, it can also call the
- *      ieee80211_sta_eosp_irqsafe() function.
- *      The @tids parameter is a bitmap and tells the driver which TIDs the
- *      frames will be on; it will at most have two bits set.
- *      This callback must be atomic.
- *
- * @get_et_sset_count:  Ethtool API to get string-set count.
- *
- * @get_et_stats:  Ethtool API to get a set of u64 stats.
- *
- * @get_et_strings:  Ethtool API to get a set of strings to describe stats
- *      and perhaps other supported types of ethtool data-sets.
- *
- * @get_rssi: Get current signal strength in dBm, the function is optional
- *      and can sleep.
- *
- * @mgd_prepare_tx: Prepare for transmitting a management frame for association
- *      before associated. In multi-channel scenarios, a virtual interface is
- *      bound to a channel before it is associated, but as it isn't associated
- *      yet it need not necessarily be given airtime, in particular since any
- *      transmission to a P2P GO needs to be synchronized against the GO's
- *      powersave state. mac80211 will call this function before transmitting a
- *      management frame prior to having successfully associated to allow the
- *      driver to give it channel time for the transmission, to get a response
- *      and to be able to synchronize with the GO.
- *      The callback will be called before each transmission and upon return
- *      mac80211 will transmit the frame right away.
- *      The callback is optional and can (should!) sleep.
- *
- * @add_chanctx: Notifies device driver about new channel context creation.
- * @remove_chanctx: Notifies device driver about channel context destruction.
- * @change_chanctx: Notifies device driver about channel context changes that
- *      may happen when combining different virtual interfaces on the same
- *      channel context with different settings
- * @assign_vif_chanctx: Notifies device driver about channel context being bound
- *      to vif. Possible use is for hw queue remapping.
- * @unassign_vif_chanctx: Notifies device driver about channel context being
- *      unbound from vif.
- * @start_ap: Start operation on the AP interface, this is called after all the
- *      information in bss_conf is set and beacon can be retrieved. A channel
- *      context is bound before this is called. Note that if the driver uses
- *      software scan or ROC, this (and @stop_ap) isn't called when the AP is
- *      just "paused" for scanning/ROC, which is indicated by the beacon being
- *      disabled/enabled via @bss_info_changed.
- * @stop_ap: Stop operation on the AP interface.
- *
- * @restart_complete: Called after a call to ieee80211_restart_hw(), when the
- *      reconfiguration has completed. This can help the driver implement the
- *      reconfiguration step. This callback may sleep.
  */
 struct ieee80211_ops {
-        void (*tx)(struct ieee80211_hw *hw,
-                   struct ieee80211_tx_control *control,
-                   struct sk_buff *skb);
+        void (*tx)(struct ieee80211_hw *hw, struct sk_buff *skb);
         int (*start)(struct ieee80211_hw *hw);
         void (*stop)(struct ieee80211_hw *hw);
 #ifdef CONFIG_PM
         int (*suspend)(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan);
         int (*resume)(struct ieee80211_hw *hw);
-        void (*set_wakeup)(struct ieee80211_hw *hw, bool enabled);
 #endif
         int (*add_interface)(struct ieee80211_hw *hw,
                              struct ieee80211_vif *vif);
@@ -2500,8 +1936,12 @@ struct ieee80211_ops {
                                  struct ieee80211_bss_conf *info,
                                  u32 changed);
 
-        int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
-        void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
+        int (*tx_sync)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+                       const u8 *bssid, enum ieee80211_tx_sync_type type);
+        void (*finish_tx_sync)(struct ieee80211_hw *hw,
+                               struct ieee80211_vif *vif,
+                               const u8 *bssid,
+                               enum ieee80211_tx_sync_type type);
 
         u64 (*prepare_multicast)(struct ieee80211_hw *hw,
                                  struct netdev_hw_addr_list *mc_list);
@@ -2544,33 +1984,13 @@ struct ieee80211_ops {
                        struct ieee80211_sta *sta);
         int (*sta_remove)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                           struct ieee80211_sta *sta);
-#ifdef CONFIG_MAC80211_DEBUGFS
-        void (*sta_add_debugfs)(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ieee80211_sta *sta,
-                                struct dentry *dir);
-        void (*sta_remove_debugfs)(struct ieee80211_hw *hw,
-                                   struct ieee80211_vif *vif,
-                                   struct ieee80211_sta *sta,
-                                   struct dentry *dir);
-#endif
         void (*sta_notify)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                         enum sta_notify_cmd, struct ieee80211_sta *sta);
-        int (*sta_state)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                         struct ieee80211_sta *sta,
-                         enum ieee80211_sta_state old_state,
-                         enum ieee80211_sta_state new_state);
-        void (*sta_rc_update)(struct ieee80211_hw *hw,
-                              struct ieee80211_vif *vif,
-                              struct ieee80211_sta *sta,
-                              u32 changed);
-        int (*conf_tx)(struct ieee80211_hw *hw,
-                       struct ieee80211_vif *vif, u16 ac,
+        int (*conf_tx)(struct ieee80211_hw *hw, u16 queue,
                        const struct ieee80211_tx_queue_params *params);
-        u64 (*get_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
-        void (*set_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                        u64 tsf);
-        void (*reset_tsf)(struct ieee80211_hw *hw, struct ieee80211_vif *vif);
+        u64 (*get_tsf)(struct ieee80211_hw *hw);
+        void (*set_tsf)(struct ieee80211_hw *hw, u64 tsf);
+        void (*reset_tsf)(struct ieee80211_hw *hw);
         int (*tx_last_beacon)(struct ieee80211_hw *hw);
         int (*ampdu_action)(struct ieee80211_hw *hw,
                             struct ieee80211_vif *vif,
@@ -2595,10 +2015,15 @@ struct ieee80211_ops {
         int (*get_antenna)(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant);
 
         int (*remain_on_channel)(struct ieee80211_hw *hw,
-                                 struct ieee80211_vif *vif,
                                  struct ieee80211_channel *chan,
+                                 enum nl80211_channel_type channel_type,
                                  int duration);
         int (*cancel_remain_on_channel)(struct ieee80211_hw *hw);
+        int (*offchannel_tx)(struct ieee80211_hw *hw, struct sk_buff *skb,
+                             struct ieee80211_channel *chan,
+                             enum nl80211_channel_type channel_type,
+                             unsigned int wait);
+        int (*offchannel_tx_cancel_wait)(struct ieee80211_hw *hw);
         int (*set_ringparam)(struct ieee80211_hw *hw, u32 tx, u32 rx);
         void (*get_ringparam)(struct ieee80211_hw *hw,
                               u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max);
@@ -2607,47 +2032,6 @@ struct ieee80211_ops {
                                 const struct cfg80211_bitrate_mask *mask);
         void (*rssi_callback)(struct ieee80211_hw *hw,
                               enum ieee80211_rssi_event rssi_event);
-
-        void (*allow_buffered_frames)(struct ieee80211_hw *hw,
-                                      struct ieee80211_sta *sta,
-                                      u16 tids, int num_frames,
-                                      enum ieee80211_frame_release_type reason,
-                                      bool more_data);
-        void (*release_buffered_frames)(struct ieee80211_hw *hw,
-                                        struct ieee80211_sta *sta,
-                                        u16 tids, int num_frames,
-                                        enum ieee80211_frame_release_type reason,
-                                        bool more_data);
-
-        int     (*get_et_sset_count)(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif, int sset);
-        void    (*get_et_stats)(struct ieee80211_hw *hw,
-                                struct ieee80211_vif *vif,
-                                struct ethtool_stats *stats, u64 *data);
-        void    (*get_et_strings)(struct ieee80211_hw *hw,
-                                  struct ieee80211_vif *vif,
-                                  u32 sset, u8 *data);
-        int     (*get_rssi)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                            struct ieee80211_sta *sta, s8 *rssi_dbm);
-
-        void    (*mgd_prepare_tx)(struct ieee80211_hw *hw,
-                                  struct ieee80211_vif *vif);
-
-        int (*add_chanctx)(struct ieee80211_hw *hw,
-                           struct ieee80211_chanctx_conf *ctx);
-        void (*remove_chanctx)(struct ieee80211_hw *hw,
-                               struct ieee80211_chanctx_conf *ctx);
-        void (*change_chanctx)(struct ieee80211_hw *hw,
-                               struct ieee80211_chanctx_conf *ctx,
-                               u32 changed);
-        int (*assign_vif_chanctx)(struct ieee80211_hw *hw,
-                                  struct ieee80211_vif *vif,
-                                  struct ieee80211_chanctx_conf *ctx);
-        void (*unassign_vif_chanctx)(struct ieee80211_hw *hw,
-                                     struct ieee80211_vif *vif,
-                                     struct ieee80211_chanctx_conf *ctx);
-
-        void (*restart_complete)(struct ieee80211_hw *hw);
 };
 
 /**
@@ -2962,38 +2346,20 @@ static inline int ieee80211_sta_ps_transition_ni(struct ieee80211_sta *sta,
  * The TX headroom reserved by mac80211 for its own tx_status functions.
  * This is enough for the radiotap header.
  */
-#define IEEE80211_TX_STATUS_HEADROOM    14
+#define IEEE80211_TX_STATUS_HEADROOM    13
 
 /**
- * ieee80211_sta_set_buffered - inform mac80211 about driver-buffered frames
+ * ieee80211_sta_set_tim - set the TIM bit for a sleeping station
  * @sta: &struct ieee80211_sta pointer for the sleeping station
- * @tid: the TID that has buffered frames
- * @buffered: indicates whether or not frames are buffered for this TID
  *
  * If a driver buffers frames for a powersave station instead of passing
- * them back to mac80211 for retransmission, the station may still need
- * to be told that there are buffered frames via the TIM bit.
- *
- * This function informs mac80211 whether or not there are frames that are
- * buffered in the driver for a given TID; mac80211 can then use this data
- * to set the TIM bit (NOTE: This may call back into the driver's set_tim
- * call! Beware of the locking!)
- *
- * If all frames are released to the station (due to PS-poll or uAPSD)
- * then the driver needs to inform mac80211 that there no longer are
- * frames buffered. However, when the station wakes up mac80211 assumes
- * that all buffered frames will be transmitted and clears this data,
- * drivers need to make sure they inform mac80211 about all buffered
- * frames on the sleep transition (sta_notify() with %STA_NOTIFY_SLEEP).
- *
- * Note that technically mac80211 only needs to know this per AC, not per
- * TID, but since driver buffering will inevitably happen per TID (since
- * it is related to aggregation) it is easier to make mac80211 map the
- * TID to the AC as required instead of keeping track in all drivers that
- * use this API.
- */
-void ieee80211_sta_set_buffered(struct ieee80211_sta *sta,
-                                u8 tid, bool buffered);
+ * them back to mac80211 for retransmission, the station needs to be told
+ * to wake up using the TIM bitmap in the beacon.
+ *
+ * This function sets the station's TIM bit - it will be cleared when the
+ * station wakes up.
+ */
+void ieee80211_sta_set_tim(struct ieee80211_sta *sta);
 
 /**
  * ieee80211_tx_status - transmit status callback
@@ -3101,19 +2467,6 @@ static inline struct sk_buff *ieee80211_beacon_get(struct ieee80211_hw *hw,
 }
 
 /**
- * ieee80211_proberesp_get - retrieve a Probe Response template
- * @hw: pointer obtained from ieee80211_alloc_hw().
- * @vif: &struct ieee80211_vif pointer from the add_interface callback.
- *
- * Creates a Probe Response template which can, for example, be uploaded to
- * hardware. The destination address should be set by the caller.
- *
- * Can only be called in AP mode.
- */
-struct sk_buff *ieee80211_proberesp_get(struct ieee80211_hw *hw,
-                                        struct ieee80211_vif *vif);
-
-/**
  * ieee80211_pspoll_get - retrieve a PS Poll template
  * @hw: pointer obtained from ieee80211_alloc_hw().
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
@@ -3149,7 +2502,8 @@ struct sk_buff *ieee80211_nullfunc_get(struct ieee80211_hw *hw,
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  * @ssid: SSID buffer
  * @ssid_len: length of SSID
- * @tailroom: tailroom to reserve at end of SKB for IEs
+ * @ie: buffer containing all IEs except SSID for the template
+ * @ie_len: length of the IE buffer
  *
  * Creates a Probe Request template which can, for example, be uploaded to
  * hardware.
@@ -3157,7 +2511,7 @@ struct sk_buff *ieee80211_nullfunc_get(struct ieee80211_hw *hw,
 struct sk_buff *ieee80211_probereq_get(struct ieee80211_hw *hw,
                                        struct ieee80211_vif *vif,
                                        const u8 *ssid, size_t ssid_len,
-                                       size_t tailroom);
+                                       const u8 *ie, size_t ie_len);
 
 /**
  * ieee80211_rts_get - RTS frame generation function
@@ -3233,7 +2587,6 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
  * ieee80211_generic_frame_duration - Calculate the duration field for a frame
  * @hw: pointer obtained from ieee80211_alloc_hw().
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
- * @band: the band to calculate the frame duration on
  * @frame_len: the length of the frame.
  * @rate: the rate at which the frame is going to be transmitted.
  *
@@ -3242,7 +2595,6 @@ __le16 ieee80211_ctstoself_duration(struct ieee80211_hw *hw,
  */
 __le16 ieee80211_generic_frame_duration(struct ieee80211_hw *hw,
                                         struct ieee80211_vif *vif,
-                                        enum ieee80211_band band,
                                         size_t frame_len,
                                         struct ieee80211_rate *rate);
 
@@ -3331,19 +2683,6 @@ void ieee80211_get_tkip_p2k(struct ieee80211_key_conf *keyconf,
                             struct sk_buff *skb, u8 *p2k);
 
 /**
- * ieee80211_aes_cmac_calculate_k1_k2 - calculate the AES-CMAC sub keys
- *
- * This function computes the two AES-CMAC sub-keys, based on the
- * previously installed master key.
- *
- * @keyconf: the parameter passed with the set key
- * @k1: a buffer to be filled with the 1st sub-key
- * @k2: a buffer to be filled with the 2nd sub-key
- */
-void ieee80211_aes_cmac_calculate_k1_k2(struct ieee80211_key_conf *keyconf,
-                                        u8 *k1, u8 *k2);
-
-/**
  * struct ieee80211_key_seq - key sequence counter
  *
  * @tkip: TKIP data, containing IV32 and IV16 in host byte order
@@ -3493,21 +2832,6 @@ void ieee80211_sched_scan_results(struct ieee80211_hw *hw);
 void ieee80211_sched_scan_stopped(struct ieee80211_hw *hw);
 
 /**
- * enum ieee80211_interface_iteration_flags - interface iteration flags
- * @IEEE80211_IFACE_ITER_NORMAL: Iterate over all interfaces that have
- *      been added to the driver; However, note that during hardware
- *      reconfiguration (after restart_hw) it will iterate over a new
- *      interface and over all the existing interfaces even if they
- *      haven't been re-added to the driver yet.
- * @IEEE80211_IFACE_ITER_RESUME_ALL: During resume, iterate over all
- *      interfaces, even if they haven't been re-added to the driver yet.
- */
-enum ieee80211_interface_iteration_flags {
-        IEEE80211_IFACE_ITER_NORMAL     = 0,
-        IEEE80211_IFACE_ITER_RESUME_ALL = BIT(0),
-};
-
-/**
  * ieee80211_iterate_active_interfaces - iterate active interfaces
  *
  * This function iterates over the interfaces associated with a given
@@ -3515,15 +2839,13 @@ enum ieee80211_interface_iteration_flags {
  * This function allows the iterator function to sleep, when the iterator
  * function is atomic @ieee80211_iterate_active_interfaces_atomic can
  * be used.
- * Does not iterate over a new interface during add_interface().
+ * Does not iterate over a new interface during add_interface()
  *
  * @hw: the hardware struct of which the interfaces should be iterated over
- * @iter_flags: iteration flags, see &enum ieee80211_interface_iteration_flags
  * @iterator: the iterator function to call
  * @data: first argument of the iterator function
  */
 void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
-                                         u32 iter_flags,
                                          void (*iterator)(void *data, u8 *mac,
                                                 struct ieee80211_vif *vif),
                                          void *data);
@@ -3535,15 +2857,13 @@ void ieee80211_iterate_active_interfaces(struct ieee80211_hw *hw,
  * hardware that are currently active and calls the callback for them.
  * This function requires the iterator callback function to be atomic,
  * if that is not desired, use @ieee80211_iterate_active_interfaces instead.
- * Does not iterate over a new interface during add_interface().
+ * Does not iterate over a new interface during add_interface()
  *
  * @hw: the hardware struct of which the interfaces should be iterated over
- * @iter_flags: iteration flags, see &enum ieee80211_interface_iteration_flags
  * @iterator: the iterator function to call, cannot sleep
  * @data: first argument of the iterator function
  */
 void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw,
-                                                u32 iter_flags,
                                                 void (*iterator)(void *data,
                                                     u8 *mac,
                                                     struct ieee80211_vif *vif),
@@ -3697,24 +3017,6 @@ void ieee80211_sta_block_awake(struct ieee80211_hw *hw,
                                struct ieee80211_sta *pubsta, bool block);
 
 /**
- * ieee80211_sta_eosp - notify mac80211 about end of SP
- * @pubsta: the station
- *
- * When a device transmits frames in a way that it can't tell
- * mac80211 in the TX status about the EOSP, it must clear the
- * %IEEE80211_TX_STATUS_EOSP bit and call this function instead.
- * This applies for PS-Poll as well as uAPSD.
- *
- * Note that there is no non-_irqsafe version right now as
- * it wasn't needed, but just like _tx_status() and _rx()
- * must not be mixed in irqsafe/non-irqsafe versions, this
- * function must not be mixed with those either. Use the
- * all irqsafe, or all non-irqsafe, don't mix! If you need
- * the non-irqsafe version of this, you need to add it.
- */
-void ieee80211_sta_eosp_irqsafe(struct ieee80211_sta *pubsta);
-
-/**
  * ieee80211_iter_keys - iterate keys programmed into the device
  * @hw: pointer obtained from ieee80211_alloc_hw()
  * @vif: virtual interface to iterate, may be %NULL for all
@@ -3742,27 +3044,6 @@ void ieee80211_iter_keys(struct ieee80211_hw *hw,
                          void *iter_data);
 
 /**
- * ieee80211_iter_chan_contexts_atomic - iterate channel contexts
- * @hw: pointre obtained from ieee80211_alloc_hw().
- * @iter: iterator function
- * @iter_data: data passed to iterator function
- *
- * Iterate all active channel contexts. This function is atomic and
- * doesn't acquire any locks internally that might be held in other
- * places while calling into the driver.
- *
- * The iterator will not find a context that's being added (during
- * the driver callback to add it) but will find it while it's being
- * removed.
- */
-void ieee80211_iter_chan_contexts_atomic(
-        struct ieee80211_hw *hw,
-        void (*iter)(struct ieee80211_hw *hw,
-                     struct ieee80211_chanctx_conf *chanctx_conf,
-                     void *data),
-        void *iter_data);
-
-/**
  * ieee80211_ap_probereq_get - retrieve a Probe Request template
  * @hw: pointer obtained from ieee80211_alloc_hw().
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
@@ -3782,7 +3063,7 @@ struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw,
  *
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  *
- * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER and
+ * When beacon filtering is enabled with %IEEE80211_HW_BEACON_FILTER and
  * %IEEE80211_CONF_PS is set, the driver needs to inform whenever the
  * hardware is not receiving beacons with this function.
  */
@@ -3793,7 +3074,7 @@ void ieee80211_beacon_loss(struct ieee80211_vif *vif);
  *
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  *
- * When beacon filtering is enabled with %IEEE80211_VIF_BEACON_FILTER, and
+ * When beacon filtering is enabled with %IEEE80211_HW_BEACON_FILTER, and
  * %IEEE80211_CONF_PS and %IEEE80211_HW_CONNECTION_MONITOR are set, the driver
  * needs to inform if the connection to the AP has been lost.
  *
@@ -3863,7 +3144,7 @@ void ieee80211_enable_dyn_ps(struct ieee80211_vif *vif);
  * @rssi_event: the RSSI trigger event type
  * @gfp: context flags
  *
- * When the %IEEE80211_VIF_SUPPORTS_CQM_RSSI is set, and a connection quality
+ * When the %IEEE80211_HW_SUPPORTS_CQM_RSSI is set, and a connection quality
  * monitoring is configured with an rssi threshold, the driver will inform
  * whenever the rssi level reaches the threshold.
  */
@@ -3872,6 +3153,16 @@ void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif,
                                gfp_t gfp);
 
 /**
+ * ieee80211_get_operstate - get the operstate of the vif
+ *
+ * @vif: &struct ieee80211_vif pointer from the add_interface callback.
+ *
+ * The driver might need to know the operstate of the net_device
+ * (specifically, whether the link is IF_OPER_UP after resume)
+ */
+unsigned char ieee80211_get_operstate(struct ieee80211_vif *vif);
+
+/**
  * ieee80211_chswitch_done - Complete channel switch process
  * @vif: &struct ieee80211_vif pointer from the add_interface callback.
  * @success: make the channel switch successful or not
@@ -3894,6 +3185,22 @@ void ieee80211_request_smps(struct ieee80211_vif *vif,
                             enum ieee80211_smps_mode smps_mode);
 
 /**
+ * ieee80211_key_removed - disable hw acceleration for key
+ * @key_conf: The key hw acceleration should be disabled for
+ *
+ * This allows drivers to indicate that the given key has been
+ * removed from hardware acceleration, due to a new key that
+ * was added. Don't use this if the key can continue to be used
+ * for TX, if the key restriction is on RX only it is permitted
+ * to keep the key for TX only and not call this function.
+ *
+ * Due to locking constraints, it may only be called during
+ * @set_key. This function must be allowed to sleep, and the
+ * key it tries to disable may still be used until it returns.
+ */
+void ieee80211_key_removed(struct ieee80211_key_conf *key_conf);
+
+/**
  * ieee80211_ready_on_channel - notification of remain-on-channel start
  * @hw: pointer as obtained from ieee80211_alloc_hw()
  */
@@ -3922,20 +3229,17 @@ void ieee80211_remain_on_channel_expired(struct ieee80211_hw *hw);
 void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap,
                                   const u8 *addr);
 
+/* Rate control API */
+
 /**
- * ieee80211_send_bar - send a BlockAckReq frame
- *
- * can be used to flush pending frames from the peer's aggregation reorder
- * buffer.
+ * enum rate_control_changed - flags to indicate which parameter changed
  *
- * @vif: &struct ieee80211_vif pointer from the add_interface callback.
- * @ra: the peer's destination address
- * @tid: the TID of the aggregation session
- * @ssn: the new starting sequence number for the receiver
+ * @IEEE80211_RC_HT_CHANGED: The HT parameters of the operating channel have
+ *      changed, rate control algorithm can update its internal state if needed.
  */
-void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn);
-
-/* Rate control API */
+enum rate_control_changed {
+        IEEE80211_RC_HT_CHANGED = BIT(0)
+};
 
 /**
  * struct ieee80211_tx_rate_control - rate control information for/from RC algo
@@ -3943,8 +3247,6 @@ void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn);
  * @hw: The hardware the algorithm is invoked for.
  * @sband: The band this frame is being transmitted on.
  * @bss_conf: the current BSS configuration
- * @skb: the skb that will be transmitted, the control information in it needs
- *      to be filled in
  * @reported_rate: The rate control algorithm can fill this in to indicate
  *      which rate should be reported to userspace as the current rate and
  *      used for rate calculations in the mesh network.
@@ -3952,11 +3254,12 @@ void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn);
  *      RTS threshold
  * @short_preamble: whether mac80211 will request short-preamble transmission
  *      if the selected rate supports it
- * @max_rate_idx: user-requested maximum (legacy) rate
+ * @max_rate_idx: user-requested maximum rate (not MCS for now)
  *      (deprecated; this will be removed once drivers get updated to use
  *      rate_idx_mask)
- * @rate_idx_mask: user-requested (legacy) rate mask
- * @rate_idx_mcs_mask: user-requested MCS rate mask
+ * @rate_idx_mask: user-requested rate mask (not MCS for now)
+ * @skb: the skb that will be transmitted, the control information in it needs
+ *      to be filled in
  * @bss: whether this frame is sent out in AP or IBSS mode
  */
 struct ieee80211_tx_rate_control {
@@ -3968,7 +3271,6 @@ struct ieee80211_tx_rate_control {
         bool rts, short_preamble;
         u8 max_rate_idx;
         u32 rate_idx_mask;
-        u8 rate_idx_mcs_mask[IEEE80211_HT_MCS_MASK_LEN];
         bool bss;
 };
 
@@ -3982,8 +3284,9 @@ struct rate_control_ops {
         void (*rate_init)(void *priv, struct ieee80211_supported_band *sband,
                           struct ieee80211_sta *sta, void *priv_sta);
         void (*rate_update)(void *priv, struct ieee80211_supported_band *sband,
-                            struct ieee80211_sta *sta, void *priv_sta,
-                            u32 changed);
+                            struct ieee80211_sta *sta,
+                            void *priv_sta, u32 changed,
+                            enum nl80211_channel_type oper_chan_type);
         void (*free_sta)(void *priv, struct ieee80211_sta *sta,
                          void *priv_sta);
 
@@ -4039,9 +3342,8 @@ rate_lowest_index(struct ieee80211_supported_band *sband,
                         return i;
 
         /* warn when we cannot find a rate. */
-        WARN_ON_ONCE(1);
+        WARN_ON(1);
 
-        /* and return 0 (the lowest index) */
         return 0;
 }
 
@@ -4117,15 +3419,4 @@ void ieee80211_enable_rssi_reports(struct ieee80211_vif *vif,
                                    int rssi_max_thold);
 
 void ieee80211_disable_rssi_reports(struct ieee80211_vif *vif);
-
-/**
- * ieee80211_ave_rssi - report the average rssi for the specified interface
- *
- * @vif: the specified virtual interface
- *
- * This function return the average rssi value for the requested interface.
- * It assumes that the given vif is valid.
- */
-int ieee80211_ave_rssi(struct ieee80211_vif *vif);
-
 #endif /* MAC80211_H */
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
deleted file mode 100644
index d0d11df9cba..00000000000
--- a/include/net/mac802154.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * IEEE802.15.4-2003 specification
- *
- * Copyright (C) 2007-2012 Siemens AG
- *
- * 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 published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-#ifndef NET_MAC802154_H
-#define NET_MAC802154_H
-
-#include <net/af_ieee802154.h>
-
-/* General MAC frame format:
- *  2 bytes: Frame Control
- *  1 byte:  Sequence Number
- * 20 bytes: Addressing fields
- * 14 bytes: Auxiliary Security Header
- */
-#define MAC802154_FRAME_HARD_HEADER_LEN         (2 + 1 + 20 + 14)
-
-/* The following flags are used to indicate changed address settings from
- * the stack to the hardware.
- */
-
-/* indicates that the Short Address changed */
-#define IEEE802515_AFILT_SADDR_CHANGED          0x00000001
-/* indicates that the IEEE Address changed */
-#define IEEE802515_AFILT_IEEEADDR_CHANGED       0x00000002
-/* indicates that the PAN ID changed */
-#define IEEE802515_AFILT_PANID_CHANGED          0x00000004
-/* indicates that PAN Coordinator status changed */
-#define IEEE802515_AFILT_PANC_CHANGED           0x00000008
-
-struct ieee802154_hw_addr_filt {
-        __le16  pan_id;         /* Each independent PAN selects a unique
-                                 * identifier. This PAN id allows communication
-                                 * between devices within a network using short
-                                 * addresses and enables transmissions between
-                                 * devices across independent networks.
-                                 */
-        __le16  short_addr;
-        u8      ieee_addr[IEEE802154_ADDR_LEN];
-        u8      pan_coord;
-};
-
-struct ieee802154_dev {
-        /* filled by the driver */
-        int     extra_tx_headroom;
-        u32     flags;
-        struct  device *parent;
-
-        /* filled by mac802154 core */
-        struct  ieee802154_hw_addr_filt hw_filt;
-        void    *priv;
-        struct  wpan_phy *phy;
-};
-
-/* Checksum is in hardware and is omitted from a packet
- *
- * These following flags are used to indicate hardware capabilities to
- * the stack. Generally, flags here should have their meaning
- * done in a way that the simplest hardware doesn't need setting
- * any particular flags. There are some exceptions to this rule,
- * however, so you are advised to review these flags carefully.
- */
-
-/* Indicates that receiver omits FCS and xmitter will add FCS on it's own. */
-#define IEEE802154_HW_OMIT_CKSUM        0x00000001
-/* Indicates that receiver will autorespond with ACK frames. */
-#define IEEE802154_HW_AACK              0x00000002
-
-/* struct ieee802154_ops - callbacks from mac802154 to the driver
- *
- * This structure contains various callbacks that the driver may
- * handle or, in some cases, must handle, for example to transmit
- * a frame.
- *
- * start: Handler that 802.15.4 module calls for device initialization.
- *        This function is called before the first interface is attached.
- *
- * stop:  Handler that 802.15.4 module calls for device cleanup.
- *        This function is called after the last interface is removed.
- *
- * xmit:  Handler that 802.15.4 module calls for each transmitted frame.
- *        skb cntains the buffer starting from the IEEE 802.15.4 header.
- *        The low-level driver should send the frame based on available
- *        configuration.
- *        This function should return zero or negative errno. Called with
- *        pib_lock held.
- *
- * ed:    Handler that 802.15.4 module calls for Energy Detection.
- *        This function should place the value for detected energy
- *        (usually device-dependant) in the level pointer and return
- *        either zero or negative errno. Called with pib_lock held.
- *
- * set_channel:
- *        Set radio for listening on specific channel.
- *        Set the device for listening on specified channel.
- *        Returns either zero, or negative errno. Called with pib_lock held.
- *
- * set_hw_addr_filt:
- *        Set radio for listening on specific address.
- *        Set the device for listening on specified address.
- *        Returns either zero, or negative errno.
- */
-struct ieee802154_ops {
-        struct module   *owner;
-        int             (*start)(struct ieee802154_dev *dev);
-        void            (*stop)(struct ieee802154_dev *dev);
-        int             (*xmit)(struct ieee802154_dev *dev,
-                                struct sk_buff *skb);
-        int             (*ed)(struct ieee802154_dev *dev, u8 *level);
-        int             (*set_channel)(struct ieee802154_dev *dev,
-                                       int page,
-                                       int channel);
-        int             (*set_hw_addr_filt)(struct ieee802154_dev *dev,
-                                          struct ieee802154_hw_addr_filt *filt,
-                                            unsigned long changed);
-        int             (*ieee_addr)(struct ieee802154_dev *dev,
-                                     u8 addr[IEEE802154_ADDR_LEN]);
-};
-
-/* Basic interface to register ieee802154 device */
-struct ieee802154_dev *
-ieee802154_alloc_device(size_t priv_data_lex, struct ieee802154_ops *ops);
-void ieee802154_free_device(struct ieee802154_dev *dev);
-int ieee802154_register_device(struct ieee802154_dev *dev);
-void ieee802154_unregister_device(struct ieee802154_dev *dev);
-
-void ieee802154_rx_irqsafe(struct ieee802154_dev *dev, struct sk_buff *skb,
-                           u8 lqi);
-
-#endif /* NET_MAC802154_H */
diff --git a/include/net/ndisc.h b/include/net/ndisc.h
index 23b3a7c5878..62beeb97c4b 100644
--- a/include/net/ndisc.h
+++ b/include/net/ndisc.h
@@ -34,7 +34,6 @@ enum {
         __ND_OPT_ARRAY_MAX,
         ND_OPT_ROUTE_INFO = 24,         /* RFC4191 */
         ND_OPT_RDNSS = 25,              /* RFC5006 */
-        ND_OPT_DNSSL = 31,              /* RFC6106 */
         __ND_OPT_MAX
 };
 
@@ -47,9 +46,6 @@ enum {
 #include <linux/icmpv6.h>
 #include <linux/in6.h>
 #include <linux/types.h>
-#include <linux/if_arp.h>
-#include <linux/netdevice.h>
-#include <linux/hash.h>
 
 #include <net/neighbour.h>
 
@@ -78,102 +74,11 @@ struct ra_msg {
         __be32                  retrans_timer;
 };
 
-struct rd_msg {
-        struct icmp6hdr icmph;
-        struct in6_addr target;
-        struct in6_addr dest;
-        __u8            opt[0];
-};
-
 struct nd_opt_hdr {
         __u8            nd_opt_type;
         __u8            nd_opt_len;
 } __packed;
 
-/* ND options */
-struct ndisc_options {
-        struct nd_opt_hdr *nd_opt_array[__ND_OPT_ARRAY_MAX];
-#ifdef CONFIG_IPV6_ROUTE_INFO
-        struct nd_opt_hdr *nd_opts_ri;
-        struct nd_opt_hdr *nd_opts_ri_end;
-#endif
-        struct nd_opt_hdr *nd_useropts;
-        struct nd_opt_hdr *nd_useropts_end;
-};
-
-#define nd_opts_src_lladdr      nd_opt_array[ND_OPT_SOURCE_LL_ADDR]
-#define nd_opts_tgt_lladdr      nd_opt_array[ND_OPT_TARGET_LL_ADDR]
-#define nd_opts_pi              nd_opt_array[ND_OPT_PREFIX_INFO]
-#define nd_opts_pi_end          nd_opt_array[__ND_OPT_PREFIX_INFO_END]
-#define nd_opts_rh              nd_opt_array[ND_OPT_REDIRECT_HDR]
-#define nd_opts_mtu             nd_opt_array[ND_OPT_MTU]
-
-#define NDISC_OPT_SPACE(len) (((len)+2+7)&~7)
-
-extern struct ndisc_options *ndisc_parse_options(u8 *opt, int opt_len,
-                                                 struct ndisc_options *ndopts);
-
-/*
- * Return the padding between the option length and the start of the
- * link addr.  Currently only IP-over-InfiniBand needs this, although
- * if RFC 3831 IPv6-over-Fibre Channel is ever implemented it may
- * also need a pad of 2.
- */
-static int ndisc_addr_option_pad(unsigned short type)
-{
-        switch (type) {
-        case ARPHRD_INFINIBAND: return 2;
-        default:                return 0;
-        }
-}
-
-static inline u8 *ndisc_opt_addr_data(struct nd_opt_hdr *p,
-                                      struct net_device *dev)
-{
-        u8 *lladdr = (u8 *)(p + 1);
-        int lladdrlen = p->nd_opt_len << 3;
-        int prepad = ndisc_addr_option_pad(dev->type);
-        if (lladdrlen != NDISC_OPT_SPACE(dev->addr_len + prepad))
-                return NULL;
-        return lladdr + prepad;
-}
-
-static inline u32 ndisc_hashfn(const void *pkey, const struct net_device *dev, __u32 *hash_rnd)
-{
-        const u32 *p32 = pkey;
-
-        return (((p32[0] ^ hash32_ptr(dev)) * hash_rnd[0]) +
-                (p32[1] * hash_rnd[1]) +
-                (p32[2] * hash_rnd[2]) +
-                (p32[3] * hash_rnd[3]));
-}
-
-static inline struct neighbour *__ipv6_neigh_lookup(struct neigh_table *tbl, struct net_device *dev, const void *pkey)
-{
-        struct neigh_hash_table *nht;
-        const u32 *p32 = pkey;
-        struct neighbour *n;
-        u32 hash_val;
-
-        rcu_read_lock_bh();
-        nht = rcu_dereference_bh(tbl->nht);
-        hash_val = ndisc_hashfn(pkey, dev, nht->hash_rnd) >> (32 - nht->hash_shift);
-        for (n = rcu_dereference_bh(nht->hash_buckets[hash_val]);
-             n != NULL;
-             n = rcu_dereference_bh(n->next)) {
-                u32 *n32 = (u32 *) n->primary_key;
-                if (n->dev == dev &&
-                    ((n32[0] ^ p32[0]) | (n32[1] ^ p32[1]) |
-                     (n32[2] ^ p32[2]) | (n32[3] ^ p32[3])) == 0) {
-                        if (!atomic_inc_not_zero(&n->refcnt))
-                                n = NULL;
-                        break;
-                }
-        }
-        rcu_read_unlock_bh();
-
-        return n;
-}
 
 extern int                      ndisc_init(void);
 
@@ -192,11 +97,27 @@ extern void			ndisc_send_rs(struct net_device *dev,
                                               const struct in6_addr *daddr);
 
 extern void                     ndisc_send_redirect(struct sk_buff *skb,
+                                                    struct neighbour *neigh,
                                                     const struct in6_addr *target);
 
 extern int                      ndisc_mc_map(const 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);
+
+
 
 /*
  *      IGMP
@@ -224,4 +145,13 @@ int ndisc_ifinfo_sysctl_strategy(ctl_table *ctl,
 extern void                     inet6_ifinfo_notify(int event,
                                                     struct inet6_dev *idev);
 
+static inline struct neighbour * ndisc_get_neigh(struct net_device *dev, const struct in6_addr *addr)
+{
+
+        if (dev)
+                return __neigh_lookup_errno(&nd_tbl, addr, dev);
+
+        return ERR_PTR(-ENODEV);
+}
+
 #endif
diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index 0dab173e27d..2720884287c 100644
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -59,7 +59,7 @@ struct neigh_parms {
         int     reachable_time;
         int     delay_probe_time;
 
-        int     queue_len_bytes;
+        int     queue_len;
         int     ucast_probes;
         int     app_probes;
         int     mcast_probes;
@@ -99,7 +99,6 @@ struct neighbour {
         rwlock_t                lock;
         atomic_t                refcnt;
         struct sk_buff_head     arp_queue;
-        unsigned int            arp_queue_len_bytes;
         struct timer_list       timer;
         unsigned long           used;
         atomic_t                probes;
@@ -139,12 +138,10 @@ struct pneigh_entry {
  *      neighbour table manipulation
  */
 
-#define NEIGH_NUM_HASH_RND      4
-
 struct neigh_hash_table {
         struct neighbour __rcu  **hash_buckets;
         unsigned int            hash_shift;
-        __u32                   hash_rnd[NEIGH_NUM_HASH_RND];
+        __u32                   hash_rnd;
         struct rcu_head         rcu;
 };
 
@@ -156,7 +153,7 @@ struct neigh_table {
         int                     key_len;
         __u32                   (*hash)(const void *pkey,
                                         const struct net_device *dev,
-                                        __u32 *hash_rnd);
+                                        __u32 hash_rnd);
         int                     (*constructor)(struct neighbour *);
         int                     (*pconstructor)(struct pneigh_entry *);
         void                    (*pdestructor)(struct pneigh_entry *);
@@ -175,18 +172,12 @@ struct neigh_table {
         atomic_t                entries;
         rwlock_t                lock;
         unsigned long           last_rand;
+        struct kmem_cache       *kmem_cachep;
         struct neigh_statistics __percpu *stats;
         struct neigh_hash_table __rcu *nht;
         struct pneigh_entry     **phash_buckets;
 };
 
-#define NEIGH_PRIV_ALIGN        sizeof(long long)
-
-static inline void *neighbour_priv(const struct neighbour *n)
-{
-        return (char *)n + ALIGN(sizeof(*n) + n->tbl->key_len, NEIGH_PRIV_ALIGN);
-}
-
 /* flags for neigh_update() */
 #define NEIGH_UPDATE_F_OVERRIDE                 0x00000001
 #define NEIGH_UPDATE_F_WEAK_OVERRIDE            0x00000002
@@ -195,6 +186,7 @@ static inline void *neighbour_priv(const struct neighbour *n)
 #define NEIGH_UPDATE_F_ADMIN                    0x80000000
 
 extern void                     neigh_table_init(struct neigh_table *tbl);
+extern void                     neigh_table_init_no_netlink(struct neigh_table *tbl);
 extern int                      neigh_table_clear(struct neigh_table *tbl);
 extern struct neighbour *       neigh_lookup(struct neigh_table *tbl,
                                              const void *pkey,
@@ -202,16 +194,9 @@ extern struct neighbour *	neigh_lookup(struct neigh_table *tbl,
 extern struct neighbour *       neigh_lookup_nodev(struct neigh_table *tbl,
                                                    struct net *net,
                                                    const void *pkey);
-extern struct neighbour *       __neigh_create(struct neigh_table *tbl,
-                                               const void *pkey,
-                                               struct net_device *dev,
-                                               bool want_ref);
-static inline struct neighbour *neigh_create(struct neigh_table *tbl,
+extern struct neighbour *       neigh_create(struct neigh_table *tbl,
                                              const void *pkey,
-                                             struct net_device *dev)
-{
-        return __neigh_create(tbl, pkey, dev, true);
-}
+                                             struct net_device *dev);
 extern void                     neigh_destroy(struct neighbour *neigh);
 extern int                      __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb);
 extern int                      neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, 
@@ -309,6 +294,12 @@ static inline struct neighbour * neigh_clone(struct neighbour *neigh)
 
 #define neigh_hold(n)   atomic_inc(&(n)->refcnt)
 
+static inline void neigh_confirm(struct neighbour *neigh)
+{
+        if (neigh)
+                neigh->confirmed = jiffies;
+}
+
 static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 {
         unsigned long now = jiffies;
@@ -323,7 +314,7 @@ static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
 #ifdef CONFIG_BRIDGE_NETFILTER
 static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 {
-        unsigned int seq, hh_alen;
+        unsigned seq, hh_alen;
 
         do {
                 seq = read_seqbegin(&hh->hh_lock);
@@ -334,28 +325,33 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
 }
 #endif
 
-static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
+static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
 {
-        unsigned int seq;
+        unsigned seq;
         int hh_len;
 
         do {
+                int hh_alen;
+
                 seq = read_seqbegin(&hh->hh_lock);
                 hh_len = hh->hh_len;
-                if (likely(hh_len <= HH_DATA_MOD)) {
-                        /* this is inlined by gcc */
-                        memcpy(skb->data - HH_DATA_MOD, hh->hh_data, HH_DATA_MOD);
-                } else {
-                        int hh_alen = HH_DATA_ALIGN(hh_len);
-
-                        memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
-                }
+                hh_alen = HH_DATA_ALIGN(hh_len);
+                memcpy(skb->data - hh_alen, hh->hh_data, hh_alen);
         } while (read_seqretry(&hh->hh_lock, seq));
 
         skb_push(skb, hh_len);
         return dev_queue_xmit(skb);
 }
 
+static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
+{
+        struct hh_cache *hh = &n->hh;
+        if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
+                return neigh_hh_output(hh, skb);
+        else
+                return n->output(n, skb);
+}
+
 static inline struct neighbour *
 __neigh_lookup(struct neigh_table *tbl, const void *pkey, struct net_device *dev, int creat)
 {
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index de644bcd861..3bb6fa0eace 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -15,7 +15,6 @@
 #include <net/netns/packet.h>
 #include <net/netns/ipv4.h>
 #include <net/netns/ipv6.h>
-#include <net/netns/sctp.h>
 #include <net/netns/dccp.h>
 #include <net/netns/x_tables.h>
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
@@ -23,7 +22,6 @@
 #endif
 #include <net/netns/xfrm.h>
 
-struct user_namespace;
 struct proc_dir_entry;
 struct net_device;
 struct sock;
@@ -54,10 +52,6 @@ struct net {
         struct list_head        cleanup_list;   /* namespaces on death row */
         struct list_head        exit_list;      /* Use only net_mutex */
 
-        struct user_namespace   *user_ns;       /* Owning user namespace */
-
-        unsigned int            proc_inum;
-
         struct proc_dir_entry   *proc_net;
         struct proc_dir_entry   *proc_net_stat;
 
@@ -72,7 +66,6 @@ struct net {
         struct hlist_head       *dev_name_head;
         struct hlist_head       *dev_index_head;
         unsigned int            dev_base_seq;   /* protected by rtnl_mutex */
-        int                     ifindex;
 
         /* core fib_rules */
         struct list_head        rules_ops;
@@ -84,12 +77,9 @@ struct net {
         struct netns_packet     packet;
         struct netns_unix       unx;
         struct netns_ipv4       ipv4;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct netns_ipv6       ipv6;
 #endif
-#if defined(CONFIG_IP_SCTP) || defined(CONFIG_IP_SCTP_MODULE)
-        struct netns_sctp       sctp;
-#endif
 #if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE)
         struct netns_dccp       dccp;
 #endif
@@ -98,9 +88,6 @@ struct net {
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
         struct netns_ct         ct;
 #endif
-#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
-        struct netns_nf_frag    nf_frag;
-#endif
         struct sock             *nfnl;
         struct sock             *nfnl_stash;
 #endif
@@ -114,38 +101,24 @@ struct net {
         struct netns_xfrm       xfrm;
 #endif
         struct netns_ipvs       *ipvs;
-        struct sock             *diag_nlsk;
-        atomic_t                rt_genid;
 };
 
-/*
- * ifindex generation is per-net namespace, and loopback is
- * always the 1st device in ns (see net_dev_init), thus any
- * loopback device should get ifindex 1
- */
-
-#define LOOPBACK_IFINDEX        1
 
 #include <linux/seq_file_net.h>
 
 /* Init's network namespace */
 extern struct net init_net;
 
-#ifdef CONFIG_NET_NS
-extern struct net *copy_net_ns(unsigned long flags,
-        struct user_namespace *user_ns, struct net *old_net);
-
-#else /* CONFIG_NET_NS */
-#include <linux/sched.h>
-#include <linux/nsproxy.h>
-static inline struct net *copy_net_ns(unsigned long flags,
-        struct user_namespace *user_ns, struct net *old_net)
+#ifdef CONFIG_NET
+extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns);
+
+#else /* CONFIG_NET */
+static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns)
 {
-        if (flags & CLONE_NEWNET)
-                return ERR_PTR(-EINVAL);
-        return old_net;
+        /* There is nothing to copy so this is a noop */
+        return net_ns;
 }
-#endif /* CONFIG_NET_NS */
+#endif /* CONFIG_NET */
 
 
 extern struct list_head net_namespace_list;
@@ -267,12 +240,10 @@ static inline struct net *read_pnet(struct net * const *pnet)
 #define __net_init
 #define __net_exit
 #define __net_initdata
-#define __net_initconst
 #else
 #define __net_init      __init
 #define __net_exit      __exit_refok
 #define __net_initdata  __initdata
-#define __net_initconst __initconst
 #endif
 
 struct pernet_operations {
@@ -308,34 +279,14 @@ extern void unregister_pernet_subsys(struct pernet_operations *);
 extern int register_pernet_device(struct pernet_operations *);
 extern void unregister_pernet_device(struct pernet_operations *);
 
+struct ctl_path;
 struct ctl_table;
 struct ctl_table_header;
 
-#ifdef CONFIG_SYSCTL
-extern int net_sysctl_init(void);
-extern struct ctl_table_header *register_net_sysctl(struct net *net,
-        const char *path, struct ctl_table *table);
+extern struct ctl_table_header *register_net_sysctl_table(struct net *net,
+        const struct ctl_path *path, struct ctl_table *table);
+extern struct ctl_table_header *register_net_sysctl_rotable(
+        const struct ctl_path *path, struct ctl_table *table);
 extern void unregister_net_sysctl_table(struct ctl_table_header *header);
-#else
-static inline int net_sysctl_init(void) { return 0; }
-static inline struct ctl_table_header *register_net_sysctl(struct net *net,
-        const char *path, struct ctl_table *table)
-{
-        return NULL;
-}
-static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
-{
-}
-#endif
-
-static inline int rt_genid(struct net *net)
-{
-        return atomic_read(&net->rt_genid);
-}
-
-static inline void rt_genid_bump(struct net *net)
-{
-        atomic_inc(&net->rt_genid);
-}
 
 #endif /* __NET_NET_NAMESPACE_H */
diff --git a/include/net/netevent.h b/include/net/netevent.h
index 3ce4988c9c0..086f8a5b59d 100644
--- a/include/net/netevent.h
+++ b/include/net/netevent.h
@@ -12,14 +12,10 @@
  */
 
 struct dst_entry;
-struct neighbour;
 
 struct netevent_redirect {
         struct dst_entry *old;
-        struct neighbour *old_neigh;
         struct dst_entry *new;
-        struct neighbour *new_neigh;
-        const void *daddr;
 };
 
 enum netevent_notif_type {
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index caca0c4d6b4..0b7f05e4a92 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -39,6 +39,36 @@ union nf_conntrack_expect_proto {
         /* insert expect proto private data here */
 };
 
+/* Add protocol helper include file here */
+#include <linux/netfilter/nf_conntrack_ftp.h>
+#include <linux/netfilter/nf_conntrack_pptp.h>
+#include <linux/netfilter/nf_conntrack_h323.h>
+#include <linux/netfilter/nf_conntrack_sane.h>
+#include <linux/netfilter/nf_conntrack_sip.h>
+
+/* per conntrack: application helper private data */
+union nf_conntrack_help {
+        /* insert conntrack helper private data (master) here */
+#if defined(CONFIG_NF_CONNTRACK_FTP) || defined(CONFIG_NF_CONNTRACK_FTP_MODULE)
+        struct nf_ct_ftp_master ct_ftp_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_PPTP) || \
+    defined(CONFIG_NF_CONNTRACK_PPTP_MODULE)
+        struct nf_ct_pptp_master ct_pptp_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_H323) || \
+    defined(CONFIG_NF_CONNTRACK_H323_MODULE)
+        struct nf_ct_h323_master ct_h323_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_SANE) || \
+    defined(CONFIG_NF_CONNTRACK_SANE_MODULE)
+        struct nf_ct_sane_master ct_sane_info;
+#endif
+#if defined(CONFIG_NF_CONNTRACK_SIP) || defined(CONFIG_NF_CONNTRACK_SIP_MODULE)
+        struct nf_ct_sip_master ct_sip_info;
+#endif
+};
+
 #include <linux/types.h>
 #include <linux/skbuff.h>
 #include <linux/timer.h>
@@ -59,13 +89,12 @@ struct nf_conn_help {
         /* Helper. if any */
         struct nf_conntrack_helper __rcu *helper;
 
+        union nf_conntrack_help help;
+
         struct hlist_head expectations;
 
         /* Current number of expected connections */
         u8 expecting[NF_CT_MAX_EXPECT_CLASSES];
-
-        /* private helper information. */
-        char data[];
 };
 
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
@@ -180,9 +209,9 @@ extern struct nf_conntrack_tuple_hash *
 __nf_conntrack_find(struct net *net, u16 zone,
                     const struct nf_conntrack_tuple *tuple);
 
-extern int nf_conntrack_hash_check_insert(struct nf_conn *ct);
+extern void nf_conntrack_hash_insert(struct nf_conn *ct);
 extern void nf_ct_delete_from_lists(struct nf_conn *ct);
-extern void nf_ct_dying_timeout(struct nf_conn *ct);
+extern void nf_ct_insert_dying_list(struct nf_conn *ct);
 
 extern void nf_conntrack_flush_report(struct net *net, u32 pid, int report);
 
@@ -284,16 +313,20 @@ static inline bool nf_is_loopback_packet(const struct sk_buff *skb)
         return skb->dev && skb->skb_iif && skb->dev->flags & IFF_LOOPBACK;
 }
 
-struct kernel_param;
-
 extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);
 extern unsigned int nf_conntrack_htable_size;
 extern unsigned int nf_conntrack_max;
 extern unsigned int nf_conntrack_hash_rnd;
 void init_nf_conntrack_hash_rnd(void);
 
-#define NF_CT_STAT_INC(net, count)        __this_cpu_inc((net)->ct.stat->count)
-#define NF_CT_STAT_INC_ATOMIC(net, count) this_cpu_inc((net)->ct.stat->count)
+#define NF_CT_STAT_INC(net, count)      \
+        __this_cpu_inc((net)->ct.stat->count)
+#define NF_CT_STAT_INC_ATOMIC(net, count)               \
+do {                                                    \
+        local_bh_disable();                             \
+        __this_cpu_inc((net)->ct.stat->count);          \
+        local_bh_enable();                              \
+} while (0)
 
 #define MODULE_ALIAS_NFCT_HELPER(helper) \
         MODULE_ALIAS("nfct-helper-" helper)
diff --git a/include/net/netfilter/nf_conntrack_acct.h b/include/net/netfilter/nf_conntrack_acct.h
index 463ae8e1669..4e9c63a20db 100644
--- a/include/net/netfilter/nf_conntrack_acct.h
+++ b/include/net/netfilter/nf_conntrack_acct.h
@@ -15,8 +15,8 @@
 #include <net/netfilter/nf_conntrack_extend.h>
 
 struct nf_conn_counter {
-        atomic64_t packets;
-        atomic64_t bytes;
+        u_int64_t packets;
+        u_int64_t bytes;
 };
 
 static inline
diff --git a/include/net/netfilter/nf_conntrack_core.h b/include/net/netfilter/nf_conntrack_core.h
index d8f5b9f5216..aced085132e 100644
--- a/include/net/netfilter/nf_conntrack_core.h
+++ b/include/net/netfilter/nf_conntrack_core.h
@@ -28,8 +28,8 @@ extern unsigned int nf_conntrack_in(struct net *net,
 extern int nf_conntrack_init(struct net *net);
 extern void nf_conntrack_cleanup(struct net *net);
 
-extern int nf_conntrack_proto_init(struct net *net);
-extern void nf_conntrack_proto_fini(struct net *net);
+extern int nf_conntrack_proto_init(void);
+extern void nf_conntrack_proto_fini(void);
 
 extern bool
 nf_ct_get_tuple(const struct sk_buff *skb,
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h
index 5654d292efd..4283508b3e1 100644
--- a/include/net/netfilter/nf_conntrack_ecache.h
+++ b/include/net/netfilter/nf_conntrack_ecache.h
@@ -17,8 +17,7 @@ struct nf_conntrack_ecache {
         unsigned long missed;   /* missed events */
         u16 ctmask;             /* bitmask of ct events to be delivered */
         u16 expmask;            /* bitmask of expect events to be delivered */
-        u32 portid;             /* netlink portid of destroyer */
-        struct timer_list timeout;
+        u32 pid;                /* netlink pid of destroyer */
 };
 
 static inline struct nf_conntrack_ecache *
@@ -60,7 +59,7 @@ nf_ct_ecache_ext_add(struct nf_conn *ct, u16 ctmask, u16 expmask, gfp_t gfp)
 /* This structure is passed to event handler */
 struct nf_ct_event {
         struct nf_conn *ct;
-        u32 portid;
+        u32 pid;
         int report;
 };
 
@@ -68,18 +67,18 @@ struct nf_ct_event_notifier {
         int (*fcn)(unsigned int events, struct nf_ct_event *item);
 };
 
-extern int nf_conntrack_register_notifier(struct net *net, struct nf_ct_event_notifier *nb);
-extern void nf_conntrack_unregister_notifier(struct net *net, struct nf_ct_event_notifier *nb);
+extern struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;
+extern int nf_conntrack_register_notifier(struct nf_ct_event_notifier *nb);
+extern void nf_conntrack_unregister_notifier(struct nf_ct_event_notifier *nb);
 
 extern void nf_ct_deliver_cached_events(struct nf_conn *ct);
 
 static inline void
 nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
 {
-        struct net *net = nf_ct_net(ct);
         struct nf_conntrack_ecache *e;
 
-        if (!rcu_access_pointer(net->ct.nf_conntrack_event_cb))
+        if (nf_conntrack_event_cb == NULL)
                 return;
 
         e = nf_ct_ecache_find(ct);
@@ -92,16 +91,15 @@ nf_conntrack_event_cache(enum ip_conntrack_events event, struct nf_conn *ct)
 static inline int
 nf_conntrack_eventmask_report(unsigned int eventmask,
                               struct nf_conn *ct,
-                              u32 portid,
+                              u32 pid,
                               int report)
 {
         int ret = 0;
-        struct net *net = nf_ct_net(ct);
         struct nf_ct_event_notifier *notify;
         struct nf_conntrack_ecache *e;
 
         rcu_read_lock();
-        notify = rcu_dereference(net->ct.nf_conntrack_event_cb);
+        notify = rcu_dereference(nf_conntrack_event_cb);
         if (notify == NULL)
                 goto out_unlock;
 
@@ -112,11 +110,11 @@ nf_conntrack_eventmask_report(unsigned int eventmask,
         if (nf_ct_is_confirmed(ct) && !nf_ct_is_dying(ct)) {
                 struct nf_ct_event item = {
                         .ct     = ct,
-                        .portid = e->portid ? e->portid : portid,
+                        .pid    = e->pid ? e->pid : pid,
                         .report = report
                 };
                 /* This is a resent of a destroy event? If so, skip missed */
-                unsigned long missed = e->portid ? 0 : e->missed;
+                unsigned long missed = e->pid ? 0 : e->missed;
 
                 if (!((eventmask | missed) & e->ctmask))
                         goto out_unlock;
@@ -126,11 +124,11 @@ nf_conntrack_eventmask_report(unsigned int eventmask,
                         spin_lock_bh(&ct->lock);
                         if (ret < 0) {
                                 /* This is a destroy event that has been
-                                 * triggered by a process, we store the PORTID
+                                 * triggered by a process, we store the PID
                                  * to include it in the retransmission. */
                                 if (eventmask & (1 << IPCT_DESTROY) &&
-                                    e->portid == 0 && portid != 0)
-                                        e->portid = portid;
+                                    e->pid == 0 && pid != 0)
+                                        e->pid = pid;
                                 else
                                         e->missed |= eventmask;
                         } else
@@ -145,9 +143,9 @@ out_unlock:
 
 static inline int
 nf_conntrack_event_report(enum ip_conntrack_events event, struct nf_conn *ct,
-                          u32 portid, int report)
+                          u32 pid, int report)
 {
-        return nf_conntrack_eventmask_report(1 << event, ct, portid, report);
+        return nf_conntrack_eventmask_report(1 << event, ct, pid, report);
 }
 
 static inline int
@@ -158,7 +156,7 @@ nf_conntrack_event(enum ip_conntrack_events event, struct nf_conn *ct)
 
 struct nf_exp_event {
         struct nf_conntrack_expect *exp;
-        u32 portid;
+        u32 pid;
         int report;
 };
 
@@ -166,21 +164,21 @@ struct nf_exp_event_notifier {
         int (*fcn)(unsigned int events, struct nf_exp_event *item);
 };
 
-extern int nf_ct_expect_register_notifier(struct net *net, struct nf_exp_event_notifier *nb);
-extern void nf_ct_expect_unregister_notifier(struct net *net, struct nf_exp_event_notifier *nb);
+extern struct nf_exp_event_notifier __rcu *nf_expect_event_cb;
+extern int nf_ct_expect_register_notifier(struct nf_exp_event_notifier *nb);
+extern void nf_ct_expect_unregister_notifier(struct nf_exp_event_notifier *nb);
 
 static inline void
 nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
                           struct nf_conntrack_expect *exp,
-                          u32 portid,
+                          u32 pid,
                           int report)
 {
-        struct net *net = nf_ct_exp_net(exp);
         struct nf_exp_event_notifier *notify;
         struct nf_conntrack_ecache *e;
 
         rcu_read_lock();
-        notify = rcu_dereference(net->ct.nf_expect_event_cb);
+        notify = rcu_dereference(nf_expect_event_cb);
         if (notify == NULL)
                 goto out_unlock;
 
@@ -191,7 +189,7 @@ nf_ct_expect_event_report(enum ip_conntrack_expect_events event,
         if (e->expmask & (1 << event)) {
                 struct nf_exp_event item = {
                         .exp    = exp,
-                        .portid = portid,
+                        .pid    = pid,
                         .report = report
                 };
                 notify->fcn(1 << event, &item);
@@ -216,20 +214,20 @@ static inline void nf_conntrack_event_cache(enum ip_conntrack_events event,
                                             struct nf_conn *ct) {}
 static inline int nf_conntrack_eventmask_report(unsigned int eventmask,
                                                 struct nf_conn *ct,
-                                                u32 portid,
+                                                u32 pid,
                                                 int report) { return 0; }
 static inline int nf_conntrack_event(enum ip_conntrack_events event,
                                      struct nf_conn *ct) { return 0; }
 static inline int nf_conntrack_event_report(enum ip_conntrack_events event,
                                             struct nf_conn *ct,
-                                            u32 portid,
+                                            u32 pid,
                                             int report) { return 0; }
 static inline void nf_ct_deliver_cached_events(const struct nf_conn *ct) {}
 static inline void nf_ct_expect_event(enum ip_conntrack_expect_events event,
                                       struct nf_conntrack_expect *exp) {}
 static inline void nf_ct_expect_event_report(enum ip_conntrack_expect_events e,
                                              struct nf_conntrack_expect *exp,
-                                             u32 portid,
+                                             u32 pid,
                                              int report) {}
 
 static inline int nf_conntrack_ecache_init(struct net *net)
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h
index cc13f377a70..0f8a8c58753 100644
--- a/include/net/netfilter/nf_conntrack_expect.h
+++ b/include/net/netfilter/nf_conntrack_expect.h
@@ -43,7 +43,7 @@ struct nf_conntrack_expect {
         unsigned int class;
 
 #ifdef CONFIG_NF_NAT_NEEDED
-        union nf_inet_addr saved_addr;
+        __be32 saved_ip;
         /* This is the original per-proto part, used to map the
          * expected connection the way the recipient expects. */
         union nf_conntrack_man_proto saved_proto;
@@ -59,12 +59,10 @@ static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp)
         return nf_ct_net(exp->master);
 }
 
-#define NF_CT_EXP_POLICY_NAME_LEN       16
-
 struct nf_conntrack_expect_policy {
         unsigned int    max_expected;
         unsigned int    timeout;
-        char            name[NF_CT_EXP_POLICY_NAME_LEN];
+        const char      *name;
 };
 
 #define NF_CT_EXPECT_CLASS_DEFAULT      0
@@ -93,6 +91,7 @@ static inline void nf_ct_unlink_expect(struct nf_conntrack_expect *exp)
 
 void nf_ct_remove_expectations(struct nf_conn *ct);
 void nf_ct_unexpect_related(struct nf_conntrack_expect *exp);
+void nf_ct_remove_userspace_expectations(void);
 
 /* Allocate space for an expectation: this is mandatory before calling
    nf_ct_expect_related.  You will have to call put afterwards. */
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h
index 8b4d1fc2909..2dcf31703ac 100644
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
@@ -20,9 +20,6 @@ enum nf_ct_ext_id {
 #ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
         NF_CT_EXT_TSTAMP,
 #endif
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-        NF_CT_EXT_TIMEOUT,
-#endif
         NF_CT_EXT_NUM,
 };
 
@@ -32,7 +29,6 @@ enum nf_ct_ext_id {
 #define NF_CT_EXT_ECACHE_TYPE struct nf_conntrack_ecache
 #define NF_CT_EXT_ZONE_TYPE struct nf_conntrack_zone
 #define NF_CT_EXT_TSTAMP_TYPE struct nf_conn_tstamp
-#define NF_CT_EXT_TIMEOUT_TYPE struct nf_conn_timeout
 
 /* Extensions: optional stuff which isn't permanently in struct. */
 struct nf_ct_ext {
@@ -80,13 +76,10 @@ static inline void nf_ct_ext_free(struct nf_conn *ct)
 }
 
 /* Add this type, returns pointer to data or NULL. */
-void *__nf_ct_ext_add_length(struct nf_conn *ct, enum nf_ct_ext_id id,
-                             size_t var_alloc_len, gfp_t gfp);
-
+void *
+__nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp);
 #define nf_ct_ext_add(ct, id, gfp) \
-        ((id##_TYPE *)__nf_ct_ext_add_length((ct), (id), 0, (gfp)))
-#define nf_ct_ext_add_length(ct, id, len, gfp) \
-        ((id##_TYPE *)__nf_ct_ext_add_length((ct), (id), (len), (gfp)))
+        ((id##_TYPE *)__nf_ct_ext_add((ct), (id), (gfp)))
 
 #define NF_CT_EXT_F_PREALLOC    0x0001
 
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h
index 9aad956d100..f1c1311adc2 100644
--- a/include/net/netfilter/nf_conntrack_helper.h
+++ b/include/net/netfilter/nf_conntrack_helper.h
@@ -11,27 +11,18 @@
 #define _NF_CONNTRACK_HELPER_H
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_extend.h>
-#include <net/netfilter/nf_conntrack_expect.h>
 
 struct module;
 
-enum nf_ct_helper_flags {
-        NF_CT_HELPER_F_USERSPACE        = (1 << 0),
-        NF_CT_HELPER_F_CONFIGURED       = (1 << 1),
-};
-
 #define NF_CT_HELPER_NAME_LEN   16
 
 struct nf_conntrack_helper {
         struct hlist_node hnode;        /* Internal use. */
 
-        char name[NF_CT_HELPER_NAME_LEN]; /* name of the module */
+        const char *name;               /* name of the module */
         struct module *me;              /* pointer to self */
         const struct nf_conntrack_expect_policy *expect_policy;
 
-        /* length of internal data, ie. sizeof(struct nf_ct_*_master) */
-        size_t data_len;
-
         /* Tuple of things we will help (compared against server response) */
         struct nf_conntrack_tuple tuple;
 
@@ -44,12 +35,8 @@ struct nf_conntrack_helper {
 
         void (*destroy)(struct nf_conn *ct);
 
-        int (*from_nlattr)(struct nlattr *attr, struct nf_conn *ct);
         int (*to_nlattr)(struct sk_buff *skb, const struct nf_conn *ct);
         unsigned int expect_class_max;
-
-        unsigned int flags;
-        unsigned int queue_num;         /* For user-space helpers. */
 };
 
 extern struct nf_conntrack_helper *
@@ -61,7 +48,7 @@ nf_conntrack_helper_try_module_get(const char *name, u16 l3num, u8 protonum);
 extern int nf_conntrack_helper_register(struct nf_conntrack_helper *);
 extern void nf_conntrack_helper_unregister(struct nf_conntrack_helper *);
 
-extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, struct nf_conntrack_helper *helper, gfp_t gfp);
+extern struct nf_conn_help *nf_ct_helper_ext_add(struct nf_conn *ct, gfp_t gfp);
 
 extern int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl,
                                      gfp_t flags);
@@ -73,17 +60,8 @@ static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
         return nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
 }
 
-static inline void *nfct_help_data(const struct nf_conn *ct)
-{
-        struct nf_conn_help *help;
-
-        help = nf_ct_ext_find(ct, NF_CT_EXT_HELPER);
-
-        return (void *)help->data;
-}
-
-extern int nf_conntrack_helper_init(struct net *net);
-extern void nf_conntrack_helper_fini(struct net *net);
+extern int nf_conntrack_helper_init(void);
+extern void nf_conntrack_helper_fini(void);
 
 extern int nf_conntrack_broadcast_help(struct sk_buff *skb,
                                        unsigned int protoff,
@@ -91,20 +69,4 @@ extern int nf_conntrack_broadcast_help(struct sk_buff *skb,
                                        enum ip_conntrack_info ctinfo,
                                        unsigned int timeout);
 
-struct nf_ct_helper_expectfn {
-        struct list_head head;
-        const char *name;
-        void (*expectfn)(struct nf_conn *ct, struct nf_conntrack_expect *exp);
-};
-
-void nf_ct_helper_expectfn_register(struct nf_ct_helper_expectfn *n);
-void nf_ct_helper_expectfn_unregister(struct nf_ct_helper_expectfn *n);
-struct nf_ct_helper_expectfn *
-nf_ct_helper_expectfn_find_by_name(const char *name);
-struct nf_ct_helper_expectfn *
-nf_ct_helper_expectfn_find_by_symbol(const void *symbol);
-
-extern struct hlist_head *nf_ct_helper_hash;
-extern unsigned int nf_ct_helper_hsize;
-
 #endif /*_NF_CONNTRACK_HELPER_H*/
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h
index 6f7c13f4ac0..e8010f445ae 100644
--- a/include/net/netfilter/nf_conntrack_l3proto.h
+++ b/include/net/netfilter/nf_conntrack_l3proto.h
@@ -64,12 +64,11 @@ struct nf_conntrack_l3proto {
         size_t nla_size;
 
 #ifdef CONFIG_SYSCTL
-        const char              *ctl_table_path;
+        struct ctl_table_header *ctl_table_header;
+        struct ctl_path         *ctl_table_path;
+        struct ctl_table        *ctl_table;
 #endif /* CONFIG_SYSCTL */
 
-        /* Init l3proto pernet data */
-        int (*init_net)(struct net *net);
-
         /* Module (if any) which this is connected to. */
         struct module *me;
 };
@@ -77,10 +76,8 @@ struct nf_conntrack_l3proto {
 extern struct nf_conntrack_l3proto __rcu *nf_ct_l3protos[AF_MAX];
 
 /* Protocol registration. */
-extern int nf_conntrack_l3proto_register(struct net *net,
-                                         struct nf_conntrack_l3proto *proto);
-extern void nf_conntrack_l3proto_unregister(struct net *net,
-                                            struct nf_conntrack_l3proto *proto);
+extern int nf_conntrack_l3proto_register(struct nf_conntrack_l3proto *proto);
+extern void nf_conntrack_l3proto_unregister(struct nf_conntrack_l3proto *proto);
 extern struct nf_conntrack_l3proto *nf_ct_l3proto_find_get(u_int16_t l3proto);
 extern void nf_ct_l3proto_put(struct nf_conntrack_l3proto *p);
 
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index c3be4aef6bf..e3d3ee3c06a 100644
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -12,7 +12,6 @@
 #include <linux/netlink.h>
 #include <net/netlink.h>
 #include <net/netfilter/nf_conntrack.h>
-#include <net/netns/generic.h>
 
 struct seq_file;
 
@@ -40,13 +39,12 @@ struct nf_conntrack_l4proto {
                       unsigned int dataoff,
                       enum ip_conntrack_info ctinfo,
                       u_int8_t pf,
-                      unsigned int hooknum,
-                      unsigned int *timeouts);
+                      unsigned int hooknum);
 
         /* Called when a new connection for this protocol found;
          * returns TRUE if it's OK.  If so, packet() called next. */
         bool (*new)(struct nf_conn *ct, const struct sk_buff *skb,
-                    unsigned int dataoff, unsigned int *timeouts);
+                    unsigned int dataoff);
 
         /* Called when a conntrack entry is destroyed */
         void (*destroy)(struct nf_conn *ct);
@@ -62,9 +60,6 @@ struct nf_conntrack_l4proto {
         /* Print out the private part of the conntrack. */
         int (*print_conntrack)(struct seq_file *s, struct nf_conn *);
 
-        /* Return the array of timeouts for this protocol. */
-        unsigned int *(*get_timeouts)(struct net *net);
-
         /* convert protoinfo to nfnetink attributes */
         int (*to_nlattr)(struct sk_buff *skb, struct nlattr *nla,
                          struct nf_conn *ct);
@@ -84,24 +79,15 @@ struct nf_conntrack_l4proto {
 
         size_t nla_size;
 
-#if IS_ENABLED(CONFIG_NF_CT_NETLINK_TIMEOUT)
-        struct {
-                size_t obj_size;
-                int (*nlattr_to_obj)(struct nlattr *tb[],
-                                     struct net *net, void *data);
-                int (*obj_to_nlattr)(struct sk_buff *skb, const void *data);
-
-                unsigned int nlattr_max;
-                const struct nla_policy *nla_policy;
-        } ctnl_timeout;
+#ifdef CONFIG_SYSCTL
+        struct ctl_table_header **ctl_table_header;
+        struct ctl_table        *ctl_table;
+        unsigned int            *ctl_table_users;
+#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
+        struct ctl_table_header *ctl_compat_table_header;
+        struct ctl_table        *ctl_compat_table;
+#endif
 #endif
-        int     *net_id;
-        /* Init l4proto pernet data */
-        int (*init_net)(struct net *net, u_int16_t proto);
-
-        /* Return the per-net protocol part. */
-        struct nf_proto_net *(*get_net_proto)(struct net *net);
-
         /* Protocol name */
         const char *name;
 
@@ -117,23 +103,9 @@ extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
 extern struct nf_conntrack_l4proto *
 __nf_ct_l4proto_find(u_int16_t l3proto, u_int8_t l4proto);
 
-extern struct nf_conntrack_l4proto *
-nf_ct_l4proto_find_get(u_int16_t l3proto, u_int8_t l4proto);
-extern void nf_ct_l4proto_put(struct nf_conntrack_l4proto *p);
-
 /* Protocol registration. */
-extern int nf_conntrack_l4proto_register(struct net *net,
-                                         struct nf_conntrack_l4proto *proto);
-extern void nf_conntrack_l4proto_unregister(struct net *net,
-                                            struct nf_conntrack_l4proto *proto);
-
-static inline void nf_ct_kfree_compat_sysctl_table(struct nf_proto_net *pn)
-{
-#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
-        kfree(pn->ctl_compat_table);
-        pn->ctl_compat_table = NULL;
-#endif
-}
+extern int nf_conntrack_l4proto_register(struct nf_conntrack_l4proto *proto);
+extern void nf_conntrack_l4proto_unregister(struct nf_conntrack_l4proto *proto);
 
 /* Generic netlink helpers */
 extern int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb,
diff --git a/include/net/netfilter/nf_conntrack_timeout.h b/include/net/netfilter/nf_conntrack_timeout.h
deleted file mode 100644
index e41e472d08f..00000000000
--- a/include/net/netfilter/nf_conntrack_timeout.h
+++ /dev/null
@@ -1,98 +0,0 @@
-#ifndef _NF_CONNTRACK_TIMEOUT_H
-#define _NF_CONNTRACK_TIMEOUT_H
-
-#include <net/net_namespace.h>
-#include <linux/netfilter/nf_conntrack_common.h>
-#include <linux/netfilter/nf_conntrack_tuple_common.h>
-#include <net/netfilter/nf_conntrack.h>
-#include <net/netfilter/nf_conntrack_extend.h>
-
-#define CTNL_TIMEOUT_NAME_MAX   32
-
-struct ctnl_timeout {
-        struct list_head        head;
-        struct rcu_head         rcu_head;
-        atomic_t                refcnt;
-        char                    name[CTNL_TIMEOUT_NAME_MAX];
-        __u16                   l3num;
-        struct nf_conntrack_l4proto *l4proto;
-        char                    data[0];
-};
-
-struct nf_conn_timeout {
-        struct ctnl_timeout     *timeout;
-};
-
-#define NF_CT_TIMEOUT_EXT_DATA(__t) (unsigned int *) &((__t)->timeout->data)
-
-static inline
-struct nf_conn_timeout *nf_ct_timeout_find(const struct nf_conn *ct)
-{
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-        return nf_ct_ext_find(ct, NF_CT_EXT_TIMEOUT);
-#else
-        return NULL;
-#endif
-}
-
-static inline
-struct nf_conn_timeout *nf_ct_timeout_ext_add(struct nf_conn *ct,
-                                              struct ctnl_timeout *timeout,
-                                              gfp_t gfp)
-{
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-        struct nf_conn_timeout *timeout_ext;
-
-        timeout_ext = nf_ct_ext_add(ct, NF_CT_EXT_TIMEOUT, gfp);
-        if (timeout_ext == NULL)
-                return NULL;
-
-        timeout_ext->timeout = timeout;
-
-        return timeout_ext;
-#else
-        return NULL;
-#endif
-};
-
-static inline unsigned int *
-nf_ct_timeout_lookup(struct net *net, struct nf_conn *ct,
-                     struct nf_conntrack_l4proto *l4proto)
-{
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-        struct nf_conn_timeout *timeout_ext;
-        unsigned int *timeouts;
-
-        timeout_ext = nf_ct_timeout_find(ct);
-        if (timeout_ext)
-                timeouts = NF_CT_TIMEOUT_EXT_DATA(timeout_ext);
-        else
-                timeouts = l4proto->get_timeouts(net);
-
-        return timeouts;
-#else
-        return l4proto->get_timeouts(net);
-#endif
-}
-
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-extern int nf_conntrack_timeout_init(struct net *net);
-extern void nf_conntrack_timeout_fini(struct net *net);
-#else
-static inline int nf_conntrack_timeout_init(struct net *net)
-{
-        return 0;
-}
-
-static inline void nf_conntrack_timeout_fini(struct net *net)
-{
-        return;
-}
-#endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
-
-#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
-extern struct ctnl_timeout *(*nf_ct_timeout_find_get_hook)(const char *name);
-extern void (*nf_ct_timeout_put_hook)(struct ctnl_timeout *timeout);
-#endif
-
-#endif /* _NF_CONNTRACK_TIMEOUT_H */
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h
index aea3f8221be..7ca6bdd5bae 100644
--- a/include/net/netfilter/nf_conntrack_tuple.h
+++ b/include/net/netfilter/nf_conntrack_tuple.h
@@ -24,6 +24,32 @@
 
 #define NF_CT_TUPLE_L3SIZE      ARRAY_SIZE(((union nf_inet_addr *)NULL)->all)
 
+/* The protocol-specific manipulable parts of the tuple: always in
+   network order! */
+union nf_conntrack_man_proto {
+        /* Add other protocols here. */
+        __be16 all;
+
+        struct {
+                __be16 port;
+        } tcp;
+        struct {
+                __be16 port;
+        } udp;
+        struct {
+                __be16 id;
+        } icmp;
+        struct {
+                __be16 port;
+        } dccp;
+        struct {
+                __be16 port;
+        } sctp;
+        struct {
+                __be16 key;     /* GRE key is 32bit, PPtP only uses 16bit */
+        } gre;
+};
+
 /* The manipulable part of the tuple. */
 struct nf_conntrack_man {
         union nf_inet_addr u3;
diff --git a/include/net/netfilter/nf_log.h b/include/net/netfilter/nf_log.h
index e991bd0a27a..920997f1aff 100644
--- a/include/net/netfilter/nf_log.h
+++ b/include/net/netfilter/nf_log.h
@@ -53,13 +53,12 @@ int nf_log_bind_pf(u_int8_t pf, const struct nf_logger *logger);
 void nf_log_unbind_pf(u_int8_t pf);
 
 /* Calls the registered backend logging function */
-__printf(7, 8)
 void nf_log_packet(u_int8_t pf,
                    unsigned int hooknum,
                    const struct sk_buff *skb,
                    const struct net_device *in,
                    const struct net_device *out,
                    const struct nf_loginfo *li,
-                   const char *fmt, ...);
+                   const char *fmt, ...) __attribute__ ((format(printf,7,8)));
 
 #endif /* _NF_LOG_H */
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h
index ad14a799fd2..0346b007086 100644
--- a/include/net/netfilter/nf_nat.h
+++ b/include/net/netfilter/nf_nat.h
@@ -1,18 +1,24 @@
 #ifndef _NF_NAT_H
 #define _NF_NAT_H
 #include <linux/netfilter_ipv4.h>
-#include <linux/netfilter/nf_nat.h>
 #include <net/netfilter/nf_conntrack_tuple.h>
 
+#define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16
+
 enum nf_nat_manip_type {
-        NF_NAT_MANIP_SRC,
-        NF_NAT_MANIP_DST
+        IP_NAT_MANIP_SRC,
+        IP_NAT_MANIP_DST
 };
 
 /* SRC manip occurs POST_ROUTING or LOCAL_IN */
 #define HOOK2MANIP(hooknum) ((hooknum) != NF_INET_POST_ROUTING && \
                              (hooknum) != NF_INET_LOCAL_IN)
 
+#define IP_NAT_RANGE_MAP_IPS 1
+#define IP_NAT_RANGE_PROTO_SPECIFIED 2
+#define IP_NAT_RANGE_PROTO_RANDOM 4
+#define IP_NAT_RANGE_PERSISTENT 8
+
 /* NAT sequence number modifications */
 struct nf_nat_seq {
         /* position of the last TCP sequence number modification (if any) */
@@ -22,6 +28,26 @@ struct nf_nat_seq {
         int16_t offset_before, offset_after;
 };
 
+/* Single range specification. */
+struct nf_nat_range {
+        /* Set to OR of flags above. */
+        unsigned int flags;
+
+        /* Inclusive: network order. */
+        __be32 min_ip, max_ip;
+
+        /* Inclusive: network order */
+        union nf_conntrack_man_proto min, max;
+};
+
+/* For backwards compat: don't use in modern code. */
+struct nf_nat_multi_range_compat {
+        unsigned int rangesize; /* Must be 1. */
+
+        /* hangs off end. */
+        struct nf_nat_range range[1];
+};
+
 #include <linux/list.h>
 #include <linux/netfilter/nf_conntrack_pptp.h>
 #include <net/netfilter/nf_conntrack_extend.h>
@@ -43,9 +69,7 @@ struct nf_conn_nat {
         struct nf_conn *ct;
         union nf_conntrack_nat_help help;
 #if defined(CONFIG_IP_NF_TARGET_MASQUERADE) || \
-    defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE) || \
-    defined(CONFIG_IP6_NF_TARGET_MASQUERADE) || \
-    defined(CONFIG_IP6_NF_TARGET_MASQUERADE_MODULE)
+    defined(CONFIG_IP_NF_TARGET_MASQUERADE_MODULE)
         int masq_index;
 #endif
 };
@@ -68,19 +92,4 @@ static inline struct nf_conn_nat *nfct_nat(const struct nf_conn *ct)
 #endif
 }
 
-static inline bool nf_nat_oif_changed(unsigned int hooknum,
-                                      enum ip_conntrack_info ctinfo,
-                                      struct nf_conn_nat *nat,
-                                      const struct net_device *out)
-{
-#if IS_ENABLED(CONFIG_IP_NF_TARGET_MASQUERADE) || \
-    IS_ENABLED(CONFIG_IP6_NF_TARGET_MASQUERADE)
-        return nat->masq_index && hooknum == NF_INET_POST_ROUTING &&
-               CTINFO2DIR(ctinfo) == IP_CT_DIR_ORIGINAL &&
-               nat->masq_index != out->ifindex;
-#else
-        return false;
-#endif
-}
-
 #endif
diff --git a/include/net/netfilter/nf_nat_core.h b/include/net/netfilter/nf_nat_core.h
index 972e1e47ec7..3dc7b98effe 100644
--- a/include/net/netfilter/nf_nat_core.h
+++ b/include/net/netfilter/nf_nat_core.h
@@ -12,12 +12,15 @@ extern unsigned int nf_nat_packet(struct nf_conn *ct,
                                   unsigned int hooknum,
                                   struct sk_buff *skb);
 
-extern int nf_xfrm_me_harder(struct sk_buff *skb, unsigned int family);
+extern int nf_nat_icmp_reply_translation(struct nf_conn *ct,
+                                         enum ip_conntrack_info ctinfo,
+                                         unsigned int hooknum,
+                                         struct sk_buff *skb);
 
 static inline int nf_nat_initialized(struct nf_conn *ct,
                                      enum nf_nat_manip_type manip)
 {
-        if (manip == NF_NAT_MANIP_SRC)
+        if (manip == IP_NAT_MANIP_SRC)
                 return ct->status & IPS_SRC_NAT_DONE;
         else
                 return ct->status & IPS_DST_NAT_DONE;
diff --git a/include/net/netfilter/nf_nat_helper.h b/include/net/netfilter/nf_nat_helper.h
index b4d6bfc2af0..02bb6c29dc3 100644
--- a/include/net/netfilter/nf_nat_helper.h
+++ b/include/net/netfilter/nf_nat_helper.h
@@ -10,7 +10,6 @@ struct sk_buff;
 extern int __nf_nat_mangle_tcp_packet(struct sk_buff *skb,
                                       struct nf_conn *ct,
                                       enum ip_conntrack_info ctinfo,
-                                      unsigned int protoff,
                                       unsigned int match_offset,
                                       unsigned int match_len,
                                       const char *rep_buffer,
@@ -19,13 +18,12 @@ extern int __nf_nat_mangle_tcp_packet(struct sk_buff *skb,
 static inline int nf_nat_mangle_tcp_packet(struct sk_buff *skb,
                                            struct nf_conn *ct,
                                            enum ip_conntrack_info ctinfo,
-                                           unsigned int protoff,
                                            unsigned int match_offset,
                                            unsigned int match_len,
                                            const char *rep_buffer,
                                            unsigned int rep_len)
 {
-        return __nf_nat_mangle_tcp_packet(skb, ct, ctinfo, protoff,
+        return __nf_nat_mangle_tcp_packet(skb, ct, ctinfo,
                                           match_offset, match_len,
                                           rep_buffer, rep_len, true);
 }
@@ -33,7 +31,6 @@ static inline int nf_nat_mangle_tcp_packet(struct sk_buff *skb,
 extern int nf_nat_mangle_udp_packet(struct sk_buff *skb,
                                     struct nf_conn *ct,
                                     enum ip_conntrack_info ctinfo,
-                                    unsigned int protoff,
                                     unsigned int match_offset,
                                     unsigned int match_len,
                                     const char *rep_buffer,
@@ -44,12 +41,10 @@ extern void nf_nat_set_seq_adjust(struct nf_conn *ct,
                                   __be32 seq, s16 off);
 extern int nf_nat_seq_adjust(struct sk_buff *skb,
                              struct nf_conn *ct,
-                             enum ip_conntrack_info ctinfo,
-                             unsigned int protoff);
+                             enum ip_conntrack_info ctinfo);
 extern int (*nf_nat_seq_adjust_hook)(struct sk_buff *skb,
                                      struct nf_conn *ct,
-                                     enum ip_conntrack_info ctinfo,
-                                     unsigned int protoff);
+                                     enum ip_conntrack_info ctinfo);
 
 /* Setup NAT on this expected conntrack so it follows master, but goes
  * to port ct->master->saved_proto. */
@@ -59,8 +54,4 @@ extern void nf_nat_follow_master(struct nf_conn *ct,
 extern s16 nf_nat_get_offset(const struct nf_conn *ct,
                              enum ip_conntrack_dir dir,
                              u32 seq);
-
-extern void nf_nat_tcp_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
-                                  u32 dir, int off);
-
 #endif
diff --git a/include/net/netfilter/nf_nat_l3proto.h b/include/net/netfilter/nf_nat_l3proto.h
deleted file mode 100644
index bd3b97e02c8..00000000000
--- a/include/net/netfilter/nf_nat_l3proto.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _NF_NAT_L3PROTO_H
-#define _NF_NAT_L3PROTO_H
-
-struct nf_nat_l4proto;
-struct nf_nat_l3proto {
-        u8      l3proto;
-
-        bool    (*in_range)(const struct nf_conntrack_tuple *t,
-                            const struct nf_nat_range *range);
-
-        u32     (*secure_port)(const struct nf_conntrack_tuple *t, __be16);
-
-        bool    (*manip_pkt)(struct sk_buff *skb,
-                             unsigned int iphdroff,
-                             const struct nf_nat_l4proto *l4proto,
-                             const struct nf_conntrack_tuple *target,
-                             enum nf_nat_manip_type maniptype);
-
-        void    (*csum_update)(struct sk_buff *skb, unsigned int iphdroff,
-                               __sum16 *check,
-                               const struct nf_conntrack_tuple *t,
-                               enum nf_nat_manip_type maniptype);
-
-        void    (*csum_recalc)(struct sk_buff *skb, u8 proto,
-                               void *data, __sum16 *check,
-                               int datalen, int oldlen);
-
-        void    (*decode_session)(struct sk_buff *skb,
-                                  const struct nf_conn *ct,
-                                  enum ip_conntrack_dir dir,
-                                  unsigned long statusbit,
-                                  struct flowi *fl);
-
-        int     (*nlattr_to_range)(struct nlattr *tb[],
-                                   struct nf_nat_range *range);
-};
-
-extern int nf_nat_l3proto_register(const struct nf_nat_l3proto *);
-extern void nf_nat_l3proto_unregister(const struct nf_nat_l3proto *);
-extern const struct nf_nat_l3proto *__nf_nat_l3proto_find(u8 l3proto);
-
-extern int nf_nat_icmp_reply_translation(struct sk_buff *skb,
-                                         struct nf_conn *ct,
-                                         enum ip_conntrack_info ctinfo,
-                                         unsigned int hooknum);
-extern int nf_nat_icmpv6_reply_translation(struct sk_buff *skb,
-                                           struct nf_conn *ct,
-                                           enum ip_conntrack_info ctinfo,
-                                           unsigned int hooknum,
-                                           unsigned int hdrlen);
-
-#endif /* _NF_NAT_L3PROTO_H */
diff --git a/include/net/netfilter/nf_nat_l4proto.h b/include/net/netfilter/nf_nat_l4proto.h
deleted file mode 100644
index 24feb68d1bc..00000000000
--- a/include/net/netfilter/nf_nat_l4proto.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Header for use in defining a given protocol. */
-#ifndef _NF_NAT_L4PROTO_H
-#define _NF_NAT_L4PROTO_H
-#include <net/netfilter/nf_nat.h>
-#include <linux/netfilter/nfnetlink_conntrack.h>
-
-struct nf_nat_range;
-struct nf_nat_l3proto;
-
-struct nf_nat_l4proto {
-        /* Protocol number. */
-        u8 l4proto;
-
-        /* Translate a packet to the target according to manip type.
-         * Return true if succeeded.
-         */
-        bool (*manip_pkt)(struct sk_buff *skb,
-                          const struct nf_nat_l3proto *l3proto,
-                          unsigned int iphdroff, unsigned int hdroff,
-                          const struct nf_conntrack_tuple *tuple,
-                          enum nf_nat_manip_type maniptype);
-
-        /* Is the manipable part of the tuple between min and max incl? */
-        bool (*in_range)(const struct nf_conntrack_tuple *tuple,
-                         enum nf_nat_manip_type maniptype,
-                         const union nf_conntrack_man_proto *min,
-                         const union nf_conntrack_man_proto *max);
-
-        /* Alter the per-proto part of the tuple (depending on
-         * maniptype), to give a unique tuple in the given range if
-         * possible.  Per-protocol part of tuple is initialized to the
-         * incoming packet.
-         */
-        void (*unique_tuple)(const struct nf_nat_l3proto *l3proto,
-                             struct nf_conntrack_tuple *tuple,
-                             const struct nf_nat_range *range,
-                             enum nf_nat_manip_type maniptype,
-                             const struct nf_conn *ct);
-
-        int (*nlattr_to_range)(struct nlattr *tb[],
-                               struct nf_nat_range *range);
-};
-
-/* Protocol registration. */
-extern int nf_nat_l4proto_register(u8 l3proto, const struct nf_nat_l4proto *l4proto);
-extern void nf_nat_l4proto_unregister(u8 l3proto, const struct nf_nat_l4proto *l4proto);
-
-extern const struct nf_nat_l4proto *__nf_nat_l4proto_find(u8 l3proto, u8 l4proto);
-
-/* Built-in protocols. */
-extern const struct nf_nat_l4proto nf_nat_l4proto_tcp;
-extern const struct nf_nat_l4proto nf_nat_l4proto_udp;
-extern const struct nf_nat_l4proto nf_nat_l4proto_icmp;
-extern const struct nf_nat_l4proto nf_nat_l4proto_icmpv6;
-extern const struct nf_nat_l4proto nf_nat_l4proto_unknown;
-
-extern bool nf_nat_l4proto_in_range(const struct nf_conntrack_tuple *tuple,
-                                    enum nf_nat_manip_type maniptype,
-                                    const union nf_conntrack_man_proto *min,
-                                    const union nf_conntrack_man_proto *max);
-
-extern void nf_nat_l4proto_unique_tuple(const struct nf_nat_l3proto *l3proto,
-                                        struct nf_conntrack_tuple *tuple,
-                                        const struct nf_nat_range *range,
-                                        enum nf_nat_manip_type maniptype,
-                                        const struct nf_conn *ct,
-                                        u16 *rover);
-
-extern int nf_nat_l4proto_nlattr_to_range(struct nlattr *tb[],
-                                          struct nf_nat_range *range);
-
-#endif /*_NF_NAT_L4PROTO_H*/
diff --git a/include/net/netfilter/nf_queue.h b/include/net/netfilter/nf_queue.h
index fb1c0be38b6..252fd1010b7 100644
--- a/include/net/netfilter/nf_queue.h
+++ b/include/net/netfilter/nf_queue.h
@@ -21,10 +21,14 @@ struct nf_queue_entry {
 struct nf_queue_handler {
         int                     (*outfn)(struct nf_queue_entry *entry,
                                          unsigned int queuenum);
+        char                    *name;
 };
 
-void nf_register_queue_handler(const struct nf_queue_handler *qh);
-void nf_unregister_queue_handler(void);
+extern int nf_register_queue_handler(u_int8_t pf,
+                                     const struct nf_queue_handler *qh);
+extern int nf_unregister_queue_handler(u_int8_t pf,
+                                       const struct nf_queue_handler *qh);
+extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
 extern void nf_reinject(struct nf_queue_entry *entry, unsigned int verdict);
 
 #endif /* _NF_QUEUE_H */
diff --git a/include/net/netfilter/nf_tproxy_core.h b/include/net/netfilter/nf_tproxy_core.h
index 75ca9291cf2..e505358d899 100644
--- a/include/net/netfilter/nf_tproxy_core.h
+++ b/include/net/netfilter/nf_tproxy_core.h
@@ -131,7 +131,7 @@ nf_tproxy_get_sock_v4(struct net *net, const u8 protocol,
         return sk;
 }
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 static inline struct sock *
 nf_tproxy_get_sock_v6(struct net *net, const u8 protocol,
                       const struct in6_addr *saddr, const struct in6_addr *daddr,
diff --git a/include/net/netfilter/nfnetlink_queue.h b/include/net/netfilter/nfnetlink_queue.h
deleted file mode 100644
index 86267a52951..00000000000
--- a/include/net/netfilter/nfnetlink_queue.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _NET_NFNL_QUEUE_H_
-#define _NET_NFNL_QUEUE_H_
-
-#include <linux/netfilter/nf_conntrack_common.h>
-
-struct nf_conn;
-
-#ifdef CONFIG_NETFILTER_NETLINK_QUEUE_CT
-struct nf_conn *nfqnl_ct_get(struct sk_buff *entskb, size_t *size,
-                             enum ip_conntrack_info *ctinfo);
-struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb,
-                               const struct nlattr *attr,
-                               enum ip_conntrack_info *ctinfo);
-int nfqnl_ct_put(struct sk_buff *skb, struct nf_conn *ct,
-                 enum ip_conntrack_info ctinfo);
-void nfqnl_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
-                         enum ip_conntrack_info ctinfo, int diff);
-#else
-inline struct nf_conn *
-nfqnl_ct_get(struct sk_buff *entskb, size_t *size, enum ip_conntrack_info *ctinfo)
-{
-        return NULL;
-}
-
-inline struct nf_conn *nfqnl_ct_parse(const struct sk_buff *skb,
-                                      const struct nlattr *attr,
-                                      enum ip_conntrack_info *ctinfo)
-{
-        return NULL;
-}
-
-inline int
-nfqnl_ct_put(struct sk_buff *skb, struct nf_conn *ct, enum ip_conntrack_info ctinfo)
-{
-        return 0;
-}
-
-inline void nfqnl_ct_seq_adjust(struct sk_buff *skb, struct nf_conn *ct,
-                                enum ip_conntrack_info ctinfo, int diff)
-{
-}
-#endif /* NF_CONNTRACK */
-#endif
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h
index 9d9756cca01..0dfb34a5b53 100644
--- a/include/net/netfilter/xt_log.h
+++ b/include/net/netfilter/xt_log.h
@@ -6,7 +6,7 @@ struct sbuff {
 };
 static struct sbuff emergency, *emergency_ptr = &emergency;
 
-static __printf(2, 3) int sb_add(struct sbuff *m, const char *f, ...)
+static int sb_add(struct sbuff *m, const char *f, ...)
 {
         va_list args;
         int len;
@@ -47,7 +47,7 @@ static void sb_close(struct sbuff *m)
         if (likely(m != &emergency))
                 kfree(m);
         else {
-                emergency_ptr = m;
+                xchg(&emergency_ptr, m);
                 local_bh_enable();
         }
 }
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 2c95d55f791..f67440970d7 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -110,7 +110,7 @@ struct cipso_v4_doi;
 /* NetLabel audit information */
 struct netlbl_audit {
         u32 secid;
-        kuid_t loginuid;
+        uid_t loginuid;
         u32 sessionid;
 };
 
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 9690b0f6698..98c185441be 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -98,14 +98,24 @@
  *   nla_put_u16(skb, type, value)      add u16 attribute to skb
  *   nla_put_u32(skb, type, value)      add u32 attribute to skb
  *   nla_put_u64(skb, type, value)      add u64 attribute to skb
- *   nla_put_s8(skb, type, value)       add s8 attribute to skb
- *   nla_put_s16(skb, type, value)      add s16 attribute to skb
- *   nla_put_s32(skb, type, value)      add s32 attribute to skb
- *   nla_put_s64(skb, type, value)      add s64 attribute to skb
  *   nla_put_string(skb, type, str)     add string attribute to skb
  *   nla_put_flag(skb, type)            add flag attribute to skb
  *   nla_put_msecs(skb, type, jiffies)  add msecs attribute to skb
  *
+ * Exceptions Based Attribute Construction:
+ *   NLA_PUT(skb, type, len, data)      add attribute to skb
+ *   NLA_PUT_U8(skb, type, value)       add u8 attribute to skb
+ *   NLA_PUT_U16(skb, type, value)      add u16 attribute to skb
+ *   NLA_PUT_U32(skb, type, value)      add u32 attribute to skb
+ *   NLA_PUT_U64(skb, type, value)      add u64 attribute to skb
+ *   NLA_PUT_STRING(skb, type, str)     add string attribute to skb
+ *   NLA_PUT_FLAG(skb, type)            add flag attribute to skb
+ *   NLA_PUT_MSECS(skb, type, jiffies)  add msecs attribute to skb
+ *
+ *   The meaning of these functions is equal to their lower case
+ *   variants but they jump to the label nla_put_failure in case
+ *   of a failure.
+ *
  * Nested Attributes Construction:
  *   nla_nest_start(skb, type)          start a nested attribute
  *   nla_nest_end(skb, nla)             finalize a nested attribute
@@ -125,10 +135,6 @@
  *   nla_get_u16(nla)                   get payload for a u16 attribute
  *   nla_get_u32(nla)                   get payload for a u32 attribute
  *   nla_get_u64(nla)                   get payload for a u64 attribute
- *   nla_get_s8(nla)                    get payload for a s8 attribute
- *   nla_get_s16(nla)                   get payload for a s16 attribute
- *   nla_get_s32(nla)                   get payload for a s32 attribute
- *   nla_get_s64(nla)                   get payload for a s64 attribute
  *   nla_get_flag(nla)                  return 1 if flag is true
  *   nla_get_msecs(nla)                 get payload for a msecs attribute
  *
@@ -168,10 +174,6 @@ enum {
         NLA_NESTED_COMPAT,
         NLA_NUL_STRING,
         NLA_BINARY,
-        NLA_S8,
-        NLA_S16,
-        NLA_S32,
-        NLA_S64,
         __NLA_TYPE_MAX,
 };
 
@@ -190,17 +192,8 @@ enum {
  *    NLA_NUL_STRING       Maximum length of string (excluding NUL)
  *    NLA_FLAG             Unused
  *    NLA_BINARY           Maximum length of attribute payload
- *    NLA_NESTED           Don't use `len' field -- length verification is
- *                         done by checking len of nested header (or empty)
- *    NLA_NESTED_COMPAT    Minimum length of structure payload
- *    NLA_U8, NLA_U16,
- *    NLA_U32, NLA_U64,
- *    NLA_S8, NLA_S16,
- *    NLA_S32, NLA_S64,
- *    NLA_MSECS            Leaving the length field zero will verify the
- *                         given type fits, using it verifies minimum length
- *                         just like "All other"
- *    All other            Minimum length of attribute payload
+ *    NLA_NESTED_COMPAT    Exact length of structure payload
+ *    All other            Exact length of attribute payload
  *
  * Example:
  * static const struct nla_policy my_policy[ATTR_MAX+1] = {
@@ -217,19 +210,19 @@ struct nla_policy {
 /**
  * struct nl_info - netlink source information
  * @nlh: Netlink message header of original request
- * @portid: Netlink PORTID of requesting application
+ * @pid: Netlink PID of requesting application
  */
 struct nl_info {
         struct nlmsghdr         *nlh;
         struct net              *nl_net;
-        u32                     portid;
+        u32                     pid;
 };
 
 extern int              netlink_rcv_skb(struct sk_buff *skb,
                                         int (*cb)(struct sk_buff *,
                                                   struct nlmsghdr *));
 extern int              nlmsg_notify(struct sock *sk, struct sk_buff *skb,
-                                     u32 portid, unsigned int group, int report,
+                                     u32 pid, unsigned int group, int report,
                                      gfp_t flags);
 
 extern int              nla_validate(const struct nlattr *head,
@@ -441,10 +434,45 @@ static inline int nlmsg_report(const struct nlmsghdr *nlh)
         nla_for_each_attr(pos, nlmsg_attrdata(nlh, hdrlen), \
                           nlmsg_attrlen(nlh, hdrlen), rem)
 
+#if 0
+/* FIXME: Enable once all users have been converted */
+
+/**
+ * __nlmsg_put - Add a new netlink message to an skb
+ * @skb: socket buffer to store message in
+ * @pid: netlink process id
+ * @seq: sequence number of message
+ * @type: message type
+ * @payload: length of message payload
+ * @flags: message flags
+ *
+ * The caller is responsible to ensure that the skb provides enough
+ * tailroom for both the netlink header and payload.
+ */
+static inline struct nlmsghdr *__nlmsg_put(struct sk_buff *skb, u32 pid,
+                                           u32 seq, int type, int payload,
+                                           int flags)
+{
+        struct nlmsghdr *nlh;
+
+        nlh = (struct nlmsghdr *) skb_put(skb, nlmsg_total_size(payload));
+        nlh->nlmsg_type = type;
+        nlh->nlmsg_len = nlmsg_msg_size(payload);
+        nlh->nlmsg_flags = flags;
+        nlh->nlmsg_pid = pid;
+        nlh->nlmsg_seq = seq;
+
+        memset((unsigned char *) nlmsg_data(nlh) + payload, 0,
+               nlmsg_padlen(payload));
+
+        return nlh;
+}
+#endif
+
 /**
  * nlmsg_put - Add a new netlink message to an skb
  * @skb: socket buffer to store message in
- * @portid: netlink process id
+ * @pid: netlink process id
  * @seq: sequence number of message
  * @type: message type
  * @payload: length of message payload
@@ -453,13 +481,13 @@ static inline int nlmsg_report(const struct nlmsghdr *nlh)
  * Returns NULL if the tailroom of the skb is insufficient to store
  * the message header and payload.
  */
-static inline struct nlmsghdr *nlmsg_put(struct sk_buff *skb, u32 portid, u32 seq,
+static inline struct nlmsghdr *nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq,
                                          int type, int payload, int flags)
 {
         if (unlikely(skb_tailroom(skb) < nlmsg_total_size(payload)))
                 return NULL;
 
-        return __nlmsg_put(skb, portid, seq, type, payload, flags);
+        return __nlmsg_put(skb, pid, seq, type, payload, flags);
 }
 
 /**
@@ -478,7 +506,7 @@ static inline struct nlmsghdr *nlmsg_put_answer(struct sk_buff *skb,
                                                 int type, int payload,
                                                 int flags)
 {
-        return nlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq,
+        return nlmsg_put(skb, NETLINK_CB(cb->skb).pid, cb->nlh->nlmsg_seq,
                          type, payload, flags);
 }
 
@@ -563,18 +591,18 @@ static inline void nlmsg_free(struct sk_buff *skb)
  * nlmsg_multicast - multicast a netlink message
  * @sk: netlink socket to spread messages to
  * @skb: netlink message as socket buffer
- * @portid: own netlink portid to avoid sending to yourself
+ * @pid: own netlink pid to avoid sending to yourself
  * @group: multicast group id
  * @flags: allocation flags
  */
 static inline int nlmsg_multicast(struct sock *sk, struct sk_buff *skb,
-                                  u32 portid, unsigned int group, gfp_t flags)
+                                  u32 pid, unsigned int group, gfp_t flags)
 {
         int err;
 
         NETLINK_CB(skb).dst_group = group;
 
-        err = netlink_broadcast(sk, skb, portid, group, flags);
+        err = netlink_broadcast(sk, skb, pid, group, flags);
         if (err > 0)
                 err = 0;
 
@@ -585,13 +613,13 @@ static inline int nlmsg_multicast(struct sock *sk, struct sk_buff *skb,
  * nlmsg_unicast - unicast a netlink message
  * @sk: netlink socket to spread message to
  * @skb: netlink message as socket buffer
- * @portid: netlink portid of the destination socket
+ * @pid: netlink pid of the destination socket
  */
-static inline int nlmsg_unicast(struct sock *sk, struct sk_buff *skb, u32 portid)
+static inline int nlmsg_unicast(struct sock *sk, struct sk_buff *skb, u32 pid)
 {
         int err;
 
-        err = netlink_unicast(sk, skb, portid, MSG_DONTWAIT);
+        err = netlink_unicast(sk, skb, pid, MSG_DONTWAIT);
         if (err > 0)
                 err = 0;
 
@@ -772,39 +800,6 @@ static inline int nla_put_u16(struct sk_buff *skb, int attrtype, u16 value)
 }
 
 /**
- * nla_put_be16 - Add a __be16 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_be16(struct sk_buff *skb, int attrtype, __be16 value)
-{
-        return nla_put(skb, attrtype, sizeof(__be16), &value);
-}
-
-/**
- * nla_put_net16 - Add 16-bit network byte order netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_net16(struct sk_buff *skb, int attrtype, __be16 value)
-{
-        return nla_put_be16(skb, attrtype | NLA_F_NET_BYTEORDER, value);
-}
-
-/**
- * nla_put_le16 - Add a __le16 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_le16(struct sk_buff *skb, int attrtype, __le16 value)
-{
-        return nla_put(skb, attrtype, sizeof(__le16), &value);
-}
-
-/**
  * nla_put_u32 - Add a u32 netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
@@ -816,40 +811,7 @@ static inline int nla_put_u32(struct sk_buff *skb, int attrtype, u32 value)
 }
 
 /**
- * nla_put_be32 - Add a __be32 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_be32(struct sk_buff *skb, int attrtype, __be32 value)
-{
-        return nla_put(skb, attrtype, sizeof(__be32), &value);
-}
-
-/**
- * nla_put_net32 - Add 32-bit network byte order netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value)
-{
-        return nla_put_be32(skb, attrtype | NLA_F_NET_BYTEORDER, value);
-}
-
-/**
- * nla_put_le32 - Add a __le32 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_le32(struct sk_buff *skb, int attrtype, __le32 value)
-{
-        return nla_put(skb, attrtype, sizeof(__le32), &value);
-}
-
-/**
- * nla_put_u64 - Add a u64 netlink attribute to a socket buffer
+ * nla_put_64 - Add a u64 netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
  * @value: numeric value
@@ -860,83 +822,6 @@ static inline int nla_put_u64(struct sk_buff *skb, int attrtype, u64 value)
 }
 
 /**
- * nla_put_be64 - Add a __be64 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_be64(struct sk_buff *skb, int attrtype, __be64 value)
-{
-        return nla_put(skb, attrtype, sizeof(__be64), &value);
-}
-
-/**
- * nla_put_net64 - Add 64-bit network byte order netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_net64(struct sk_buff *skb, int attrtype, __be64 value)
-{
-        return nla_put_be64(skb, attrtype | NLA_F_NET_BYTEORDER, value);
-}
-
-/**
- * nla_put_le64 - Add a __le64 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_le64(struct sk_buff *skb, int attrtype, __le64 value)
-{
-        return nla_put(skb, attrtype, sizeof(__le64), &value);
-}
-
-/**
- * nla_put_s8 - Add a s8 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_s8(struct sk_buff *skb, int attrtype, s8 value)
-{
-        return nla_put(skb, attrtype, sizeof(s8), &value);
-}
-
-/**
- * nla_put_s16 - Add a s16 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_s16(struct sk_buff *skb, int attrtype, s16 value)
-{
-        return nla_put(skb, attrtype, sizeof(s16), &value);
-}
-
-/**
- * nla_put_s32 - Add a s32 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_s32(struct sk_buff *skb, int attrtype, s32 value)
-{
-        return nla_put(skb, attrtype, sizeof(s32), &value);
-}
-
-/**
- * nla_put_s64 - Add a s64 netlink attribute to a socket buffer
- * @skb: socket buffer to add attribute to
- * @attrtype: attribute type
- * @value: numeric value
- */
-static inline int nla_put_s64(struct sk_buff *skb, int attrtype, s64 value)
-{
-        return nla_put(skb, attrtype, sizeof(s64), &value);
-}
-
-/**
  * nla_put_string - Add a string netlink attribute to a socket buffer
  * @skb: socket buffer to add attribute to
  * @attrtype: attribute type
@@ -971,6 +856,60 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype,
         return nla_put(skb, attrtype, sizeof(u64), &tmp);
 }
 
+#define NLA_PUT(skb, attrtype, attrlen, data) \
+        do { \
+                if (unlikely(nla_put(skb, attrtype, attrlen, data) < 0)) \
+                        goto nla_put_failure; \
+        } while(0)
+
+#define NLA_PUT_TYPE(skb, type, attrtype, value) \
+        do { \
+                type __tmp = value; \
+                NLA_PUT(skb, attrtype, sizeof(type), &__tmp); \
+        } while(0)
+
+#define NLA_PUT_U8(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, u8, attrtype, value)
+
+#define NLA_PUT_U16(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, u16, attrtype, value)
+
+#define NLA_PUT_LE16(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, __le16, attrtype, value)
+
+#define NLA_PUT_BE16(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, __be16, attrtype, value)
+
+#define NLA_PUT_NET16(skb, attrtype, value) \
+        NLA_PUT_BE16(skb, attrtype | NLA_F_NET_BYTEORDER, value)
+
+#define NLA_PUT_U32(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, u32, attrtype, value)
+
+#define NLA_PUT_BE32(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, __be32, attrtype, value)
+
+#define NLA_PUT_NET32(skb, attrtype, value) \
+        NLA_PUT_BE32(skb, attrtype | NLA_F_NET_BYTEORDER, value)
+
+#define NLA_PUT_U64(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, u64, attrtype, value)
+
+#define NLA_PUT_BE64(skb, attrtype, value) \
+        NLA_PUT_TYPE(skb, __be64, attrtype, value)
+
+#define NLA_PUT_NET64(skb, attrtype, value) \
+        NLA_PUT_BE64(skb, attrtype | NLA_F_NET_BYTEORDER, value)
+
+#define NLA_PUT_STRING(skb, attrtype, value) \
+        NLA_PUT(skb, attrtype, strlen(value) + 1, value)
+
+#define NLA_PUT_FLAG(skb, attrtype) \
+        NLA_PUT(skb, attrtype, 0, NULL)
+
+#define NLA_PUT_MSECS(skb, attrtype, jiffies) \
+        NLA_PUT_U64(skb, attrtype, jiffies_to_msecs(jiffies))
+
 /**
  * nla_get_u32 - return payload of u32 attribute
  * @nla: u32 netlink attribute
@@ -1052,46 +991,6 @@ static inline __be64 nla_get_be64(const struct nlattr *nla)
 }
 
 /**
- * nla_get_s32 - return payload of s32 attribute
- * @nla: s32 netlink attribute
- */
-static inline s32 nla_get_s32(const struct nlattr *nla)
-{
-        return *(s32 *) nla_data(nla);
-}
-
-/**
- * nla_get_s16 - return payload of s16 attribute
- * @nla: s16 netlink attribute
- */
-static inline s16 nla_get_s16(const struct nlattr *nla)
-{
-        return *(s16 *) nla_data(nla);
-}
-
-/**
- * nla_get_s8 - return payload of s8 attribute
- * @nla: s8 netlink attribute
- */
-static inline s8 nla_get_s8(const struct nlattr *nla)
-{
-        return *(s8 *) nla_data(nla);
-}
-
-/**
- * nla_get_s64 - return payload of s64 attribute
- * @nla: s64 netlink attribute
- */
-static inline s64 nla_get_s64(const struct nlattr *nla)
-{
-        s64 tmp;
-
-        nla_memcpy(&tmp, nla, sizeof(tmp));
-
-        return tmp;
-}
-
-/**
  * nla_get_flag - return payload of flag attribute
  * @nla: flag netlink attribute
  */
diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
index 923cb20051e..0249399e51a 100644
--- a/include/net/netns/conntrack.h
+++ b/include/net/netns/conntrack.h
@@ -4,64 +4,10 @@
 #include <linux/list.h>
 #include <linux/list_nulls.h>
 #include <linux/atomic.h>
-#include <linux/netfilter/nf_conntrack_tcp.h>
 
 struct ctl_table_header;
 struct nf_conntrack_ecache;
 
-struct nf_proto_net {
-#ifdef CONFIG_SYSCTL
-        struct ctl_table_header *ctl_table_header;
-        struct ctl_table        *ctl_table;
-#ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
-        struct ctl_table_header *ctl_compat_header;
-        struct ctl_table        *ctl_compat_table;
-#endif
-#endif
-        unsigned int            users;
-};
-
-struct nf_generic_net {
-        struct nf_proto_net pn;
-        unsigned int timeout;
-};
-
-struct nf_tcp_net {
-        struct nf_proto_net pn;
-        unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX];
-        unsigned int tcp_loose;
-        unsigned int tcp_be_liberal;
-        unsigned int tcp_max_retrans;
-};
-
-enum udp_conntrack {
-        UDP_CT_UNREPLIED,
-        UDP_CT_REPLIED,
-        UDP_CT_MAX
-};
-
-struct nf_udp_net {
-        struct nf_proto_net pn;
-        unsigned int timeouts[UDP_CT_MAX];
-};
-
-struct nf_icmp_net {
-        struct nf_proto_net pn;
-        unsigned int timeout;
-};
-
-struct nf_ip_net {
-        struct nf_generic_net   generic;
-        struct nf_tcp_net       tcp;
-        struct nf_udp_net       udp;
-        struct nf_icmp_net      icmp;
-        struct nf_icmp_net      icmpv6;
-#if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
-        struct ctl_table_header *ctl_table_header;
-        struct ctl_table        *ctl_table;
-#endif
-};
-
 struct netns_ct {
         atomic_t                count;
         unsigned int            expect_count;
@@ -71,29 +17,18 @@ struct netns_ct {
         struct hlist_head       *expect_hash;
         struct hlist_nulls_head unconfirmed;
         struct hlist_nulls_head dying;
-        struct hlist_nulls_head tmpl;
         struct ip_conntrack_stat __percpu *stat;
-        struct nf_ct_event_notifier __rcu *nf_conntrack_event_cb;
-        struct nf_exp_event_notifier __rcu *nf_expect_event_cb;
         int                     sysctl_events;
         unsigned int            sysctl_events_retry_timeout;
         int                     sysctl_acct;
         int                     sysctl_tstamp;
         int                     sysctl_checksum;
         unsigned int            sysctl_log_invalid; /* Log invalid packets */
-        int                     sysctl_auto_assign_helper;
-        bool                    auto_assign_helper_warned;
-        struct nf_ip_net        nf_ct_proto;
-#ifdef CONFIG_NF_NAT_NEEDED
-        struct hlist_head       *nat_bysource;
-        unsigned int            nat_htable_size;
-#endif
 #ifdef CONFIG_SYSCTL
         struct ctl_table_header *sysctl_header;
         struct ctl_table_header *acct_sysctl_header;
         struct ctl_table_header *tstamp_sysctl_header;
         struct ctl_table_header *event_sysctl_header;
-        struct ctl_table_header *helper_sysctl_header;
 #endif
         char                    *slabname;
 };
diff --git a/include/net/netns/generic.h b/include/net/netns/generic.h
index 0931618c0f7..d55f4344333 100644
--- a/include/net/netns/generic.h
+++ b/include/net/netns/generic.h
@@ -5,7 +5,6 @@
 #ifndef __NET_GENERIC_H__
 #define __NET_GENERIC_H__
 
-#include <linux/bug.h>
 #include <linux/rcupdate.h>
 
 /*
diff --git a/include/net/netns/hash.h b/include/net/netns/hash.h
index c06ac58ca10..548d78f2cc4 100644
--- a/include/net/netns/hash.h
+++ b/include/net/netns/hash.h
@@ -5,7 +5,7 @@
 
 struct net;
 
-static inline unsigned int net_hash_mix(struct net *net)
+static inline unsigned net_hash_mix(struct net *net)
 {
 #ifdef CONFIG_NET_NS
         /*
diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
index 2ae2b8372cf..d786b4fc02a 100644
--- a/include/net/netns/ipv4.h
+++ b/include/net/netns/ipv4.h
@@ -5,15 +5,12 @@
 #ifndef __NETNS_IPV4_H__
 #define __NETNS_IPV4_H__
 
-#include <linux/uidgid.h>
 #include <net/inet_frag.h>
 
-struct tcpm_hash_bucket;
 struct ctl_table_header;
 struct ipv4_devconf;
 struct fib_rules_ops;
 struct hlist_head;
-struct fib_table;
 struct sock;
 
 struct netns_ipv4 {
@@ -27,21 +24,13 @@ struct netns_ipv4 {
         struct ipv4_devconf     *devconf_dflt;
 #ifdef CONFIG_IP_MULTIPLE_TABLES
         struct fib_rules_ops    *rules_ops;
-        bool                    fib_has_custom_rules;
-        struct fib_table        *fib_local;
-        struct fib_table        *fib_main;
-        struct fib_table        *fib_default;
-#endif
-#ifdef CONFIG_IP_ROUTE_CLASSID
-        int                     fib_num_tclassid_users;
 #endif
         struct hlist_head       *fib_table_hash;
         struct sock             *fibnl;
 
         struct sock             **icmp_sk;
-        struct inet_peer_base   *peers;
-        struct tcpm_hash_bucket *tcp_metrics_hash;
-        unsigned int            tcp_metrics_hash_log;
+        struct sock             *tcp_sock;
+
         struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
         struct xt_table         *iptable_filter;
@@ -52,6 +41,8 @@ struct netns_ipv4 {
         struct xt_table         *iptable_security;
 #endif
         struct xt_table         *nat_table;
+        struct hlist_head       *nat_bysource;
+        unsigned int            nat_htable_size;
 #endif
 
         int sysctl_icmp_echo_ignore_all;
@@ -60,10 +51,12 @@ 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;
 
-        kgid_t sysctl_ping_group_range[2];
-        long sysctl_tcp_mem[3];
+        unsigned int sysctl_ping_group_range[2];
 
+        atomic_t rt_genid;
         atomic_t dev_addr_genid;
 
 #ifdef CONFIG_IP_MROUTE
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 214cb0a5335..81abfcb2eb4 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -12,9 +12,7 @@ struct ctl_table_header;
 
 struct netns_sysctl_ipv6 {
 #ifdef CONFIG_SYSCTL
-        struct ctl_table_header *hdr;
-        struct ctl_table_header *route_hdr;
-        struct ctl_table_header *icmp_hdr;
+        struct ctl_table_header *table;
         struct ctl_table_header *frags_hdr;
 #endif
         int bindv6only;
@@ -33,7 +31,6 @@ struct netns_ipv6 {
         struct netns_sysctl_ipv6 sysctl;
         struct ipv6_devconf     *devconf_all;
         struct ipv6_devconf     *devconf_dflt;
-        struct inet_peer_base   *peers;
         struct netns_frags      frags;
 #ifdef CONFIG_NETFILTER
         struct xt_table         *ip6table_filter;
@@ -42,7 +39,6 @@ struct netns_ipv6 {
 #ifdef CONFIG_SECURITY
         struct xt_table         *ip6table_security;
 #endif
-        struct xt_table         *ip6table_nat;
 #endif
         struct rt6_info         *ip6_null_entry;
         struct rt6_statistics   *rt6_stats;
@@ -71,12 +67,4 @@ struct netns_ipv6 {
 #endif
 #endif
 };
-
-#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
-struct netns_nf_frag {
-        struct netns_sysctl_ipv6 sysctl;
-        struct netns_frags      frags;
-};
-#endif
-
 #endif
diff --git a/include/net/netns/mib.h b/include/net/netns/mib.h
index d542a4b28cc..0b44112e236 100644
--- a/include/net/netns/mib.h
+++ b/include/net/netns/mib.h
@@ -10,15 +10,15 @@ struct netns_mib {
         DEFINE_SNMP_STAT(struct udp_mib, udp_statistics);
         DEFINE_SNMP_STAT(struct udp_mib, udplite_statistics);
         DEFINE_SNMP_STAT(struct icmp_mib, icmp_statistics);
-        DEFINE_SNMP_STAT_ATOMIC(struct icmpmsg_mib, icmpmsg_statistics);
+        DEFINE_SNMP_STAT(struct icmpmsg_mib, icmpmsg_statistics);
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct proc_dir_entry *proc_net_devsnmp6;
         DEFINE_SNMP_STAT(struct udp_mib, udp_stats_in6);
         DEFINE_SNMP_STAT(struct udp_mib, udplite_stats_in6);
         DEFINE_SNMP_STAT(struct ipstats_mib, ipv6_statistics);
         DEFINE_SNMP_STAT(struct icmpv6_mib, icmpv6_statistics);
-        DEFINE_SNMP_STAT_ATOMIC(struct icmpv6msg_mib, icmpv6msg_statistics);
+        DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg_statistics);
 #endif
 #ifdef CONFIG_XFRM_STATISTICS
         DEFINE_SNMP_STAT(struct linux_xfrm_mib, xfrm_statistics);
diff --git a/include/net/netns/packet.h b/include/net/netns/packet.h
index 17ec2b95c06..cb4e894c0f8 100644
--- a/include/net/netns/packet.h
+++ b/include/net/netns/packet.h
@@ -5,10 +5,10 @@
 #define __NETNS_PACKET_H__
 
 #include <linux/rculist.h>
-#include <linux/mutex.h>
+#include <linux/spinlock.h>
 
 struct netns_packet {
-        struct mutex            sklist_lock;
+        spinlock_t              sklist_lock;
         struct hlist_head       sklist;
 };
 
diff --git a/include/net/netns/sctp.h b/include/net/netns/sctp.h
deleted file mode 100644
index 3573a81815a..00000000000
--- a/include/net/netns/sctp.h
+++ /dev/null
@@ -1,134 +0,0 @@
-#ifndef __NETNS_SCTP_H__
-#define __NETNS_SCTP_H__
-
-struct sock;
-struct proc_dir_entry;
-struct sctp_mib;
-struct ctl_table_header;
-
-struct netns_sctp {
-        DEFINE_SNMP_STAT(struct sctp_mib, sctp_statistics);
-
-#ifdef CONFIG_PROC_FS
-        struct proc_dir_entry *proc_net_sctp;
-#endif
-#ifdef CONFIG_SYSCTL
-        struct ctl_table_header *sysctl_header;
-#endif
-        /* This is the global socket data structure used for responding to
-         * the Out-of-the-blue (OOTB) packets.  A control sock will be created
-         * for this socket at the initialization time.
-         */
-        struct sock *ctl_sock;
-
-        /* This is the global local address list.
-         * We actively maintain this complete list of addresses on
-         * the system by catching address add/delete events.
-         *
-         * It is a list of sctp_sockaddr_entry.
-         */
-        struct list_head local_addr_list;
-        struct list_head addr_waitq;
-        struct timer_list addr_wq_timer;
-        struct list_head auto_asconf_splist;
-        spinlock_t addr_wq_lock;
-
-        /* Lock that protects the local_addr_list writers */
-        spinlock_t local_addr_lock;
-
-        /* RFC2960 Section 14. Suggested SCTP Protocol Parameter Values
-         *
-         * The following protocol parameters are RECOMMENDED:
-         *
-         * RTO.Initial              - 3  seconds
-         * RTO.Min                  - 1  second
-         * RTO.Max                 -  60 seconds
-         * RTO.Alpha                - 1/8  (3 when converted to right shifts.)
-         * RTO.Beta                 - 1/4  (2 when converted to right shifts.)
-         */
-        unsigned int rto_initial;
-        unsigned int rto_min;
-        unsigned int rto_max;
-
-        /* Note: rto_alpha and rto_beta are really defined as inverse
-         * powers of two to facilitate integer operations.
-         */
-        int rto_alpha;
-        int rto_beta;
-
-        /* Max.Burst                - 4 */
-        int max_burst;
-
-        /* Whether Cookie Preservative is enabled(1) or not(0) */
-        int cookie_preserve_enable;
-
-        /* The namespace default hmac alg */
-        char *sctp_hmac_alg;
-
-        /* Valid.Cookie.Life        - 60  seconds  */
-        unsigned int valid_cookie_life;
-
-        /* Delayed SACK timeout  200ms default*/
-        unsigned int sack_timeout;
-
-        /* HB.interval              - 30 seconds  */
-        unsigned int hb_interval;
-
-        /* Association.Max.Retrans  - 10 attempts
-         * Path.Max.Retrans         - 5  attempts (per destination address)
-         * Max.Init.Retransmits     - 8  attempts
-         */
-        int max_retrans_association;
-        int max_retrans_path;
-        int max_retrans_init;
-        /* Potentially-Failed.Max.Retrans sysctl value
-         * taken from:
-         * http://tools.ietf.org/html/draft-nishida-tsvwg-sctp-failover-05
-         */
-        int pf_retrans;
-
-        /*
-         * Policy for preforming sctp/socket accounting
-         * 0   - do socket level accounting, all assocs share sk_sndbuf
-         * 1   - do sctp accounting, each asoc may use sk_sndbuf bytes
-         */
-        int sndbuf_policy;
-
-        /*
-         * Policy for preforming sctp/socket accounting
-         * 0   - do socket level accounting, all assocs share sk_rcvbuf
-         * 1   - do sctp accounting, each asoc may use sk_rcvbuf bytes
-         */
-        int rcvbuf_policy;
-
-        int default_auto_asconf;
-
-        /* Flag to indicate if addip is enabled. */
-        int addip_enable;
-        int addip_noauth;
-
-        /* Flag to indicate if PR-SCTP is enabled. */
-        int prsctp_enable;
-
-        /* Flag to idicate if SCTP-AUTH is enabled */
-        int auth_enable;
-
-        /*
-         * Policy to control SCTP IPv4 address scoping
-         * 0   - Disable IPv4 address scoping
-         * 1   - Enable IPv4 address scoping
-         * 2   - Selectively allow only IPv4 private addresses
-         * 3   - Selectively allow only IPv4 link local address
-         */
-        int scope_policy;
-
-        /* Threshold for rwnd update SACKS.  Receive buffer shifted this many
-         * bits is an indicator of when to send and window update SACK.
-         */
-        int rwnd_upd_shift;
-
-        /* Threshold for autoclose timeout, in seconds. */
-        unsigned long max_autoclose;
-};
-
-#endif /* __NETNS_SCTP_H__ */
diff --git a/include/net/netns/x_tables.h b/include/net/netns/x_tables.h
index c24060ee411..591db7d657a 100644
--- a/include/net/netns/x_tables.h
+++ b/include/net/netns/x_tables.h
@@ -8,7 +8,6 @@ struct ebt_table;
 
 struct netns_xt {
         struct list_head tables[NFPROTO_NUMPROTO];
-        bool notrack_deprecated_warning;
 #if defined(CONFIG_BRIDGE_NF_EBTABLES) || \
     defined(CONFIG_BRIDGE_NF_EBTABLES_MODULE)
         struct ebt_table *broute_table;
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
index 5299e69a32a..748f91f87cd 100644
--- a/include/net/netns/xfrm.h
+++ b/include/net/netns/xfrm.h
@@ -56,7 +56,7 @@ struct netns_xfrm {
 #endif
 
         struct dst_ops          xfrm4_dst_ops;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct dst_ops          xfrm6_dst_ops;
 #endif
 };
diff --git a/include/net/netprio_cgroup.h b/include/net/netprio_cgroup.h
deleted file mode 100644
index 1d04b6f0fbd..00000000000
--- a/include/net/netprio_cgroup.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * netprio_cgroup.h                     Control Group Priority set
- *
- *
- * Authors:     Neil Horman <nhorman@tuxdriver.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- */
-
-#ifndef _NETPRIO_CGROUP_H
-#define _NETPRIO_CGROUP_H
-#include <linux/cgroup.h>
-#include <linux/hardirq.h>
-#include <linux/rcupdate.h>
-
-
-#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
-struct netprio_map {
-        struct rcu_head rcu;
-        u32 priomap_len;
-        u32 priomap[];
-};
-
-struct cgroup_netprio_state {
-        struct cgroup_subsys_state css;
-};
-
-extern void sock_update_netprioidx(struct sock *sk, struct task_struct *task);
-
-#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
-
-static inline u32 task_netprioidx(struct task_struct *p)
-{
-        struct cgroup_subsys_state *css;
-        u32 idx;
-
-        rcu_read_lock();
-        css = task_subsys_state(p, net_prio_subsys_id);
-        idx = css->cgroup->id;
-        rcu_read_unlock();
-        return idx;
-}
-
-#elif IS_MODULE(CONFIG_NETPRIO_CGROUP)
-
-static inline u32 task_netprioidx(struct task_struct *p)
-{
-        struct cgroup_subsys_state *css;
-        u32 idx = 0;
-
-        rcu_read_lock();
-        css = task_subsys_state(p, net_prio_subsys_id);
-        if (css)
-                idx = css->cgroup->id;
-        rcu_read_unlock();
-        return idx;
-}
-#endif
-
-#else /* !CONFIG_NETPRIO_CGROUP */
-
-static inline u32 task_netprioidx(struct task_struct *p)
-{
-        return 0;
-}
-
-#define sock_update_netprioidx(sk, task)
-
-#endif /* CONFIG_NETPRIO_CGROUP */
-
-#endif  /* _NET_CLS_CGROUP_H */
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
deleted file mode 100644
index 671953e1157..00000000000
--- a/include/net/nfc/hci.h
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Copyright (C) 2011  Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __NET_HCI_H
-#define __NET_HCI_H
-
-#include <linux/skbuff.h>
-
-#include <net/nfc/nfc.h>
-
-struct nfc_phy_ops {
-        int (*write)(void *dev_id, struct sk_buff *skb);
-        int (*enable)(void *dev_id);
-        void (*disable)(void *dev_id);
-};
-
-struct nfc_hci_dev;
-
-struct nfc_hci_ops {
-        int (*open) (struct nfc_hci_dev *hdev);
-        void (*close) (struct nfc_hci_dev *hdev);
-        int (*hci_ready) (struct nfc_hci_dev *hdev);
-        /*
-         * xmit must always send the complete buffer before
-         * returning. Returned result must be 0 for success
-         * or negative for failure.
-         */
-        int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
-        int (*start_poll) (struct nfc_hci_dev *hdev,
-                           u32 im_protocols, u32 tm_protocols);
-        int (*dep_link_up)(struct nfc_hci_dev *hdev, struct nfc_target *target,
-                           u8 comm_mode, u8 *gb, size_t gb_len);
-        int (*dep_link_down)(struct nfc_hci_dev *hdev);
-        int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,
-                                 struct nfc_target *target);
-        int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,
-                                           struct nfc_target *target);
-        int (*im_transceive) (struct nfc_hci_dev *hdev,
-                              struct nfc_target *target, struct sk_buff *skb,
-                              data_exchange_cb_t cb, void *cb_context);
-        int (*tm_send)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
-        int (*check_presence)(struct nfc_hci_dev *hdev,
-                              struct nfc_target *target);
-        void (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
-                                struct sk_buff *skb);
-};
-
-/* Pipes */
-#define NFC_HCI_INVALID_PIPE    0x80
-#define NFC_HCI_LINK_MGMT_PIPE  0x00
-#define NFC_HCI_ADMIN_PIPE      0x01
-
-struct nfc_hci_gate {
-        u8 gate;
-        u8 pipe;
-};
-
-#define NFC_HCI_MAX_CUSTOM_GATES        50
-struct nfc_hci_init_data {
-        u8 gate_count;
-        struct nfc_hci_gate gates[NFC_HCI_MAX_CUSTOM_GATES];
-        char session_id[9];
-};
-
-typedef int (*xmit) (struct sk_buff *skb, void *cb_data);
-
-#define NFC_HCI_MAX_GATES               256
-
-struct nfc_hci_dev {
-        struct nfc_dev *ndev;
-
-        u32 max_data_link_payload;
-
-        struct mutex msg_tx_mutex;
-
-        struct list_head msg_tx_queue;
-
-        struct work_struct msg_tx_work;
-
-        struct timer_list cmd_timer;
-        struct hci_msg *cmd_pending_msg;
-
-        struct sk_buff_head rx_hcp_frags;
-
-        struct work_struct msg_rx_work;
-
-        struct sk_buff_head msg_rx_queue;
-
-        struct nfc_hci_ops *ops;
-
-        struct nfc_llc *llc;
-
-        struct nfc_hci_init_data init_data;
-
-        void *clientdata;
-
-        u8 gate2pipe[NFC_HCI_MAX_GATES];
-
-        u8 sw_romlib;
-        u8 sw_patch;
-        u8 sw_flashlib_major;
-        u8 sw_flashlib_minor;
-
-        u8 hw_derivative;
-        u8 hw_version;
-        u8 hw_mpw;
-        u8 hw_software;
-        u8 hw_bsid;
-
-        int async_cb_type;
-        data_exchange_cb_t async_cb;
-        void *async_cb_context;
-
-        u8 *gb;
-        size_t gb_len;
-};
-
-/* hci device allocation */
-struct nfc_hci_dev *nfc_hci_allocate_device(struct nfc_hci_ops *ops,
-                                            struct nfc_hci_init_data *init_data,
-                                            u32 protocols,
-                                            const char *llc_name,
-                                            int tx_headroom,
-                                            int tx_tailroom,
-                                            int max_link_payload);
-void nfc_hci_free_device(struct nfc_hci_dev *hdev);
-
-int nfc_hci_register_device(struct nfc_hci_dev *hdev);
-void nfc_hci_unregister_device(struct nfc_hci_dev *hdev);
-
-void nfc_hci_set_clientdata(struct nfc_hci_dev *hdev, void *clientdata);
-void *nfc_hci_get_clientdata(struct nfc_hci_dev *hdev);
-
-void nfc_hci_driver_failure(struct nfc_hci_dev *hdev, int err);
-
-int nfc_hci_result_to_errno(u8 result);
-
-/* Host IDs */
-#define NFC_HCI_HOST_CONTROLLER_ID      0x00
-#define NFC_HCI_TERMINAL_HOST_ID        0x01
-#define NFC_HCI_UICC_HOST_ID            0x02
-
-/* Host Controller Gates and registry indexes */
-#define NFC_HCI_ADMIN_GATE 0x00
-#define NFC_HCI_ADMIN_SESSION_IDENTITY  0x01
-#define NFC_HCI_ADMIN_MAX_PIPE          0x02
-#define NFC_HCI_ADMIN_WHITELIST         0x03
-#define NFC_HCI_ADMIN_HOST_LIST         0x04
-
-#define NFC_HCI_LOOPBACK_GATE           0x04
-
-#define NFC_HCI_ID_MGMT_GATE            0x05
-#define NFC_HCI_ID_MGMT_VERSION_SW      0x01
-#define NFC_HCI_ID_MGMT_VERSION_HW      0x03
-#define NFC_HCI_ID_MGMT_VENDOR_NAME     0x04
-#define NFC_HCI_ID_MGMT_MODEL_ID        0x05
-#define NFC_HCI_ID_MGMT_HCI_VERSION     0x02
-#define NFC_HCI_ID_MGMT_GATES_LIST      0x06
-
-#define NFC_HCI_LINK_MGMT_GATE          0x06
-#define NFC_HCI_LINK_MGMT_REC_ERROR     0x01
-
-#define NFC_HCI_RF_READER_B_GATE                        0x11
-#define NFC_HCI_RF_READER_B_PUPI                        0x03
-#define NFC_HCI_RF_READER_B_APPLICATION_DATA            0x04
-#define NFC_HCI_RF_READER_B_AFI                         0x02
-#define NFC_HCI_RF_READER_B_HIGHER_LAYER_RESPONSE       0x01
-#define NFC_HCI_RF_READER_B_HIGHER_LAYER_DATA           0x05
-
-#define NFC_HCI_RF_READER_A_GATE                0x13
-#define NFC_HCI_RF_READER_A_UID                 0x02
-#define NFC_HCI_RF_READER_A_ATQA                0x04
-#define NFC_HCI_RF_READER_A_APPLICATION_DATA    0x05
-#define NFC_HCI_RF_READER_A_SAK                 0x03
-#define NFC_HCI_RF_READER_A_FWI_SFGT            0x06
-#define NFC_HCI_RF_READER_A_DATARATE_MAX        0x01
-
-#define NFC_HCI_TYPE_A_SEL_PROT(x)              (((x) & 0x60) >> 5)
-#define NFC_HCI_TYPE_A_SEL_PROT_MIFARE          0
-#define NFC_HCI_TYPE_A_SEL_PROT_ISO14443        1
-#define NFC_HCI_TYPE_A_SEL_PROT_DEP             2
-#define NFC_HCI_TYPE_A_SEL_PROT_ISO14443_DEP    3
-
-/* Generic events */
-#define NFC_HCI_EVT_HCI_END_OF_OPERATION        0x01
-#define NFC_HCI_EVT_POST_DATA                   0x02
-#define NFC_HCI_EVT_HOT_PLUG                    0x03
-
-/* Reader RF gates events */
-#define NFC_HCI_EVT_READER_REQUESTED    0x10
-#define NFC_HCI_EVT_END_OPERATION       0x11
-
-/* Reader Application gate events */
-#define NFC_HCI_EVT_TARGET_DISCOVERED   0x10
-
-/* receiving messages from lower layer */
-void nfc_hci_resp_received(struct nfc_hci_dev *hdev, u8 result,
-                           struct sk_buff *skb);
-void nfc_hci_cmd_received(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
-                          struct sk_buff *skb);
-void nfc_hci_event_received(struct nfc_hci_dev *hdev, u8 pipe, u8 event,
-                            struct sk_buff *skb);
-void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb);
-
-/* connecting to gates and sending hci instructions */
-int nfc_hci_connect_gate(struct nfc_hci_dev *hdev, u8 dest_host, u8 dest_gate,
-                         u8 pipe);
-int nfc_hci_disconnect_gate(struct nfc_hci_dev *hdev, u8 gate);
-int nfc_hci_disconnect_all_gates(struct nfc_hci_dev *hdev);
-int nfc_hci_get_param(struct nfc_hci_dev *hdev, u8 gate, u8 idx,
-                      struct sk_buff **skb);
-int nfc_hci_set_param(struct nfc_hci_dev *hdev, u8 gate, u8 idx,
-                      const u8 *param, size_t param_len);
-int nfc_hci_send_cmd(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
-                     const u8 *param, size_t param_len, struct sk_buff **skb);
-int nfc_hci_send_cmd_async(struct nfc_hci_dev *hdev, u8 gate, u8 cmd,
-                           const u8 *param, size_t param_len,
-                           data_exchange_cb_t cb, void *cb_context);
-int nfc_hci_send_response(struct nfc_hci_dev *hdev, u8 gate, u8 response,
-                          const u8 *param, size_t param_len);
-int nfc_hci_send_event(struct nfc_hci_dev *hdev, u8 gate, u8 event,
-                       const u8 *param, size_t param_len);
-int nfc_hci_target_discovered(struct nfc_hci_dev *hdev, u8 gate);
-u32 nfc_hci_sak_to_protocol(u8 sak);
-
-#endif /* __NET_HCI_H */
diff --git a/include/net/nfc/llc.h b/include/net/nfc/llc.h
deleted file mode 100644
index 400ab7ae749..00000000000
--- a/include/net/nfc/llc.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Link Layer Control manager public interface
- *
- * Copyright (C) 2012  Intel Corporation. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __NFC_LLC_H_
-#define __NFC_LLC_H_
-
-#include <net/nfc/hci.h>
-#include <linux/skbuff.h>
-
-#define LLC_NOP_NAME "nop"
-#define LLC_SHDLC_NAME "shdlc"
-
-typedef void (*rcv_to_hci_t) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
-typedef int (*xmit_to_drv_t) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
-typedef void (*llc_failure_t) (struct nfc_hci_dev *hdev, int err);
-
-struct nfc_llc;
-
-struct nfc_llc *nfc_llc_allocate(const char *name, struct nfc_hci_dev *hdev,
-                                 xmit_to_drv_t xmit_to_drv,
-                                 rcv_to_hci_t rcv_to_hci, int tx_headroom,
-                                 int tx_tailroom, llc_failure_t llc_failure);
-void nfc_llc_free(struct nfc_llc *llc);
-
-void nfc_llc_get_rx_head_tail_room(struct nfc_llc *llc, int *rx_headroom,
-                                   int *rx_tailroom);
-
-
-int nfc_llc_start(struct nfc_llc *llc);
-int nfc_llc_stop(struct nfc_llc *llc);
-void nfc_llc_rcv_from_drv(struct nfc_llc *llc, struct sk_buff *skb);
-int nfc_llc_xmit_from_hci(struct nfc_llc *llc, struct sk_buff *skb);
-
-int nfc_llc_init(void);
-void nfc_llc_exit(void);
-
-#endif /* __NFC_LLC_H_ */
diff --git a/include/net/nfc/nci.h b/include/net/nfc/nci.h
deleted file mode 100644
index 88785e5c6b2..00000000000
--- a/include/net/nfc/nci.h
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- *  The NFC Controller Interface is the communication protocol between an
- *  NFC Controller (NFCC) and a Device Host (DH).
- *
- *  Copyright (C) 2011 Texas Instruments, Inc.
- *
- *  Written by Ilan Elias <ilane@ti.com>
- *
- *  Acknowledgements:
- *  This file is based on hci.h, which was written
- *  by Maxim Krasnyansky.
- *
- *  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 published by the Free Software Foundation
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef __NCI_H
-#define __NCI_H
-
-/* NCI constants */
-#define NCI_MAX_NUM_MAPPING_CONFIGS                             10
-#define NCI_MAX_NUM_RF_CONFIGS                                  10
-#define NCI_MAX_NUM_CONN                                        10
-#define NCI_MAX_PARAM_LEN                                       251
-
-/* NCI Status Codes */
-#define NCI_STATUS_OK                                           0x00
-#define NCI_STATUS_REJECTED                                     0x01
-#define NCI_STATUS_RF_FRAME_CORRUPTED                           0x02
-#define NCI_STATUS_FAILED                                       0x03
-#define NCI_STATUS_NOT_INITIALIZED                              0x04
-#define NCI_STATUS_SYNTAX_ERROR                                 0x05
-#define NCI_STATUS_SEMANTIC_ERROR                               0x06
-#define NCI_STATUS_UNKNOWN_GID                                  0x07
-#define NCI_STATUS_UNKNOWN_OID                                  0x08
-#define NCI_STATUS_INVALID_PARAM                                0x09
-#define NCI_STATUS_MESSAGE_SIZE_EXCEEDED                        0x0a
-/* Discovery Specific Status Codes */
-#define NCI_STATUS_DISCOVERY_ALREADY_STARTED                    0xa0
-#define NCI_STATUS_DISCOVERY_TARGET_ACTIVATION_FAILED           0xa1
-#define NCI_STATUS_DISCOVERY_TEAR_DOWN                          0xa2
-/* RF Interface Specific Status Codes */
-#define NCI_STATUS_RF_TRANSMISSION_ERROR                        0xb0
-#define NCI_STATUS_RF_PROTOCOL_ERROR                            0xb1
-#define NCI_STATUS_RF_TIMEOUT_ERROR                             0xb2
-/* NFCEE Interface Specific Status Codes */
-#define NCI_STATUS_NFCEE_INTERFACE_ACTIVATION_FAILED            0xc0
-#define NCI_STATUS_NFCEE_TRANSMISSION_ERROR                     0xc1
-#define NCI_STATUS_NFCEE_PROTOCOL_ERROR                         0xc2
-#define NCI_STATUS_NFCEE_TIMEOUT_ERROR                          0xc3
-
-/* NCI RF Technology and Mode */
-#define NCI_NFC_A_PASSIVE_POLL_MODE                             0x00
-#define NCI_NFC_B_PASSIVE_POLL_MODE                             0x01
-#define NCI_NFC_F_PASSIVE_POLL_MODE                             0x02
-#define NCI_NFC_A_ACTIVE_POLL_MODE                              0x03
-#define NCI_NFC_F_ACTIVE_POLL_MODE                              0x05
-#define NCI_NFC_15693_PASSIVE_POLL_MODE                         0x06
-#define NCI_NFC_A_PASSIVE_LISTEN_MODE                           0x80
-#define NCI_NFC_B_PASSIVE_LISTEN_MODE                           0x81
-#define NCI_NFC_F_PASSIVE_LISTEN_MODE                           0x82
-#define NCI_NFC_A_ACTIVE_LISTEN_MODE                            0x83
-#define NCI_NFC_F_ACTIVE_LISTEN_MODE                            0x85
-#define NCI_NFC_15693_PASSIVE_LISTEN_MODE                       0x86
-
-/* NCI RF Technologies */
-#define NCI_NFC_RF_TECHNOLOGY_A                                 0x00
-#define NCI_NFC_RF_TECHNOLOGY_B                                 0x01
-#define NCI_NFC_RF_TECHNOLOGY_F                                 0x02
-#define NCI_NFC_RF_TECHNOLOGY_15693                             0x03
-
-/* NCI Bit Rates */
-#define NCI_NFC_BIT_RATE_106                                    0x00
-#define NCI_NFC_BIT_RATE_212                                    0x01
-#define NCI_NFC_BIT_RATE_424                                    0x02
-#define NCI_NFC_BIT_RATE_848                                    0x03
-#define NCI_NFC_BIT_RATE_1695                                   0x04
-#define NCI_NFC_BIT_RATE_3390                                   0x05
-#define NCI_NFC_BIT_RATE_6780                                   0x06
-
-/* NCI RF Protocols */
-#define NCI_RF_PROTOCOL_UNKNOWN                                 0x00
-#define NCI_RF_PROTOCOL_T1T                                     0x01
-#define NCI_RF_PROTOCOL_T2T                                     0x02
-#define NCI_RF_PROTOCOL_T3T                                     0x03
-#define NCI_RF_PROTOCOL_ISO_DEP                                 0x04
-#define NCI_RF_PROTOCOL_NFC_DEP                                 0x05
-
-/* NCI RF Interfaces */
-#define NCI_RF_INTERFACE_NFCEE_DIRECT                           0x00
-#define NCI_RF_INTERFACE_FRAME                                  0x01
-#define NCI_RF_INTERFACE_ISO_DEP                                0x02
-#define NCI_RF_INTERFACE_NFC_DEP                                0x03
-
-/* NCI Configuration Parameter Tags */
-#define NCI_PN_ATR_REQ_GEN_BYTES                                0x29
-
-/* NCI Reset types */
-#define NCI_RESET_TYPE_KEEP_CONFIG                              0x00
-#define NCI_RESET_TYPE_RESET_CONFIG                             0x01
-
-/* NCI Static RF connection ID */
-#define NCI_STATIC_RF_CONN_ID                                   0x00
-
-/* NCI Data Flow Control */
-#define NCI_DATA_FLOW_CONTROL_NOT_USED                          0xff
-
-/* NCI RF_DISCOVER_MAP_CMD modes */
-#define NCI_DISC_MAP_MODE_POLL                                  0x01
-#define NCI_DISC_MAP_MODE_LISTEN                                0x02
-
-/* NCI Discover Notification Type */
-#define NCI_DISCOVER_NTF_TYPE_LAST                              0x00
-#define NCI_DISCOVER_NTF_TYPE_LAST_NFCC                         0x01
-#define NCI_DISCOVER_NTF_TYPE_MORE                              0x02
-
-/* NCI Deactivation Type */
-#define NCI_DEACTIVATE_TYPE_IDLE_MODE                           0x00
-#define NCI_DEACTIVATE_TYPE_SLEEP_MODE                          0x01
-#define NCI_DEACTIVATE_TYPE_SLEEP_AF_MODE                       0x02
-#define NCI_DEACTIVATE_TYPE_DISCOVERY                           0x03
-
-/* Message Type (MT) */
-#define NCI_MT_DATA_PKT                                         0x00
-#define NCI_MT_CMD_PKT                                          0x01
-#define NCI_MT_RSP_PKT                                          0x02
-#define NCI_MT_NTF_PKT                                          0x03
-
-#define nci_mt(hdr)                     (((hdr)[0]>>5)&0x07)
-#define nci_mt_set(hdr, mt)             ((hdr)[0] |= (__u8)(((mt)&0x07)<<5))
-
-/* Packet Boundary Flag (PBF) */
-#define NCI_PBF_LAST                                            0x00
-#define NCI_PBF_CONT                                            0x01
-
-#define nci_pbf(hdr)                    (__u8)(((hdr)[0]>>4)&0x01)
-#define nci_pbf_set(hdr, pbf)           ((hdr)[0] |= (__u8)(((pbf)&0x01)<<4))
-
-/* Control Opcode manipulation */
-#define nci_opcode_pack(gid, oid)       (__u16)((((__u16)((gid)&0x0f))<<8)|\
-                                        ((__u16)((oid)&0x3f)))
-#define nci_opcode(hdr)                 nci_opcode_pack(hdr[0], hdr[1])
-#define nci_opcode_gid(op)              (__u8)(((op)&0x0f00)>>8)
-#define nci_opcode_oid(op)              (__u8)((op)&0x003f)
-
-/* Payload Length */
-#define nci_plen(hdr)                   (__u8)((hdr)[2])
-
-/* Connection ID */
-#define nci_conn_id(hdr)                (__u8)(((hdr)[0])&0x0f)
-
-/* GID values */
-#define NCI_GID_CORE                                            0x0
-#define NCI_GID_RF_MGMT                                         0x1
-#define NCI_GID_NFCEE_MGMT                                      0x2
-#define NCI_GID_PROPRIETARY                                     0xf
-
-/* ---- NCI Packet structures ---- */
-#define NCI_CTRL_HDR_SIZE                                       3
-#define NCI_DATA_HDR_SIZE                                       3
-
-struct nci_ctrl_hdr {
-        __u8    gid;            /* MT & PBF & GID */
-        __u8    oid;
-        __u8    plen;
-} __packed;
-
-struct nci_data_hdr {
-        __u8    conn_id;        /* MT & PBF & ConnID */
-        __u8    rfu;
-        __u8    plen;
-} __packed;
-
-/* ------------------------ */
-/* -----  NCI Commands ---- */
-/* ------------------------ */
-#define NCI_OP_CORE_RESET_CMD           nci_opcode_pack(NCI_GID_CORE, 0x00)
-struct nci_core_reset_cmd {
-        __u8    reset_type;
-} __packed;
-
-#define NCI_OP_CORE_INIT_CMD            nci_opcode_pack(NCI_GID_CORE, 0x01)
-
-#define NCI_OP_CORE_SET_CONFIG_CMD      nci_opcode_pack(NCI_GID_CORE, 0x02)
-struct set_config_param {
-        __u8    id;
-        __u8    len;
-        __u8    val[NCI_MAX_PARAM_LEN];
-} __packed;
-
-struct nci_core_set_config_cmd {
-        __u8    num_params;
-        struct  set_config_param param; /* support 1 param per cmd is enough */
-} __packed;
-
-#define NCI_OP_RF_DISCOVER_MAP_CMD      nci_opcode_pack(NCI_GID_RF_MGMT, 0x00)
-struct disc_map_config {
-        __u8    rf_protocol;
-        __u8    mode;
-        __u8    rf_interface;
-} __packed;
-
-struct nci_rf_disc_map_cmd {
-        __u8                            num_mapping_configs;
-        struct disc_map_config          mapping_configs
-                                        [NCI_MAX_NUM_MAPPING_CONFIGS];
-} __packed;
-
-#define NCI_OP_RF_DISCOVER_CMD          nci_opcode_pack(NCI_GID_RF_MGMT, 0x03)
-struct disc_config {
-        __u8    rf_tech_and_mode;
-        __u8    frequency;
-} __packed;
-
-struct nci_rf_disc_cmd {
-        __u8                            num_disc_configs;
-        struct disc_config              disc_configs[NCI_MAX_NUM_RF_CONFIGS];
-} __packed;
-
-#define NCI_OP_RF_DISCOVER_SELECT_CMD   nci_opcode_pack(NCI_GID_RF_MGMT, 0x04)
-struct nci_rf_discover_select_cmd {
-        __u8    rf_discovery_id;
-        __u8    rf_protocol;
-        __u8    rf_interface;
-} __packed;
-
-#define NCI_OP_RF_DEACTIVATE_CMD        nci_opcode_pack(NCI_GID_RF_MGMT, 0x06)
-struct nci_rf_deactivate_cmd {
-        __u8    type;
-} __packed;
-
-/* ----------------------- */
-/* ---- NCI Responses ---- */
-/* ----------------------- */
-#define NCI_OP_CORE_RESET_RSP           nci_opcode_pack(NCI_GID_CORE, 0x00)
-struct nci_core_reset_rsp {
-        __u8    status;
-        __u8    nci_ver;
-        __u8    config_status;
-} __packed;
-
-#define NCI_OP_CORE_INIT_RSP            nci_opcode_pack(NCI_GID_CORE, 0x01)
-struct nci_core_init_rsp_1 {
-        __u8    status;
-        __le32  nfcc_features;
-        __u8    num_supported_rf_interfaces;
-        __u8    supported_rf_interfaces[0];     /* variable size array */
-        /* continuted in nci_core_init_rsp_2 */
-} __packed;
-
-struct nci_core_init_rsp_2 {
-        __u8    max_logical_connections;
-        __le16  max_routing_table_size;
-        __u8    max_ctrl_pkt_payload_len;
-        __le16  max_size_for_large_params;
-        __u8    manufact_id;
-        __le32  manufact_specific_info;
-} __packed;
-
-#define NCI_OP_CORE_SET_CONFIG_RSP      nci_opcode_pack(NCI_GID_CORE, 0x02)
-struct nci_core_set_config_rsp {
-        __u8    status;
-        __u8    num_params;
-        __u8    params_id[0];   /* variable size array */
-} __packed;
-
-#define NCI_OP_RF_DISCOVER_MAP_RSP      nci_opcode_pack(NCI_GID_RF_MGMT, 0x00)
-
-#define NCI_OP_RF_DISCOVER_RSP          nci_opcode_pack(NCI_GID_RF_MGMT, 0x03)
-
-#define NCI_OP_RF_DISCOVER_SELECT_RSP   nci_opcode_pack(NCI_GID_RF_MGMT, 0x04)
-
-#define NCI_OP_RF_DEACTIVATE_RSP        nci_opcode_pack(NCI_GID_RF_MGMT, 0x06)
-
-/* --------------------------- */
-/* ---- NCI Notifications ---- */
-/* --------------------------- */
-#define NCI_OP_CORE_CONN_CREDITS_NTF    nci_opcode_pack(NCI_GID_CORE, 0x06)
-struct conn_credit_entry {
-        __u8    conn_id;
-        __u8    credits;
-} __packed;
-
-struct nci_core_conn_credit_ntf {
-        __u8                            num_entries;
-        struct conn_credit_entry        conn_entries[NCI_MAX_NUM_CONN];
-} __packed;
-
-#define NCI_OP_CORE_GENERIC_ERROR_NTF   nci_opcode_pack(NCI_GID_CORE, 0x07)
-
-#define NCI_OP_CORE_INTF_ERROR_NTF      nci_opcode_pack(NCI_GID_CORE, 0x08)
-struct nci_core_intf_error_ntf {
-        __u8    status;
-        __u8    conn_id;
-} __packed;
-
-#define NCI_OP_RF_DISCOVER_NTF          nci_opcode_pack(NCI_GID_RF_MGMT, 0x03)
-struct rf_tech_specific_params_nfca_poll {
-        __u16   sens_res;
-        __u8    nfcid1_len;     /* 0, 4, 7, or 10 Bytes */
-        __u8    nfcid1[10];
-        __u8    sel_res_len;    /* 0 or 1 Bytes */
-        __u8    sel_res;
-} __packed;
-
-struct rf_tech_specific_params_nfcb_poll {
-        __u8    sensb_res_len;
-        __u8    sensb_res[12];  /* 11 or 12 Bytes */
-} __packed;
-
-struct rf_tech_specific_params_nfcf_poll {
-        __u8    bit_rate;
-        __u8    sensf_res_len;
-        __u8    sensf_res[18];  /* 16 or 18 Bytes */
-} __packed;
-
-struct nci_rf_discover_ntf {
-        __u8    rf_discovery_id;
-        __u8    rf_protocol;
-        __u8    rf_tech_and_mode;
-        __u8    rf_tech_specific_params_len;
-
-        union {
-                struct rf_tech_specific_params_nfca_poll nfca_poll;
-                struct rf_tech_specific_params_nfcb_poll nfcb_poll;
-                struct rf_tech_specific_params_nfcf_poll nfcf_poll;
-        } rf_tech_specific_params;
-
-        __u8    ntf_type;
-} __packed;
-
-#define NCI_OP_RF_INTF_ACTIVATED_NTF    nci_opcode_pack(NCI_GID_RF_MGMT, 0x05)
-struct activation_params_nfca_poll_iso_dep {
-        __u8    rats_res_len;
-        __u8    rats_res[20];
-};
-
-struct activation_params_nfcb_poll_iso_dep {
-        __u8    attrib_res_len;
-        __u8    attrib_res[50];
-};
-
-struct activation_params_poll_nfc_dep {
-        __u8    atr_res_len;
-        __u8    atr_res[63];
-};
-
-struct nci_rf_intf_activated_ntf {
-        __u8    rf_discovery_id;
-        __u8    rf_interface;
-        __u8    rf_protocol;
-        __u8    activation_rf_tech_and_mode;
-        __u8    max_data_pkt_payload_size;
-        __u8    initial_num_credits;
-        __u8    rf_tech_specific_params_len;
-
-        union {
-                struct rf_tech_specific_params_nfca_poll nfca_poll;
-                struct rf_tech_specific_params_nfcb_poll nfcb_poll;
-                struct rf_tech_specific_params_nfcf_poll nfcf_poll;
-        } rf_tech_specific_params;
-
-        __u8    data_exch_rf_tech_and_mode;
-        __u8    data_exch_tx_bit_rate;
-        __u8    data_exch_rx_bit_rate;
-        __u8    activation_params_len;
-
-        union {
-                struct activation_params_nfca_poll_iso_dep nfca_poll_iso_dep;
-                struct activation_params_nfcb_poll_iso_dep nfcb_poll_iso_dep;
-                struct activation_params_poll_nfc_dep poll_nfc_dep;
-        } activation_params;
-
-} __packed;
-
-#define NCI_OP_RF_DEACTIVATE_NTF        nci_opcode_pack(NCI_GID_RF_MGMT, 0x06)
-struct nci_rf_deactivate_ntf {
-        __u8    type;
-        __u8    reason;
-} __packed;
-
-#endif /* __NCI_H */
diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
deleted file mode 100644
index d705d867494..00000000000
--- a/include/net/nfc/nci_core.h
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- *  The NFC Controller Interface is the communication protocol between an
- *  NFC Controller (NFCC) and a Device Host (DH).
- *
- *  Copyright (C) 2011 Texas Instruments, Inc.
- *
- *  Written by Ilan Elias <ilane@ti.com>
- *
- *  Acknowledgements:
- *  This file is based on hci_core.h, which was written
- *  by Maxim Krasnyansky.
- *
- *  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 published by the Free Software Foundation
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef __NCI_CORE_H
-#define __NCI_CORE_H
-
-#include <linux/interrupt.h>
-#include <linux/skbuff.h>
-
-#include <net/nfc/nfc.h>
-#include <net/nfc/nci.h>
-
-/* NCI device flags */
-enum nci_flag {
-        NCI_INIT,
-        NCI_UP,
-        NCI_DATA_EXCHANGE,
-        NCI_DATA_EXCHANGE_TO,
-};
-
-/* NCI device states */
-enum nci_state {
-        NCI_IDLE,
-        NCI_DISCOVERY,
-        NCI_W4_ALL_DISCOVERIES,
-        NCI_W4_HOST_SELECT,
-        NCI_POLL_ACTIVE,
-};
-
-/* NCI timeouts */
-#define NCI_RESET_TIMEOUT                       5000
-#define NCI_INIT_TIMEOUT                        5000
-#define NCI_SET_CONFIG_TIMEOUT                  5000
-#define NCI_RF_DISC_TIMEOUT                     5000
-#define NCI_RF_DISC_SELECT_TIMEOUT              5000
-#define NCI_RF_DEACTIVATE_TIMEOUT               30000
-#define NCI_CMD_TIMEOUT                         5000
-#define NCI_DATA_TIMEOUT                        700
-
-struct nci_dev;
-
-struct nci_ops {
-        int (*open)(struct nci_dev *ndev);
-        int (*close)(struct nci_dev *ndev);
-        int (*send)(struct sk_buff *skb);
-};
-
-#define NCI_MAX_SUPPORTED_RF_INTERFACES         4
-#define NCI_MAX_DISCOVERED_TARGETS              10
-
-/* NCI Core structures */
-struct nci_dev {
-        struct nfc_dev          *nfc_dev;
-        struct nci_ops          *ops;
-
-        int                     tx_headroom;
-        int                     tx_tailroom;
-
-        atomic_t                state;
-        unsigned long           flags;
-
-        atomic_t                cmd_cnt;
-        atomic_t                credits_cnt;
-
-        struct timer_list       cmd_timer;
-        struct timer_list       data_timer;
-
-        struct workqueue_struct *cmd_wq;
-        struct work_struct      cmd_work;
-
-        struct workqueue_struct *rx_wq;
-        struct work_struct      rx_work;
-
-        struct workqueue_struct *tx_wq;
-        struct work_struct      tx_work;
-
-        struct sk_buff_head     cmd_q;
-        struct sk_buff_head     rx_q;
-        struct sk_buff_head     tx_q;
-
-        struct mutex            req_lock;
-        struct completion       req_completion;
-        __u32                   req_status;
-        __u32                   req_result;
-
-        void                    *driver_data;
-
-        __u32                   poll_prots;
-        __u32                   target_active_prot;
-
-        struct nfc_target       targets[NCI_MAX_DISCOVERED_TARGETS];
-        int                     n_targets;
-
-        /* received during NCI_OP_CORE_RESET_RSP */
-        __u8                    nci_ver;
-
-        /* received during NCI_OP_CORE_INIT_RSP */
-        __u32                   nfcc_features;
-        __u8                    num_supported_rf_interfaces;
-        __u8                    supported_rf_interfaces
-                                [NCI_MAX_SUPPORTED_RF_INTERFACES];
-        __u8                    max_logical_connections;
-        __u16                   max_routing_table_size;
-        __u8                    max_ctrl_pkt_payload_len;
-        __u16                   max_size_for_large_params;
-        __u8                    manufact_id;
-        __u32                   manufact_specific_info;
-
-        /* received during NCI_OP_RF_INTF_ACTIVATED_NTF */
-        __u8                    max_data_pkt_payload_size;
-        __u8                    initial_num_credits;
-
-        /* stored during nci_data_exchange */
-        data_exchange_cb_t      data_exchange_cb;
-        void                    *data_exchange_cb_context;
-        struct sk_buff          *rx_data_reassembly;
-
-        /* stored during intf_activated_ntf */
-        __u8 remote_gb[NFC_MAX_GT_LEN];
-        __u8 remote_gb_len;
-};
-
-/* ----- NCI Devices ----- */
-struct nci_dev *nci_allocate_device(struct nci_ops *ops,
-                                    __u32 supported_protocols,
-                                    int tx_headroom,
-                                    int tx_tailroom);
-void nci_free_device(struct nci_dev *ndev);
-int nci_register_device(struct nci_dev *ndev);
-void nci_unregister_device(struct nci_dev *ndev);
-int nci_recv_frame(struct sk_buff *skb);
-
-static inline struct sk_buff *nci_skb_alloc(struct nci_dev *ndev,
-                                            unsigned int len,
-                                            gfp_t how)
-{
-        struct sk_buff *skb;
-
-        skb = alloc_skb(len + ndev->tx_headroom + ndev->tx_tailroom, how);
-        if (skb)
-                skb_reserve(skb, ndev->tx_headroom);
-
-        return skb;
-}
-
-static inline void nci_set_parent_dev(struct nci_dev *ndev, struct device *dev)
-{
-        nfc_set_parent_dev(ndev->nfc_dev, dev);
-}
-
-static inline void nci_set_drvdata(struct nci_dev *ndev, void *data)
-{
-        ndev->driver_data = data;
-}
-
-static inline void *nci_get_drvdata(struct nci_dev *ndev)
-{
-        return ndev->driver_data;
-}
-
-void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb);
-void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb);
-void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb);
-int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload);
-int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb);
-void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,
-                                int err);
-void nci_clear_target_list(struct nci_dev *ndev);
-
-/* ----- NCI requests ----- */
-#define NCI_REQ_DONE            0
-#define NCI_REQ_PEND            1
-#define NCI_REQ_CANCELED        2
-
-void nci_req_complete(struct nci_dev *ndev, int result);
-
-/* ----- NCI status code ----- */
-int nci_to_errno(__u8 code);
-
-#endif /* __NCI_CORE_H */
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h
deleted file mode 100644
index fce80b2f9be..00000000000
--- a/include/net/nfc/nfc.h
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2011 Instituto Nokia de Tecnologia
- *
- * Authors:
- *    Lauro Ramos Venancio <lauro.venancio@openbossa.org>
- *    Aloisio Almeida Jr <aloisio.almeida@openbossa.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef __NET_NFC_H
-#define __NET_NFC_H
-
-#include <linux/nfc.h>
-#include <linux/device.h>
-#include <linux/skbuff.h>
-
-#define nfc_dev_info(dev, fmt, arg...) dev_info((dev), "NFC: " fmt "\n", ## arg)
-#define nfc_dev_err(dev, fmt, arg...) dev_err((dev), "NFC: " fmt "\n", ## arg)
-#define nfc_dev_dbg(dev, fmt, arg...) dev_dbg((dev), fmt "\n", ## arg)
-
-struct nfc_dev;
-
-/**
- * data_exchange_cb_t - Definition of nfc_data_exchange callback
- *
- * @context: nfc_data_exchange cb_context parameter
- * @skb: response data
- * @err: If an error has occurred during data exchange, it is the
- *      error number. Zero means no error.
- *
- * When a rx or tx package is lost or corrupted or the target gets out
- * of the operating field, err is -EIO.
- */
-typedef void (*data_exchange_cb_t)(void *context, struct sk_buff *skb,
-                                                                int err);
-
-struct nfc_target;
-
-struct nfc_ops {
-        int (*dev_up)(struct nfc_dev *dev);
-        int (*dev_down)(struct nfc_dev *dev);
-        int (*start_poll)(struct nfc_dev *dev,
-                          u32 im_protocols, u32 tm_protocols);
-        void (*stop_poll)(struct nfc_dev *dev);
-        int (*dep_link_up)(struct nfc_dev *dev, struct nfc_target *target,
-                           u8 comm_mode, u8 *gb, size_t gb_len);
-        int (*dep_link_down)(struct nfc_dev *dev);
-        int (*activate_target)(struct nfc_dev *dev, struct nfc_target *target,
-                               u32 protocol);
-        void (*deactivate_target)(struct nfc_dev *dev,
-                                  struct nfc_target *target);
-        int (*im_transceive)(struct nfc_dev *dev, struct nfc_target *target,
-                             struct sk_buff *skb, data_exchange_cb_t cb,
-                             void *cb_context);
-        int (*tm_send)(struct nfc_dev *dev, struct sk_buff *skb);
-        int (*check_presence)(struct nfc_dev *dev, struct nfc_target *target);
-};
-
-#define NFC_TARGET_IDX_ANY -1
-#define NFC_MAX_GT_LEN 48
-#define NFC_ATR_RES_GT_OFFSET 15
-
-struct nfc_target {
-        u32 idx;
-        u32 supported_protocols;
-        u16 sens_res;
-        u8 sel_res;
-        u8 nfcid1_len;
-        u8 nfcid1[NFC_NFCID1_MAXSIZE];
-        u8 sensb_res_len;
-        u8 sensb_res[NFC_SENSB_RES_MAXSIZE];
-        u8 sensf_res_len;
-        u8 sensf_res[NFC_SENSF_RES_MAXSIZE];
-        u8 hci_reader_gate;
-        u8 logical_idx;
-};
-
-struct nfc_genl_data {
-        u32 poll_req_portid;
-        struct mutex genl_data_mutex;
-};
-
-struct nfc_dev {
-        int idx;
-        u32 target_next_idx;
-        struct nfc_target *targets;
-        int n_targets;
-        int targets_generation;
-        struct device dev;
-        bool dev_up;
-        u8 rf_mode;
-        bool polling;
-        struct nfc_target *active_target;
-        bool dep_link_up;
-        struct nfc_genl_data genl_data;
-        u32 supported_protocols;
-
-        int tx_headroom;
-        int tx_tailroom;
-
-        struct timer_list check_pres_timer;
-        struct work_struct check_pres_work;
-
-        struct nfc_ops *ops;
-};
-#define to_nfc_dev(_dev) container_of(_dev, struct nfc_dev, dev)
-
-extern struct class nfc_class;
-
-struct nfc_dev *nfc_allocate_device(struct nfc_ops *ops,
-                                    u32 supported_protocols,
-                                    int tx_headroom,
-                                    int tx_tailroom);
-
-/**
- * nfc_free_device - free nfc device
- *
- * @dev: The nfc device to free
- */
-static inline void nfc_free_device(struct nfc_dev *dev)
-{
-        put_device(&dev->dev);
-}
-
-int nfc_register_device(struct nfc_dev *dev);
-
-void nfc_unregister_device(struct nfc_dev *dev);
-
-/**
- * nfc_set_parent_dev - set the parent device
- *
- * @nfc_dev: The nfc device whose parent is being set
- * @dev: The parent device
- */
-static inline void nfc_set_parent_dev(struct nfc_dev *nfc_dev,
-                                      struct device *dev)
-{
-        nfc_dev->dev.parent = dev;
-}
-
-/**
- * nfc_set_drvdata - set driver specifc data
- *
- * @dev: The nfc device
- * @data: Pointer to driver specifc data
- */
-static inline void nfc_set_drvdata(struct nfc_dev *dev, void *data)
-{
-        dev_set_drvdata(&dev->dev, data);
-}
-
-/**
- * nfc_get_drvdata - get driver specifc data
- *
- * @dev: The nfc device
- */
-static inline void *nfc_get_drvdata(struct nfc_dev *dev)
-{
-        return dev_get_drvdata(&dev->dev);
-}
-
-/**
- * nfc_device_name - get the nfc device name
- *
- * @dev: The nfc device whose name to return
- */
-static inline const char *nfc_device_name(struct nfc_dev *dev)
-{
-        return dev_name(&dev->dev);
-}
-
-struct sk_buff *nfc_alloc_send_skb(struct nfc_dev *dev, struct sock *sk,
-                                   unsigned int flags, unsigned int size,
-                                   unsigned int *err);
-struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp);
-
-int nfc_set_remote_general_bytes(struct nfc_dev *dev,
-                                 u8 *gt, u8 gt_len);
-u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len);
-
-int nfc_targets_found(struct nfc_dev *dev,
-                      struct nfc_target *targets, int ntargets);
-int nfc_target_lost(struct nfc_dev *dev, u32 target_idx);
-
-int nfc_dep_link_is_up(struct nfc_dev *dev, u32 target_idx,
-                       u8 comm_mode, u8 rf_mode);
-
-int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
-                     u8 *gb, size_t gb_len);
-int nfc_tm_deactivated(struct nfc_dev *dev);
-int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);
-
-void nfc_driver_failure(struct nfc_dev *dev, int err);
-
-#endif /* __NET_NFC_H */
diff --git a/include/net/phonet/gprs.h b/include/net/phonet/gprs.h
index bcd525e39a0..928daf595be 100644
--- a/include/net/phonet/gprs.h
+++ b/include/net/phonet/gprs.h
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2008 Nokia Corporation.
  *
- * Author: Rémi Denis-Courmont
+ * Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 66f5ac370f9..fffdc603f4c 100644
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -107,7 +107,7 @@ extern int tc_classify(struct sk_buff *skb, const struct tcf_proto *tp,
 /* Calculate maximal size of packet seen by hard_start_xmit
    routine of this device.
  */
-static inline unsigned int psched_mtu(const struct net_device *dev)
+static inline unsigned psched_mtu(const struct net_device *dev)
 {
         return dev->mtu + dev->hard_header_len;
 }
diff --git a/include/net/protocol.h b/include/net/protocol.h
index 047c0476c0a..6f7eb800974 100644
--- a/include/net/protocol.h
+++ b/include/net/protocol.h
@@ -25,50 +25,51 @@
 #define _PROTOCOL_H
 
 #include <linux/in6.h>
-#include <linux/skbuff.h>
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 #include <linux/ipv6.h>
 #endif
-#include <linux/netdevice.h>
 
-/* This is one larger than the largest protocol value that can be
- * found in an ipv4 or ipv6 header.  Since in both cases the protocol
- * value is presented in a __u8, this is defined to be 256.
- */
-#define MAX_INET_PROTOS         256
+#define MAX_INET_PROTOS 256             /* Must be a power of 2         */
+
 
 /* This is used to register protocols. */
 struct net_protocol {
-        void                    (*early_demux)(struct sk_buff *skb);
         int                     (*handler)(struct sk_buff *skb);
         void                    (*err_handler)(struct sk_buff *skb, u32 info);
+        int                     (*gso_send_check)(struct sk_buff *skb);
+        struct sk_buff         *(*gso_segment)(struct sk_buff *skb,
+                                               u32 features);
+        struct sk_buff        **(*gro_receive)(struct sk_buff **head,
+                                               struct sk_buff *skb);
+        int                     (*gro_complete)(struct sk_buff *skb);
         unsigned int            no_policy:1,
                                 netns_ok:1;
 };
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 struct inet6_protocol {
-        void    (*early_demux)(struct sk_buff *skb);
-
         int     (*handler)(struct sk_buff *skb);
 
         void    (*err_handler)(struct sk_buff *skb,
                                struct inet6_skb_parm *opt,
                                u8 type, u8 code, int offset,
                                __be32 info);
+
+        int     (*gso_send_check)(struct sk_buff *skb);
+        struct sk_buff *(*gso_segment)(struct sk_buff *skb,
+                                       u32 features);
+        struct sk_buff **(*gro_receive)(struct sk_buff **head,
+                                        struct sk_buff *skb);
+        int     (*gro_complete)(struct sk_buff *skb);
+
         unsigned int    flags;  /* INET6_PROTO_xxx */
 };
 
 #define INET6_PROTO_NOPOLICY    0x1
 #define INET6_PROTO_FINAL       0x2
-#endif
-
-struct net_offload {
-        struct offload_callbacks callbacks;
-        unsigned int             flags; /* Flags used by IPv6 for now */
-};
 /* This should be set for any extension header which is compatible with GSO. */
-#define INET6_PROTO_GSO_EXTHDR  0x1
+#define INET6_PROTO_GSO_EXTHDR  0x4
+#endif
 
 /* This is used to register socket interfaces for IP protocols.  */
 struct inet_protosw {
@@ -89,27 +90,21 @@ struct inet_protosw {
 #define INET_PROTOSW_ICSK      0x04  /* Is this an inet_connection_sock? */
 
 extern const struct net_protocol __rcu *inet_protos[MAX_INET_PROTOS];
-extern const struct net_offload __rcu *inet_offloads[MAX_INET_PROTOS];
-extern const struct net_offload __rcu *inet6_offloads[MAX_INET_PROTOS];
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 extern const struct inet6_protocol __rcu *inet6_protos[MAX_INET_PROTOS];
 #endif
 
 extern int      inet_add_protocol(const struct net_protocol *prot, unsigned char num);
 extern int      inet_del_protocol(const struct net_protocol *prot, unsigned char num);
-extern int      inet_add_offload(const struct net_offload *prot, unsigned char num);
-extern int      inet_del_offload(const struct net_offload *prot, unsigned char num);
 extern void     inet_register_protosw(struct inet_protosw *p);
 extern void     inet_unregister_protosw(struct inet_protosw *p);
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
 extern int      inet6_add_protocol(const struct inet6_protocol *prot, unsigned char num);
 extern int      inet6_del_protocol(const struct inet6_protocol *prot, unsigned char num);
 extern int      inet6_register_protosw(struct inet_protosw *p);
 extern void     inet6_unregister_protosw(struct inet_protosw *p);
 #endif
-extern int      inet6_add_offload(const struct net_offload *prot, unsigned char num);
-extern int      inet6_del_offload(const struct net_offload *prot, unsigned char num);
 
 #endif  /* _PROTOCOL_H */
diff --git a/include/net/rawv6.h b/include/net/rawv6.h
index e7ea660e4db..cf757723445 100644
--- a/include/net/rawv6.h
+++ b/include/net/rawv6.h
@@ -5,7 +5,7 @@
 
 void raw6_icmp_error(struct sk_buff *, int nexthdr,
                 u8 type, u8 code, int inner_offset, __be32);
-bool raw6_local_deliver(struct sk_buff *, int);
+int raw6_local_deliver(struct sk_buff *, int);
 
 extern int                      rawv6_rcv(struct sock *sk,
                                           struct sk_buff *skb);
diff --git a/include/net/red.h b/include/net/red.h
index ef46058d35b..b72a3b83393 100644
--- a/include/net/red.h
+++ b/include/net/red.h
@@ -2,11 +2,9 @@
 #define __NET_SCHED_RED_H
 
 #include <linux/types.h>
-#include <linux/bug.h>
 #include <net/pkt_sched.h>
 #include <net/inet_ecn.h>
 #include <net/dsfield.h>
-#include <linux/reciprocal_div.h>
 
 /*      Random Early Detection (RED) algorithm.
         =======================================
@@ -89,29 +87,6 @@
         etc.
  */
 
-/*
- * Adaptative RED : An Algorithm for Increasing the Robustness of RED's AQM
- * (Sally FLoyd, Ramakrishna Gummadi, and Scott Shenker) August 2001
- *
- * Every 500 ms:
- *  if (avg > target and max_p <= 0.5)
- *   increase max_p : max_p += alpha;
- *  else if (avg < target and max_p >= 0.01)
- *   decrease max_p : max_p *= beta;
- *
- * target :[qth_min + 0.4*(qth_min - qth_max),
- *          qth_min + 0.6*(qth_min - qth_max)].
- * alpha : min(0.01, max_p / 4)
- * beta : 0.9
- * max_P is a Q0.32 fixed point number (with 32 bits mantissa)
- * max_P between 0.01 and 0.5 (1% - 50%) [ Its no longer a negative power of two ]
- */
-#define RED_ONE_PERCENT ((u32)DIV_ROUND_CLOSEST(1ULL<<32, 100))
-
-#define MAX_P_MIN (1 * RED_ONE_PERCENT)
-#define MAX_P_MAX (50 * RED_ONE_PERCENT)
-#define MAX_P_ALPHA(val) min(MAX_P_MIN, val / 4)
-
 #define RED_STAB_SIZE   256
 #define RED_STAB_MASK   (RED_STAB_SIZE - 1)
 
@@ -126,110 +101,76 @@ struct red_stats {
 
 struct red_parms {
         /* Parameters */
-        u32             qth_min;        /* Min avg length threshold: Wlog scaled */
-        u32             qth_max;        /* Max avg length threshold: Wlog scaled */
+        u32             qth_min;        /* Min avg length threshold: A scaled */
+        u32             qth_max;        /* Max avg length threshold: A scaled */
         u32             Scell_max;
-        u32             max_P;          /* probability, [0 .. 1.0] 32 scaled */
-        u32             max_P_reciprocal; /* reciprocal_value(max_P / qth_delta) */
-        u32             qth_delta;      /* max_th - min_th */
-        u32             target_min;     /* min_th + 0.4*(max_th - min_th) */
-        u32             target_max;     /* min_th + 0.6*(max_th - min_th) */
+        u32             Rmask;          /* Cached random mask, see red_rmask */
         u8              Scell_log;
         u8              Wlog;           /* log(W)               */
         u8              Plog;           /* random number bits   */
         u8              Stab[RED_STAB_SIZE];
-};
 
-struct red_vars {
         /* Variables */
         int             qcount;         /* Number of packets since last random
                                            number generation */
         u32             qR;             /* Cached random number */
 
-        unsigned long   qavg;           /* Average queue length: Wlog scaled */
+        unsigned long   qavg;           /* Average queue length: A scaled */
         ktime_t         qidlestart;     /* Start of current idle period */
 };
 
-static inline u32 red_maxp(u8 Plog)
+static inline u32 red_rmask(u8 Plog)
 {
-        return Plog < 32 ? (~0U >> Plog) : ~0U;
+        return Plog < 32 ? ((1 << Plog) - 1) : ~0UL;
 }
 
-static inline void red_set_vars(struct red_vars *v)
+static inline void red_set_parms(struct red_parms *p,
+                                 u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog,
+                                 u8 Scell_log, u8 *stab)
 {
         /* Reset average queue length, the value is strictly bound
          * to the parameters below, reseting hurts a bit but leaving
          * it might result in an unreasonable qavg for a while. --TGR
          */
-        v->qavg         = 0;
-
-        v->qcount       = -1;
-}
-
-static inline void red_set_parms(struct red_parms *p,
-                                 u32 qth_min, u32 qth_max, u8 Wlog, u8 Plog,
-                                 u8 Scell_log, u8 *stab, u32 max_P)
-{
-        int delta = qth_max - qth_min;
-        u32 max_p_delta;
+        p->qavg         = 0;
 
+        p->qcount       = -1;
         p->qth_min      = qth_min << Wlog;
         p->qth_max      = qth_max << Wlog;
         p->Wlog         = Wlog;
         p->Plog         = Plog;
-        if (delta < 0)
-                delta = 1;
-        p->qth_delta    = delta;
-        if (!max_P) {
-                max_P = red_maxp(Plog);
-                max_P *= delta; /* max_P = (qth_max - qth_min)/2^Plog */
-        }
-        p->max_P = max_P;
-        max_p_delta = max_P / delta;
-        max_p_delta = max(max_p_delta, 1U);
-        p->max_P_reciprocal  = reciprocal_value(max_p_delta);
-
-        /* RED Adaptative target :
-         * [min_th + 0.4*(min_th - max_th),
-         *  min_th + 0.6*(min_th - max_th)].
-         */
-        delta /= 5;
-        p->target_min = qth_min + 2*delta;
-        p->target_max = qth_min + 3*delta;
-
+        p->Rmask        = red_rmask(Plog);
         p->Scell_log    = Scell_log;
         p->Scell_max    = (255 << Scell_log);
 
-        if (stab)
-                memcpy(p->Stab, stab, sizeof(p->Stab));
+        memcpy(p->Stab, stab, sizeof(p->Stab));
 }
 
-static inline int red_is_idling(const struct red_vars *v)
+static inline int red_is_idling(struct red_parms *p)
 {
-        return v->qidlestart.tv64 != 0;
+        return p->qidlestart.tv64 != 0;
 }
 
-static inline void red_start_of_idle_period(struct red_vars *v)
+static inline void red_start_of_idle_period(struct red_parms *p)
 {
-        v->qidlestart = ktime_get();
+        p->qidlestart = ktime_get();
 }
 
-static inline void red_end_of_idle_period(struct red_vars *v)
+static inline void red_end_of_idle_period(struct red_parms *p)
 {
-        v->qidlestart.tv64 = 0;
+        p->qidlestart.tv64 = 0;
 }
 
-static inline void red_restart(struct red_vars *v)
+static inline void red_restart(struct red_parms *p)
 {
-        red_end_of_idle_period(v);
-        v->qavg = 0;
-        v->qcount = -1;
+        red_end_of_idle_period(p);
+        p->qavg = 0;
+        p->qcount = -1;
 }
 
-static inline unsigned long red_calc_qavg_from_idle_time(const struct red_parms *p,
-                                                         const struct red_vars *v)
+static inline unsigned long red_calc_qavg_from_idle_time(struct red_parms *p)
 {
-        s64 delta = ktime_us_delta(ktime_get(), v->qidlestart);
+        s64 delta = ktime_us_delta(ktime_get(), p->qidlestart);
         long us_idle = min_t(s64, delta, p->Scell_max);
         int  shift;
 
@@ -245,7 +186,7 @@ static inline unsigned long red_calc_qavg_from_idle_time(const struct red_parms
          *
          * dummy packets as a burst after idle time, i.e.
          *
-         *      v->qavg *= (1-W)^m
+         *      p->qavg *= (1-W)^m
          *
          * This is an apparently overcomplicated solution (f.e. we have to
          * precompute a table to make this calculation in reasonable time)
@@ -256,7 +197,7 @@ static inline unsigned long red_calc_qavg_from_idle_time(const struct red_parms
         shift = p->Stab[(us_idle >> p->Scell_log) & RED_STAB_MASK];
 
         if (shift)
-                return v->qavg >> shift;
+                return p->qavg >> shift;
         else {
                 /* Approximate initial part of exponent with linear function:
                  *
@@ -265,21 +206,20 @@ static inline unsigned long red_calc_qavg_from_idle_time(const struct red_parms
                  * Seems, it is the best solution to
                  * problem of too coarse exponent tabulation.
                  */
-                us_idle = (v->qavg * (u64)us_idle) >> p->Scell_log;
+                us_idle = (p->qavg * (u64)us_idle) >> p->Scell_log;
 
-                if (us_idle < (v->qavg >> 1))
-                        return v->qavg - us_idle;
+                if (us_idle < (p->qavg >> 1))
+                        return p->qavg - us_idle;
                 else
-                        return v->qavg >> 1;
+                        return p->qavg >> 1;
         }
 }
 
-static inline unsigned long red_calc_qavg_no_idle_time(const struct red_parms *p,
-                                                       const struct red_vars *v,
+static inline unsigned long red_calc_qavg_no_idle_time(struct red_parms *p,
                                                        unsigned int backlog)
 {
         /*
-         * NOTE: v->qavg is fixed point number with point at Wlog.
+         * NOTE: p->qavg is fixed point number with point at Wlog.
          * The formula below is equvalent to floating point
          * version:
          *
@@ -287,46 +227,42 @@ static inline unsigned long red_calc_qavg_no_idle_time(const struct red_parms *p
          *
          * --ANK (980924)
          */
-        return v->qavg + (backlog - (v->qavg >> p->Wlog));
+        return p->qavg + (backlog - (p->qavg >> p->Wlog));
 }
 
-static inline unsigned long red_calc_qavg(const struct red_parms *p,
-                                          const struct red_vars *v,
+static inline unsigned long red_calc_qavg(struct red_parms *p,
                                           unsigned int backlog)
 {
-        if (!red_is_idling(v))
-                return red_calc_qavg_no_idle_time(p, v, backlog);
+        if (!red_is_idling(p))
+                return red_calc_qavg_no_idle_time(p, backlog);
         else
-                return red_calc_qavg_from_idle_time(p, v);
+                return red_calc_qavg_from_idle_time(p);
 }
 
-
-static inline u32 red_random(const struct red_parms *p)
+static inline u32 red_random(struct red_parms *p)
 {
-        return reciprocal_divide(net_random(), p->max_P_reciprocal);
+        return net_random() & p->Rmask;
 }
 
-static inline int red_mark_probability(const struct red_parms *p,
-                                       const struct red_vars *v,
-                                       unsigned long qavg)
+static inline int red_mark_probability(struct red_parms *p, unsigned long qavg)
 {
         /* The formula used below causes questions.
 
-           OK. qR is random number in the interval
-                (0..1/max_P)*(qth_max-qth_min)
+           OK. qR is random number in the interval 0..Rmask
            i.e. 0..(2^Plog). If we used floating point
            arithmetics, it would be: (2^Plog)*rnd_num,
            where rnd_num is less 1.
 
            Taking into account, that qavg have fixed
-           point at Wlog, two lines
+           point at Wlog, and Plog is related to max_P by
+           max_P = (qth_max-qth_min)/2^Plog; two lines
            below have the following floating point equivalent:
 
            max_P*(qavg - qth_min)/(qth_max-qth_min) < rnd/qcount
 
            Any questions? --ANK (980924)
          */
-        return !(((qavg - p->qth_min) >> p->Wlog) * v->qcount < v->qR);
+        return !(((qavg - p->qth_min) >> p->Wlog) * p->qcount < p->qR);
 }
 
 enum {
@@ -335,7 +271,7 @@ enum {
         RED_ABOVE_MAX_TRESH,
 };
 
-static inline int red_cmp_thresh(const struct red_parms *p, unsigned long qavg)
+static inline int red_cmp_thresh(struct red_parms *p, unsigned long qavg)
 {
         if (qavg < p->qth_min)
                 return RED_BELOW_MIN_THRESH;
@@ -351,29 +287,27 @@ enum {
         RED_HARD_MARK,
 };
 
-static inline int red_action(const struct red_parms *p,
-                             struct red_vars *v,
-                             unsigned long qavg)
+static inline int red_action(struct red_parms *p, unsigned long qavg)
 {
         switch (red_cmp_thresh(p, qavg)) {
                 case RED_BELOW_MIN_THRESH:
-                        v->qcount = -1;
+                        p->qcount = -1;
                         return RED_DONT_MARK;
 
                 case RED_BETWEEN_TRESH:
-                        if (++v->qcount) {
-                                if (red_mark_probability(p, v, qavg)) {
-                                        v->qcount = 0;
-                                        v->qR = red_random(p);
+                        if (++p->qcount) {
+                                if (red_mark_probability(p, qavg)) {
+                                        p->qcount = 0;
+                                        p->qR = red_random(p);
                                         return RED_PROB_MARK;
                                 }
                         } else
-                                v->qR = red_random(p);
+                                p->qR = red_random(p);
 
                         return RED_DONT_MARK;
 
                 case RED_ABOVE_MAX_TRESH:
-                        v->qcount = -1;
+                        p->qcount = -1;
                         return RED_HARD_MARK;
         }
 
@@ -381,25 +315,4 @@ static inline int red_action(const struct red_parms *p,
         return RED_DONT_MARK;
 }
 
-static inline void red_adaptative_algo(struct red_parms *p, struct red_vars *v)
-{
-        unsigned long qavg;
-        u32 max_p_delta;
-
-        qavg = v->qavg;
-        if (red_is_idling(v))
-                qavg = red_calc_qavg_from_idle_time(p, v);
-
-        /* v->qavg is fixed point number with point at Wlog */
-        qavg >>= p->Wlog;
-
-        if (qavg > p->target_max && p->max_P <= MAX_P_MAX)
-                p->max_P += MAX_P_ALPHA(p->max_P); /* maxp = maxp + alpha */
-        else if (qavg < p->target_min && p->max_P >= MAX_P_MIN)
-                p->max_P = (p->max_P/10)*9; /* maxp = maxp * Beta */
-
-        max_p_delta = DIV_ROUND_CLOSEST(p->max_P, p->qth_delta);
-        max_p_delta = max(max_p_delta, 1U);
-        p->max_P_reciprocal = reciprocal_value(max_p_delta);
-}
 #endif
diff --git a/include/net/regulatory.h b/include/net/regulatory.h
index 7dcaa2794fd..356d6e3dc20 100644
--- a/include/net/regulatory.h
+++ b/include/net/regulatory.h
@@ -3,19 +3,11 @@
 /*
  * regulatory support structures
  *
- * Copyright 2008-2009  Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
+ * Copyright 2008-2009  Luis R. Rodriguez <lrodriguez@atheros.com>
  *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * 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
+ * published by the Free Software Foundation.
  */
 
 
@@ -48,14 +40,6 @@ enum environment_cap {
  *      99 - built by driver but a specific alpha2 cannot be determined
  *      98 - result of an intersection between two regulatory domains
  *      97 - regulatory domain has not yet been configured
- * @dfs_region: If CRDA responded with a regulatory domain that requires
- *      DFS master operation on a known DFS region (NL80211_DFS_*),
- *      dfs_region represents that region. Drivers can use this and the
- *      @alpha2 to adjust their device's DFS parameters as required.
- * @user_reg_hint_type: if the @initiator was of type
- *      %NL80211_REGDOM_SET_BY_USER, this classifies the type
- *      of hint passed. This could be any of the %NL80211_USER_REG_HINT_*
- *      types.
  * @intersect: indicates whether the wireless core should intersect
  *      the requested regulatory domain with the presently set regulatory
  *      domain.
@@ -74,9 +58,7 @@ enum environment_cap {
 struct regulatory_request {
         int wiphy_idx;
         enum nl80211_reg_initiator initiator;
-        enum nl80211_user_reg_hint_type user_reg_hint_type;
         char alpha2[2];
-        u8 dfs_region;
         bool intersect;
         bool processed;
         enum environment_cap country_ie_env;
@@ -103,7 +85,6 @@ struct ieee80211_reg_rule {
 struct ieee80211_regdomain {
         u32 n_reg_rules;
         char alpha2[2];
-        u8 dfs_region;
         struct ieee80211_reg_rule reg_rules[];
 };
 
diff --git a/include/net/request_sock.h b/include/net/request_sock.h
index a51dbd17c2d..4c0766e201e 100644
--- a/include/net/request_sock.h
+++ b/include/net/request_sock.h
@@ -49,16 +49,13 @@ struct request_sock_ops {
                                            struct request_sock *req);
 };
 
-extern int inet_rtx_syn_ack(struct sock *parent, struct request_sock *req);
-
 /* struct request_sock - mini sock to represent a connection request
  */
 struct request_sock {
         struct request_sock             *dl_next; /* Must be first member! */
         u16                             mss;
-        u8                              num_retrans; /* number of retransmits */
-        u8                              cookie_ts:1; /* syncookie: encode tcpopts in timestamp */
-        u8                              num_timeout:7; /* number of timeouts */
+        u8                              retrans;
+        u8                              cookie_ts; /* syncookie: encode tcpopts in timestamp */
         /* The following two fields can be easily recomputed I think -AK */
         u32                             window_clamp; /* window clamp at creation time */
         u32                             rcv_wnd;          /* rcv_wnd offered first time */
@@ -109,34 +106,6 @@ struct listen_sock {
         struct request_sock     *syn_table[0];
 };
 
-/*
- * For a TCP Fast Open listener -
- *      lock - protects the access to all the reqsk, which is co-owned by
- *              the listener and the child socket.
- *      qlen - pending TFO requests (still in TCP_SYN_RECV).
- *      max_qlen - max TFO reqs allowed before TFO is disabled.
- *
- *      XXX (TFO) - ideally these fields can be made as part of "listen_sock"
- *      structure above. But there is some implementation difficulty due to
- *      listen_sock being part of request_sock_queue hence will be freed when
- *      a listener is stopped. But TFO related fields may continue to be
- *      accessed even after a listener is closed, until its sk_refcnt drops
- *      to 0 implying no more outstanding TFO reqs. One solution is to keep
- *      listen_opt around until sk_refcnt drops to 0. But there is some other
- *      complexity that needs to be resolved. E.g., a listener can be disabled
- *      temporarily through shutdown()->tcp_disconnect(), and re-enabled later.
- */
-struct fastopen_queue {
-        struct request_sock     *rskq_rst_head; /* Keep track of past TFO */
-        struct request_sock     *rskq_rst_tail; /* requests that caused RST.
-                                                 * This is part of the defense
-                                                 * against spoofing attack.
-                                                 */
-        spinlock_t      lock;
-        int             qlen;           /* # of pending (TCP_SYN_RECV) reqs */
-        int             max_qlen;       /* != 0 iff TFO is currently enabled */
-};
-
 /** struct request_sock_queue - queue of request_socks
  *
  * @rskq_accept_head - FIFO head of established children
@@ -160,12 +129,6 @@ struct request_sock_queue {
         u8                      rskq_defer_accept;
         /* 3 bytes hole, try to pack */
         struct listen_sock      *listen_opt;
-        struct fastopen_queue   *fastopenq; /* This is non-NULL iff TFO has been
-                                             * enabled on this listener. Check
-                                             * max_qlen != 0 in fastopen_queue
-                                             * to determine if TFO is enabled
-                                             * right at this moment.
-                                             */
 };
 
 extern int reqsk_queue_alloc(struct request_sock_queue *queue,
@@ -173,8 +136,6 @@ extern int reqsk_queue_alloc(struct request_sock_queue *queue,
 
 extern void __reqsk_queue_destroy(struct request_sock_queue *queue);
 extern void reqsk_queue_destroy(struct request_sock_queue *queue);
-extern void reqsk_fastopen_remove(struct sock *sk,
-                                  struct request_sock *req, bool reset);
 
 static inline struct request_sock *
         reqsk_queue_yank_acceptq(struct request_sock_queue *queue)
@@ -229,12 +190,25 @@ static inline struct request_sock *reqsk_queue_remove(struct request_sock_queue
         return req;
 }
 
+static inline struct sock *reqsk_queue_get_child(struct request_sock_queue *queue,
+                                                 struct sock *parent)
+{
+        struct request_sock *req = reqsk_queue_remove(queue);
+        struct sock *child = req->sk;
+
+        WARN_ON(child == NULL);
+
+        sk_acceptq_removed(parent);
+        __reqsk_free(req);
+        return child;
+}
+
 static inline int reqsk_queue_removed(struct request_sock_queue *queue,
                                       struct request_sock *req)
 {
         struct listen_sock *lopt = queue->listen_opt;
 
-        if (req->num_timeout == 0)
+        if (req->retrans == 0)
                 --lopt->qlen_young;
 
         return --lopt->qlen;
@@ -272,8 +246,7 @@ static inline void reqsk_queue_hash_req(struct request_sock_queue *queue,
         struct listen_sock *lopt = queue->listen_opt;
 
         req->expires = jiffies + timeout;
-        req->num_retrans = 0;
-        req->num_timeout = 0;
+        req->retrans = 0;
         req->sk = NULL;
         req->dl_next = lopt->syn_table[hash];
 
diff --git a/include/net/route.h b/include/net/route.h
index 2ea40c1b5e0..db7b3432f07 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -30,7 +30,6 @@
 #include <net/inet_sock.h>
 #include <linux/in_route.h>
 #include <linux/rtnetlink.h>
-#include <linux/rcupdate.h>
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
@@ -41,42 +40,45 @@
 #define RT_CONN_FLAGS(sk)   (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))
 
 struct fib_nh;
+struct inet_peer;
 struct fib_info;
 struct rtable {
         struct dst_entry        dst;
 
+        /* Lookup key. */
+        __be32                  rt_key_dst;
+        __be32                  rt_key_src;
+
         int                     rt_genid;
-        unsigned int            rt_flags;
+        unsigned                rt_flags;
         __u16                   rt_type;
-        __u8                    rt_is_input;
-        __u8                    rt_uses_gateway;
+        __u8                    rt_key_tos;
 
+        __be32                  rt_dst; /* Path destination     */
+        __be32                  rt_src; /* Path source          */
+        int                     rt_route_iif;
         int                     rt_iif;
+        int                     rt_oif;
+        __u32                   rt_mark;
 
         /* Info on neighbour */
         __be32                  rt_gateway;
 
         /* Miscellaneous cached information */
-        u32                     rt_pmtu;
-
-        struct list_head        rt_uncached;
+        __be32                  rt_spec_dst; /* RFC1122 specific destination */
+        u32                     rt_peer_genid;
+        struct inet_peer        *peer; /* long-living peer info */
+        struct fib_info         *fi; /* for client ref to shared metrics */
 };
 
-static inline bool rt_is_input_route(const struct rtable *rt)
-{
-        return rt->rt_is_input != 0;
-}
-
-static inline bool rt_is_output_route(const struct rtable *rt)
+static inline bool rt_is_input_route(struct rtable *rt)
 {
-        return rt->rt_is_input == 0;
+        return rt->rt_route_iif != 0;
 }
 
-static inline __be32 rt_nexthop(const struct rtable *rt, __be32 daddr)
+static inline bool rt_is_output_route(struct rtable *rt)
 {
-        if (rt->rt_gateway)
-                return rt->rt_gateway;
-        return daddr;
+        return rt->rt_route_iif == 0;
 }
 
 struct ip_rt_acct {
@@ -109,8 +111,10 @@ extern struct ip_rt_acct __percpu *ip_rt_acct;
 
 struct in_device;
 extern int              ip_rt_init(void);
-extern void             rt_cache_flush(struct net *net);
-extern void             rt_flush_dev(struct net_device *dev);
+extern void             ip_rt_redirect(__be32 old_gw, __be32 dst, __be32 new_gw,
+                                       __be32 src, struct net_device *dev);
+extern void             rt_cache_flush(struct net *net, int how);
+extern void             rt_cache_flush_batch(struct net *net);
 extern struct rtable *__ip_route_output_key(struct net *, struct flowi4 *flp);
 extern struct rtable *ip_route_output_flow(struct net *, struct flowi4 *flp,
                                            struct sock *sk);
@@ -126,9 +130,9 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr,
 {
         struct flowi4 fl4 = {
                 .flowi4_oif = oif,
-                .flowi4_tos = tos,
                 .daddr = daddr,
                 .saddr = saddr,
+                .flowi4_tos = tos,
         };
         return ip_route_output_key(net, &fl4);
 }
@@ -162,33 +166,27 @@ static inline struct rtable *ip_route_output_gre(struct net *net, struct flowi4
         return ip_route_output_key(net, fl4);
 }
 
-extern int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
-                                u8 tos, struct net_device *devin);
+extern int ip_route_input_common(struct sk_buff *skb, __be32 dst, __be32 src,
+                                 u8 tos, struct net_device *devin, bool noref);
 
 static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
                                  u8 tos, struct net_device *devin)
 {
-        int err;
-
-        rcu_read_lock();
-        err = ip_route_input_noref(skb, dst, src, tos, devin);
-        if (!err)
-                skb_dst_force(skb);
-        rcu_read_unlock();
+        return ip_route_input_common(skb, dst, src, tos, devin, false);
+}
 
-        return err;
+static inline int ip_route_input_noref(struct sk_buff *skb, __be32 dst, __be32 src,
+                                       u8 tos, struct net_device *devin)
+{
+        return ip_route_input_common(skb, dst, src, tos, devin, true);
 }
 
-extern void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
-                             int oif, u32 mark, u8 protocol, int flow_flags);
-extern void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu);
-extern void ipv4_redirect(struct sk_buff *skb, struct net *net,
-                          int oif, u32 mark, u8 protocol, int flow_flags);
-extern void ipv4_sk_redirect(struct sk_buff *skb, struct sock *sk);
-extern void ip_rt_send_redirect(struct sk_buff *skb);
+extern unsigned short   ip_rt_frag_needed(struct net *net, const struct iphdr *iph,
+                                          unsigned short new_mtu, struct net_device *dev);
+extern void             ip_rt_send_redirect(struct sk_buff *skb);
 
-extern unsigned int             inet_addr_type(struct net *net, __be32 addr);
-extern unsigned int             inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
+extern unsigned         inet_addr_type(struct net *net, __be32 addr);
+extern unsigned         inet_dev_addr_type(struct net *net, const struct net_device *dev, __be32 addr);
 extern void             ip_rt_multicast_event(struct in_device *);
 extern int              ip_rt_ioctl(struct net *, unsigned int cmd, void __user *arg);
 extern void             ip_rt_get_source(u8 *src, struct sk_buff *skb, struct rtable *rt);
@@ -198,13 +196,10 @@ struct in_ifaddr;
 extern void fib_add_ifaddr(struct in_ifaddr *);
 extern void fib_del_ifaddr(struct in_ifaddr *, struct in_ifaddr *);
 
-static inline void ip_rt_put(struct rtable *rt)
+static inline void ip_rt_put(struct rtable * rt)
 {
-        /* dst_release() accepts a NULL parameter.
-         * We rely on dst being first structure in struct rtable
-         */
-        BUILD_BUG_ON(offsetof(struct rtable, dst) != 0);
-        dst_release(&rt->dst);
+        if (rt)
+                dst_release(&rt->dst);
 }
 
 #define IPTOS_RT_MASK   (IPTOS_TOS_MASK & ~3)
@@ -249,6 +244,8 @@ static inline void ip_route_connect_init(struct flowi4 *fl4, __be32 dst, __be32
 
         if (inet_sk(sk)->transparent)
                 flow_flags |= FLOWI_FLAG_ANYSRC;
+        if (protocol == IPPROTO_TCP)
+                flow_flags |= FLOWI_FLAG_PRECOW_METRICS;
         if (can_sleep)
                 flow_flags |= FLOWI_FLAG_CAN_SLEEP;
 
@@ -273,7 +270,6 @@ static inline struct rtable *ip_route_connect(struct flowi4 *fl4,
                 if (IS_ERR(rt))
                         return rt;
                 ip_rt_put(rt);
-                flowi4_update_output(fl4, oif, tos, fl4->daddr, fl4->saddr);
         }
         security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
         return ip_route_output_flow(net, fl4, sk);
@@ -288,22 +284,26 @@ static inline struct rtable *ip_route_newports(struct flowi4 *fl4, struct rtable
                 fl4->fl4_dport = dport;
                 fl4->fl4_sport = sport;
                 ip_rt_put(rt);
-                flowi4_update_output(fl4, sk->sk_bound_dev_if,
-                                     RT_CONN_FLAGS(sk), fl4->daddr,
-                                     fl4->saddr);
                 security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
                 return ip_route_output_flow(sock_net(sk), fl4, sk);
         }
         return rt;
 }
 
-static inline int inet_iif(const struct sk_buff *skb)
+extern void rt_bind_peer(struct rtable *rt, __be32 daddr, int create);
+
+static inline struct inet_peer *rt_get_peer(struct rtable *rt, __be32 daddr)
 {
-        int iif = skb_rtable(skb)->rt_iif;
+        if (rt->peer)
+                return rt->peer;
 
-        if (iif)
-                return iif;
-        return skb->skb_iif;
+        rt_bind_peer(rt, daddr, 0);
+        return rt->peer;
+}
+
+static inline int inet_iif(const struct sk_buff *skb)
+{
+        return skb_rtable(skb)->rt_iif;
 }
 
 extern int sysctl_ip_default_ttl;
diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index 5a15fabd6a7..678f1ffaf84 100644
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -6,7 +6,7 @@
 
 typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *, void *);
 typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
-typedef u16 (*rtnl_calcit_func)(struct sk_buff *, struct nlmsghdr *);
+typedef u16 (*rtnl_calcit_func)(struct sk_buff *);
 
 extern int      __rtnl_register(int protocol, int msgtype,
                                 rtnl_doit_func, rtnl_dumpit_func,
@@ -41,13 +41,9 @@ static inline int rtnl_msg_family(const struct nlmsghdr *nlh)
  *      @get_size: Function to calculate required room for dumping device
  *                 specific netlink attributes
  *      @fill_info: Function to dump device specific netlink attributes
- *      @get_xstats_size: Function to calculate required room for dumping device
+ *      @get_xstats_size: Function to calculate required room for dumping devic
  *                        specific statistics
  *      @fill_xstats: Function to dump device specific statistics
- *      @get_num_tx_queues: Function to determine number of transmit queues
- *                          to create when creating a new device.
- *      @get_num_rx_queues: Function to determine number of receive queues
- *                          to create when creating a new device.
  */
 struct rtnl_link_ops {
         struct list_head        list;
@@ -79,8 +75,9 @@ struct rtnl_link_ops {
         size_t                  (*get_xstats_size)(const struct net_device *dev);
         int                     (*fill_xstats)(struct sk_buff *skb,
                                                const struct net_device *dev);
-        unsigned int            (*get_num_tx_queues)(void);
-        unsigned int            (*get_num_rx_queues)(void);
+        int                     (*get_tx_queues)(struct net *net, struct nlattr *tb[],
+                                                 unsigned int *tx_queues,
+                                                 unsigned int *real_tx_queues);
 };
 
 extern int      __rtnl_link_register(struct rtnl_link_ops *ops);
@@ -97,7 +94,7 @@ extern void	rtnl_link_unregister(struct rtnl_link_ops *ops);
  *      @fill_link_af: Function to fill IFLA_AF_SPEC with address family
  *                     specific netlink attributes.
  *      @get_link_af_size: Function to calculate size of address family specific
- *                         netlink attributes.
+ *                         netlink attributes exlusive the container attribute.
  *      @validate_link_af: Validate a IFLA_AF_SPEC attribute, must check attr
  *                         for invalid configuration settings.
  *      @set_link_af: Function to parse a IFLA_AF_SPEC attribute and modify
@@ -125,7 +122,7 @@ extern void	rtnl_af_unregister(struct rtnl_af_ops *ops);
 
 
 extern struct net *rtnl_link_get_net(struct net *src_net, struct nlattr *tb[]);
-extern struct net_device *rtnl_create_link(struct net *net,
+extern struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
         char *ifname, const struct rtnl_link_ops *ops, struct nlattr *tb[]);
 extern int rtnl_configure_link(struct net_device *dev,
                                const struct ifinfomsg *ifm);
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
index 1540f9c2fcf..4fc88f3ccd5 100644
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -4,6 +4,7 @@
 #include <linux/netdevice.h>
 #include <linux/types.h>
 #include <linux/rcupdate.h>
+#include <linux/module.h>
 #include <linux/pkt_sched.h>
 #include <linux/pkt_cls.h>
 #include <net/gen_stats.h>
@@ -45,21 +46,14 @@ struct qdisc_size_table {
 struct Qdisc {
         int                     (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
         struct sk_buff *        (*dequeue)(struct Qdisc *dev);
-        unsigned int            flags;
+        unsigned                flags;
 #define TCQ_F_BUILTIN           1
 #define TCQ_F_INGRESS           2
 #define TCQ_F_CAN_BYPASS        4
 #define TCQ_F_MQROOT            8
-#define TCQ_F_ONETXQUEUE        0x10 /* dequeue_skb() can assume all skbs are for
-                                      * q->dev_queue : It can test
-                                      * netif_xmit_frozen_or_stopped() before
-                                      * dequeueing next packet.
-                                      * Its true for MQ/MQPRIO slaves, or non
-                                      * multiqueue device.
-                                      */
 #define TCQ_F_WARN_NONWC        (1 << 16)
         int                     padded;
-        const struct Qdisc_ops  *ops;
+        struct Qdisc_ops        *ops;
         struct qdisc_size_table __rcu *stab;
         struct list_head        list;
         u32                     handle;
@@ -195,8 +189,7 @@ struct tcf_proto_ops {
 
         unsigned long           (*get)(struct tcf_proto*, u32 handle);
         void                    (*put)(struct tcf_proto*, unsigned long);
-        int                     (*change)(struct sk_buff *,
-                                        struct tcf_proto*, unsigned long,
+        int                     (*change)(struct tcf_proto*, unsigned long,
                                         u32 handle, struct nlattr **,
                                         unsigned long *);
         int                     (*delete)(struct tcf_proto*, unsigned long);
@@ -228,20 +221,10 @@ struct tcf_proto {
 
 struct qdisc_skb_cb {
         unsigned int            pkt_len;
-        u16                     slave_dev_queue_mapping;
-        u16                     _pad;
-        unsigned char           data[20];
+        long                    data[];
 };
 
-static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
-{
-        struct qdisc_skb_cb *qcb;
-
-        BUILD_BUG_ON(sizeof(skb->cb) < offsetof(struct qdisc_skb_cb, data) + sz);
-        BUILD_BUG_ON(sizeof(qcb->data) < sz);
-}
-
-static inline int qdisc_qlen(const struct Qdisc *q)
+static inline int qdisc_qlen(struct Qdisc *q)
 {
         return q->q.qlen;
 }
@@ -256,12 +239,12 @@ static inline spinlock_t *qdisc_lock(struct Qdisc *qdisc)
         return &qdisc->q.lock;
 }
 
-static inline struct Qdisc *qdisc_root(const struct Qdisc *qdisc)
+static inline struct Qdisc *qdisc_root(struct Qdisc *qdisc)
 {
         return qdisc->dev_queue->qdisc;
 }
 
-static inline struct Qdisc *qdisc_root_sleeping(const struct Qdisc *qdisc)
+static inline struct Qdisc *qdisc_root_sleeping(struct Qdisc *qdisc)
 {
         return qdisc->dev_queue->qdisc_sleeping;
 }
@@ -277,7 +260,7 @@ static inline struct Qdisc *qdisc_root_sleeping(const struct Qdisc *qdisc)
  * root.  This is enforced by holding the RTNL semaphore, which
  * all users of this lock accessor must do.
  */
-static inline spinlock_t *qdisc_root_lock(const struct Qdisc *qdisc)
+static inline spinlock_t *qdisc_root_lock(struct Qdisc *qdisc)
 {
         struct Qdisc *root = qdisc_root(qdisc);
 
@@ -285,7 +268,7 @@ static inline spinlock_t *qdisc_root_lock(const struct Qdisc *qdisc)
         return qdisc_lock(root);
 }
 
-static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
+static inline spinlock_t *qdisc_root_sleeping_lock(struct Qdisc *qdisc)
 {
         struct Qdisc *root = qdisc_root_sleeping(qdisc);
 
@@ -293,17 +276,17 @@ static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
         return qdisc_lock(root);
 }
 
-static inline struct net_device *qdisc_dev(const struct Qdisc *qdisc)
+static inline struct net_device *qdisc_dev(struct Qdisc *qdisc)
 {
         return qdisc->dev_queue->dev;
 }
 
-static inline void sch_tree_lock(const struct Qdisc *q)
+static inline void sch_tree_lock(struct Qdisc *q)
 {
         spin_lock_bh(qdisc_root_sleeping_lock(q));
 }
 
-static inline void sch_tree_unlock(const struct Qdisc *q)
+static inline void sch_tree_unlock(struct Qdisc *q)
 {
         spin_unlock_bh(qdisc_root_sleeping_lock(q));
 }
@@ -336,7 +319,7 @@ static inline unsigned int qdisc_class_hash(u32 id, u32 mask)
 }
 
 static inline struct Qdisc_class_common *
-qdisc_class_find(const struct Qdisc_class_hash *hash, u32 id)
+qdisc_class_find(struct Qdisc_class_hash *hash, u32 id)
 {
         struct Qdisc_class_common *cl;
         struct hlist_node *n;
@@ -410,7 +393,7 @@ static inline bool qdisc_all_tx_empty(const struct net_device *dev)
 }
 
 /* Are any of the TX qdiscs changing?  */
-static inline bool qdisc_tx_changing(const struct net_device *dev)
+static inline bool qdisc_tx_changing(struct net_device *dev)
 {
         unsigned int i;
         for (i = 0; i < dev->num_tx_queues; i++) {
diff --git a/include/net/scm.h b/include/net/scm.h
index 975cca01048..745460fa2f0 100644
--- a/include/net/scm.h
+++ b/include/net/scm.h
@@ -12,13 +12,8 @@
  */
 #define SCM_MAX_FD      253
 
-struct scm_creds {
-        u32     pid;
-        kuid_t  uid;
-        kgid_t  gid;
-};
-
 struct scm_fp_list {
+        struct list_head        list;
         short                   count;
         short                   max;
         struct file             *fp[SCM_MAX_FD];
@@ -28,7 +23,7 @@ struct scm_cookie {
         struct pid              *pid;           /* Skb credentials */
         const struct cred       *cred;
         struct scm_fp_list      *fp;            /* Passed files         */
-        struct scm_creds        creds;          /* Skb credentials      */
+        struct ucred            creds;          /* Skb credentials      */
 #ifdef CONFIG_SECURITY_NETWORK
         u32                     secid;          /* Passed security ID   */
 #endif
@@ -54,10 +49,8 @@ static __inline__ void scm_set_cred(struct scm_cookie *scm,
                                     struct pid *pid, const struct cred *cred)
 {
         scm->pid  = get_pid(pid);
-        scm->cred = cred ? get_cred(cred) : NULL;
-        scm->creds.pid = pid_vnr(pid);
-        scm->creds.uid = cred ? cred->euid : INVALID_UID;
-        scm->creds.gid = cred ? cred->egid : INVALID_GID;
+        scm->cred = get_cred(cred);
+        cred_to_ucred(pid, cred, &scm->creds);
 }
 
 static __inline__ void scm_destroy_cred(struct scm_cookie *scm)
@@ -73,16 +66,15 @@ static __inline__ void scm_destroy_cred(struct scm_cookie *scm)
 static __inline__ void scm_destroy(struct scm_cookie *scm)
 {
         scm_destroy_cred(scm);
-        if (scm->fp)
+        if (scm && scm->fp)
                 __scm_destroy(scm);
 }
 
 static __inline__ int scm_send(struct socket *sock, struct msghdr *msg,
-                               struct scm_cookie *scm, bool forcecreds)
+                               struct scm_cookie *scm)
 {
-        memset(scm, 0, sizeof(*scm));
-        if (forcecreds)
-                scm_set_cred(scm, task_tgid(current), current_cred());
+        scm_set_cred(scm, task_tgid(current), current_cred());
+        scm->fp = NULL;
         unix_get_peersec_dgram(sock, scm);
         if (msg->msg_controllen <= 0)
                 return 0;
@@ -120,15 +112,8 @@ static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
                 return;
         }
 
-        if (test_bit(SOCK_PASSCRED, &sock->flags)) {
-                struct user_namespace *current_ns = current_user_ns();
-                struct ucred ucreds = {
-                        .pid = scm->creds.pid,
-                        .uid = from_kuid_munged(current_ns, scm->creds.uid),
-                        .gid = from_kgid_munged(current_ns, scm->creds.gid),
-                };
-                put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(ucreds), &ucreds);
-        }
+        if (test_bit(SOCK_PASSCRED, &sock->flags))
+                put_cmsg(msg, SOL_SOCKET, SCM_CREDENTIALS, sizeof(scm->creds), &scm->creds);
 
         scm_destroy_cred(scm);
 
diff --git a/include/net/sctp/command.h b/include/net/sctp/command.h
index 35247271e55..712b3bebeda 100644
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
@@ -130,6 +130,8 @@ typedef union {
         __be16 err;
         sctp_state_t state;
         sctp_event_timeout_t to;
+        unsigned long zero;
+        void *ptr;
         struct sctp_chunk *chunk;
         struct sctp_association *asoc;
         struct sctp_transport *transport;
@@ -152,15 +154,23 @@ typedef union {
  * which takes an __s32 and returns a sctp_arg_t containing the
  * __s32.  So, after foo = SCTP_I32(arg), foo.i32 == arg.
  */
+static inline sctp_arg_t SCTP_NULL(void)
+{
+        sctp_arg_t retval; retval.ptr = NULL; return retval;
+}
+static inline sctp_arg_t SCTP_NOFORCE(void)
+{
+        sctp_arg_t retval = {.zero = 0UL}; retval.i32 = 0; return retval;
+}
+static inline sctp_arg_t SCTP_FORCE(void)
+{
+        sctp_arg_t retval = {.zero = 0UL}; retval.i32 = 1; return retval;
+}
 
 #define SCTP_ARG_CONSTRUCTOR(name, type, elt) \
 static inline sctp_arg_t        \
 SCTP_## name (type arg)         \
-{ sctp_arg_t retval;\
-  memset(&retval, 0, sizeof(sctp_arg_t));\
-  retval.elt = arg;\
-  return retval;\
-}
+{ sctp_arg_t retval = {.zero = 0UL}; retval.elt = arg; return retval; }
 
 SCTP_ARG_CONSTRUCTOR(I32,       __s32, i32)
 SCTP_ARG_CONSTRUCTOR(U32,       __u32, u32)
@@ -171,6 +181,7 @@ SCTP_ARG_CONSTRUCTOR(ERROR,     int, error)
 SCTP_ARG_CONSTRUCTOR(PERR,      __be16, err)    /* protocol error */
 SCTP_ARG_CONSTRUCTOR(STATE,     sctp_state_t, state)
 SCTP_ARG_CONSTRUCTOR(TO,        sctp_event_timeout_t, to)
+SCTP_ARG_CONSTRUCTOR(PTR,       void *, ptr)
 SCTP_ARG_CONSTRUCTOR(CHUNK,     struct sctp_chunk *, chunk)
 SCTP_ARG_CONSTRUCTOR(ASOC,      struct sctp_association *, asoc)
 SCTP_ARG_CONSTRUCTOR(TRANSPORT, struct sctp_transport *, transport)
@@ -181,23 +192,6 @@ SCTP_ARG_CONSTRUCTOR(PACKET,	struct sctp_packet *, packet)
 SCTP_ARG_CONSTRUCTOR(SACKH,     sctp_sackhdr_t *, sackh)
 SCTP_ARG_CONSTRUCTOR(DATAMSG,   struct sctp_datamsg *, msg)
 
-static inline sctp_arg_t SCTP_FORCE(void)
-{
-        return SCTP_I32(1);
-}
-
-static inline sctp_arg_t SCTP_NOFORCE(void)
-{
-        return SCTP_I32(0);
-}
-
-static inline sctp_arg_t SCTP_NULL(void)
-{
-        sctp_arg_t retval;
-        memset(&retval, 0, sizeof(sctp_arg_t));
-        return retval;
-}
-
 typedef struct {
         sctp_arg_t obj;
         sctp_verb_t verb;
diff --git a/include/net/sctp/constants.h b/include/net/sctp/constants.h
index c29707d654c..942b864f613 100644
--- a/include/net/sctp/constants.h
+++ b/include/net/sctp/constants.h
@@ -312,6 +312,14 @@ enum { SCTP_MAX_GABS = 16 };
                                  * functions simpler to write.
                                  */
 
+#if defined (CONFIG_SCTP_HMAC_MD5)
+#define SCTP_COOKIE_HMAC_ALG "hmac(md5)"
+#elif defined (CONFIG_SCTP_HMAC_SHA1)
+#define SCTP_COOKIE_HMAC_ALG "hmac(sha1)"
+#else
+#define SCTP_COOKIE_HMAC_ALG NULL
+#endif
+
 /* These return values describe the success or failure of a number of
  * routines which form the lower interface to SCTP_outqueue.
  */
@@ -326,7 +334,6 @@ typedef enum {
 typedef enum {
         SCTP_TRANSPORT_UP,
         SCTP_TRANSPORT_DOWN,
-        SCTP_TRANSPORT_PF,
 } sctp_transport_cmd_t;
 
 /* These are the address scopes defined mainly for IPv4 addresses
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 7fdf298a47e..6a72a58cde5 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -71,7 +71,7 @@
 #include <linux/jiffies.h>
 #include <linux/idr.h>
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 #include <net/ipv6.h>
 #include <net/ip6_route.h>
 #endif
@@ -114,12 +114,13 @@
 /*
  * sctp/protocol.c
  */
-extern int sctp_copy_local_addr_list(struct net *, struct sctp_bind_addr *,
+extern struct sock *sctp_get_ctl_sock(void);
+extern int sctp_copy_local_addr_list(struct sctp_bind_addr *,
                                      sctp_scope_t, gfp_t gfp,
                                      int flags);
 extern struct sctp_pf *sctp_get_pf_specific(sa_family_t family);
 extern int sctp_register_pf(struct sctp_pf *, sa_family_t);
-extern void sctp_addr_wq_mgmt(struct net *, struct sctp_sockaddr_entry *, int);
+extern void sctp_addr_wq_mgmt(struct sctp_sockaddr_entry *, int);
 
 /*
  * sctp/socket.c
@@ -139,12 +140,12 @@ extern int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *);
 /*
  * sctp/primitive.c
  */
-int sctp_primitive_ASSOCIATE(struct net *, struct sctp_association *, void *arg);
-int sctp_primitive_SHUTDOWN(struct net *, struct sctp_association *, void *arg);
-int sctp_primitive_ABORT(struct net *, struct sctp_association *, void *arg);
-int sctp_primitive_SEND(struct net *, struct sctp_association *, void *arg);
-int sctp_primitive_REQUESTHEARTBEAT(struct net *, struct sctp_association *, void *arg);
-int sctp_primitive_ASCONF(struct net *, struct sctp_association *, void *arg);
+int sctp_primitive_ASSOCIATE(struct sctp_association *, void *arg);
+int sctp_primitive_SHUTDOWN(struct sctp_association *, void *arg);
+int sctp_primitive_ABORT(struct sctp_association *, void *arg);
+int sctp_primitive_SEND(struct sctp_association *, void *arg);
+int sctp_primitive_REQUESTHEARTBEAT(struct sctp_association *, void *arg);
+int sctp_primitive_ASCONF(struct sctp_association *, void *arg);
 
 /*
  * sctp/input.c
@@ -155,14 +156,12 @@ void sctp_hash_established(struct sctp_association *);
 void sctp_unhash_established(struct sctp_association *);
 void sctp_hash_endpoint(struct sctp_endpoint *);
 void sctp_unhash_endpoint(struct sctp_endpoint *);
-struct sock *sctp_err_lookup(struct net *net, int family, struct sk_buff *,
+struct sock *sctp_err_lookup(int family, struct sk_buff *,
                              struct sctphdr *, struct sctp_association **,
                              struct sctp_transport **);
 void sctp_err_finish(struct sock *, struct sctp_association *);
 void sctp_icmp_frag_needed(struct sock *, struct sctp_association *,
                            struct sctp_transport *t, __u32 pmtu);
-void sctp_icmp_redirect(struct sock *, struct sctp_transport *,
-                        struct sk_buff *);
 void sctp_icmp_proto_unreachable(struct sock *sk,
                                  struct sctp_association *asoc,
                                  struct sctp_transport *t);
@@ -172,14 +171,14 @@ void sctp_backlog_migrate(struct sctp_association *assoc,
 /*
  * sctp/proc.c
  */
-int sctp_snmp_proc_init(struct net *net);
-void sctp_snmp_proc_exit(struct net *net);
-int sctp_eps_proc_init(struct net *net);
-void sctp_eps_proc_exit(struct net *net);
-int sctp_assocs_proc_init(struct net *net);
-void sctp_assocs_proc_exit(struct net *net);
-int sctp_remaddr_proc_init(struct net *net);
-void sctp_remaddr_proc_exit(struct net *net);
+int sctp_snmp_proc_init(void);
+void sctp_snmp_proc_exit(void);
+int sctp_eps_proc_init(void);
+void sctp_eps_proc_exit(void);
+int sctp_assocs_proc_init(void);
+void sctp_assocs_proc_exit(void);
+int sctp_remaddr_proc_init(void);
+void sctp_remaddr_proc_exit(void);
 
 
 /*
@@ -221,10 +220,11 @@ extern struct kmem_cache *sctp_bucket_cachep __read_mostly;
 #define sctp_bh_unlock_sock(sk)  bh_unlock_sock(sk)
 
 /* SCTP SNMP MIB stats handlers */
-#define SCTP_INC_STATS(net, field)      SNMP_INC_STATS((net)->sctp.sctp_statistics, field)
-#define SCTP_INC_STATS_BH(net, field)   SNMP_INC_STATS_BH((net)->sctp.sctp_statistics, field)
-#define SCTP_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->sctp.sctp_statistics, field)
-#define SCTP_DEC_STATS(net, field)      SNMP_DEC_STATS((net)->sctp.sctp_statistics, field)
+DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);
+#define SCTP_INC_STATS(field)      SNMP_INC_STATS(sctp_statistics, field)
+#define SCTP_INC_STATS_BH(field)   SNMP_INC_STATS_BH(sctp_statistics, field)
+#define SCTP_INC_STATS_USER(field) SNMP_INC_STATS_USER(sctp_statistics, field)
+#define SCTP_DEC_STATS(field)      SNMP_DEC_STATS(sctp_statistics, field)
 
 #endif /* !TEST_FRAME */
 
@@ -272,18 +272,6 @@ struct sctp_mib {
         unsigned long   mibs[SCTP_MIB_MAX];
 };
 
-/* helper function to track stats about max rto and related transport */
-static inline void sctp_max_rto(struct sctp_association *asoc,
-                                struct sctp_transport *trans)
-{
-        if (asoc->stats.max_obs_rto < (__u64)trans->rto) {
-                asoc->stats.max_obs_rto = trans->rto;
-                memset(&asoc->stats.obs_rto_ipaddr, 0,
-                        sizeof(struct sockaddr_storage));
-                memcpy(&asoc->stats.obs_rto_ipaddr, &trans->ipaddr,
-                        trans->af_specific->sockaddr_len);
-        }
-}
 
 /* Print debugging messages.  */
 #if SCTP_DEBUG
@@ -371,35 +359,31 @@ atomic_t sctp_dbg_objcnt_## name = ATOMIC_INIT(0)
 #define SCTP_DBG_OBJCNT_ENTRY(name) \
 {.label= #name, .counter= &sctp_dbg_objcnt_## name}
 
-void sctp_dbg_objcnt_init(struct net *);
-void sctp_dbg_objcnt_exit(struct net *);
+void sctp_dbg_objcnt_init(void);
+void sctp_dbg_objcnt_exit(void);
 
 #else
 
 #define SCTP_DBG_OBJCNT_INC(name)
 #define SCTP_DBG_OBJCNT_DEC(name)
 
-static inline void sctp_dbg_objcnt_init(struct net *net) { return; }
-static inline void sctp_dbg_objcnt_exit(struct net *net) { return; }
+static inline void sctp_dbg_objcnt_init(void) { return; }
+static inline void sctp_dbg_objcnt_exit(void) { return; }
 
 #endif /* CONFIG_SCTP_DBG_OBJCOUNT */
 
 #if defined CONFIG_SYSCTL
 void sctp_sysctl_register(void);
 void sctp_sysctl_unregister(void);
-int sctp_sysctl_net_register(struct net *net);
-void sctp_sysctl_net_unregister(struct net *net);
 #else
 static inline void sctp_sysctl_register(void) { return; }
 static inline void sctp_sysctl_unregister(void) { return; }
-static inline int sctp_sysctl_net_register(struct net *net) { return 0; }
-static inline void sctp_sysctl_net_unregister(struct net *net) { return; }
 #endif
 
 /* Size of Supported Address Parameter for 'x' address types. */
 #define SCTP_SAT_LEN(x) (sizeof(struct sctp_paramhdr) + (x) * sizeof(__u16))
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 
 void sctp_v6_pf_init(void);
 void sctp_v6_pf_exit(void);
@@ -429,7 +413,6 @@ static inline sctp_assoc_t sctp_assoc2id(const struct sctp_association *asoc)
 /* Look up the association by its id.  */
 struct sctp_association *sctp_id2assoc(struct sock *sk, sctp_assoc_t id);
 
-int sctp_do_peeloff(struct sock *sk, sctp_assoc_t id, struct socket **sockp);
 
 /* A macro to walk a list of skbs.  */
 #define sctp_skb_for_each(pos, head, tmp) \
@@ -533,10 +516,10 @@ static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu)
         return frag;
 }
 
-static inline void sctp_assoc_pending_pmtu(struct sock *sk, struct sctp_association *asoc)
+static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)
 {
 
-        sctp_assoc_sync_pmtu(sk, asoc);
+        sctp_assoc_sync_pmtu(asoc);
         asoc->pmtu_pending = 0;
 }
 
@@ -600,6 +583,7 @@ for (pos = chunk->subh.fwdtsn_hdr->skip;\
 
 extern struct proto sctp_prot;
 extern struct proto sctpv6_prot;
+extern struct proc_dir_entry *proc_net_sctp;
 void sctp_put_port(struct sock *sk);
 
 extern struct idr sctp_assocs_id;
@@ -645,21 +629,21 @@ static inline int sctp_sanity_check(void)
 
 /* Warning: The following hash functions assume a power of two 'size'. */
 /* This is the hash function for the SCTP port hash table. */
-static inline int sctp_phashfn(struct net *net, __u16 lport)
+static inline int sctp_phashfn(__u16 lport)
 {
-        return (net_hash_mix(net) + lport) & (sctp_port_hashsize - 1);
+        return lport & (sctp_port_hashsize - 1);
 }
 
 /* This is the hash function for the endpoint hash table. */
-static inline int sctp_ep_hashfn(struct net *net, __u16 lport)
+static inline int sctp_ep_hashfn(__u16 lport)
 {
-        return (net_hash_mix(net) + lport) & (sctp_ep_hashsize - 1);
+        return lport & (sctp_ep_hashsize - 1);
 }
 
 /* This is the hash function for the association hash table. */
-static inline int sctp_assoc_hashfn(struct net *net, __u16 lport, __u16 rport)
+static inline int sctp_assoc_hashfn(__u16 lport, __u16 rport)
 {
-        int h = (lport << 16) + rport + net_hash_mix(net);
+        int h = (lport << 16) + rport;
         h ^= h>>8;
         return h & (sctp_assoc_hashsize - 1);
 }
@@ -719,17 +703,4 @@ static inline void sctp_v4_map_v6(union sctp_addr *addr)
         addr->v6.sin6_addr.s6_addr32[2] = htonl(0x0000ffff);
 }
 
-/* The cookie is always 0 since this is how it's used in the
- * pmtu code.
- */
-static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t)
-{
-        if (t->dst && !dst_check(t->dst, 0)) {
-                dst_release(t->dst);
-                t->dst = NULL;
-        }
-
-        return t->dst;
-}
-
 #endif /* __net_sctp_h__ */
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index 2a82d138470..9148632b820 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -77,8 +77,7 @@ typedef struct {
         int action;
 } sctp_sm_command_t;
 
-typedef sctp_disposition_t (sctp_state_fn_t) (struct net *,
-                                              const struct sctp_endpoint *,
+typedef sctp_disposition_t (sctp_state_fn_t) (const struct sctp_endpoint *,
                                               const struct sctp_association *,
                                               const sctp_subtype_t type,
                                               void *arg,
@@ -179,8 +178,7 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire;
 
 /* Prototypes for utility support functions.  */
 __u8 sctp_get_chunk_type(struct sctp_chunk *chunk);
-const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *,
-                                            sctp_event_t,
+const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t,
                                             sctp_state_t,
                                             sctp_subtype_t);
 int sctp_chunk_iif(const struct sctp_chunk *);
@@ -234,8 +232,6 @@ struct sctp_chunk *sctp_make_abort_violation(const struct sctp_association *,
 struct sctp_chunk *sctp_make_violation_paramlen(const struct sctp_association *,
                                    const struct sctp_chunk *,
                                    struct sctp_paramhdr *);
-struct sctp_chunk *sctp_make_violation_max_retrans(const struct sctp_association *,
-                                                   const struct sctp_chunk *);
 struct sctp_chunk *sctp_make_heartbeat(const struct sctp_association *,
                                   const struct sctp_transport *);
 struct sctp_chunk *sctp_make_heartbeat_ack(const struct sctp_association *,
@@ -272,7 +268,7 @@ void sctp_chunk_assign_ssn(struct sctp_chunk *);
 
 /* Prototypes for statetable processing. */
 
-int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,
+int sctp_do_sm(sctp_event_t event_type, sctp_subtype_t subtype,
                sctp_state_t state,
                struct sctp_endpoint *,
                struct sctp_association *asoc,
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index fdeb85a970f..ec86952fb57 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -102,7 +102,6 @@ struct sctp_bind_bucket {
         unsigned short  fastreuse;
         struct hlist_node       node;
         struct hlist_head       owner;
-        struct net      *net;
 };
 
 struct sctp_bind_hashbucket {
@@ -119,6 +118,63 @@ struct sctp_hashbucket {
 
 /* The SCTP globals structure. */
 extern struct sctp_globals {
+        /* RFC2960 Section 14. Suggested SCTP Protocol Parameter Values
+         *
+         * The following protocol parameters are RECOMMENDED:
+         *
+         * RTO.Initial              - 3  seconds
+         * RTO.Min                  - 1  second
+         * RTO.Max                 -  60 seconds
+         * RTO.Alpha                - 1/8  (3 when converted to right shifts.)
+         * RTO.Beta                 - 1/4  (2 when converted to right shifts.)
+         */
+        unsigned int rto_initial;
+        unsigned int rto_min;
+        unsigned int rto_max;
+
+        /* Note: rto_alpha and rto_beta are really defined as inverse
+         * powers of two to facilitate integer operations.
+         */
+        int rto_alpha;
+        int rto_beta;
+
+        /* Max.Burst                - 4 */
+        int max_burst;
+
+        /* Whether Cookie Preservative is enabled(1) or not(0) */
+        int cookie_preserve_enable;
+
+        /* Valid.Cookie.Life        - 60  seconds  */
+        unsigned int valid_cookie_life;
+
+        /* Delayed SACK timeout  200ms default*/
+        unsigned int sack_timeout;
+
+        /* HB.interval              - 30 seconds  */
+        unsigned int hb_interval;
+
+        /* Association.Max.Retrans  - 10 attempts
+         * Path.Max.Retrans         - 5  attempts (per destination address)
+         * Max.Init.Retransmits     - 8  attempts
+         */
+        int max_retrans_association;
+        int max_retrans_path;
+        int max_retrans_init;
+
+        /*
+         * Policy for preforming sctp/socket accounting
+         * 0   - do socket level accounting, all assocs share sk_sndbuf
+         * 1   - do sctp accounting, each asoc may use sk_sndbuf bytes
+         */
+        int sndbuf_policy;
+
+        /*
+         * Policy for preforming sctp/socket accounting
+         * 0   - do socket level accounting, all assocs share sk_rcvbuf
+         * 1   - do sctp accounting, each asoc may use sk_rcvbuf bytes
+         */
+        int rcvbuf_policy;
+
         /* The following variables are implementation specific.  */
 
         /* Default initialization values to be applied to new associations. */
@@ -142,11 +198,69 @@ extern struct sctp_globals {
         int port_hashsize;
         struct sctp_bind_hashbucket *port_hashtable;
 
+        /* This is the global local address list.
+         * We actively maintain this complete list of addresses on
+         * the system by catching address add/delete events.
+         *
+         * It is a list of sctp_sockaddr_entry.
+         */
+        struct list_head local_addr_list;
+        int default_auto_asconf;
+        struct list_head addr_waitq;
+        struct timer_list addr_wq_timer;
+        struct list_head auto_asconf_splist;
+        spinlock_t addr_wq_lock;
+
+        /* Lock that protects the local_addr_list writers */
+        spinlock_t addr_list_lock;
+        
+        /* Flag to indicate if addip is enabled. */
+        int addip_enable;
+        int addip_noauth_enable;
+
+        /* Flag to indicate if PR-SCTP is enabled. */
+        int prsctp_enable;
+
+        /* Flag to idicate if SCTP-AUTH is enabled */
+        int auth_enable;
+
+        /*
+         * Policy to control SCTP IPv4 address scoping
+         * 0   - Disable IPv4 address scoping
+         * 1   - Enable IPv4 address scoping
+         * 2   - Selectively allow only IPv4 private addresses
+         * 3   - Selectively allow only IPv4 link local address
+         */
+        int ipv4_scope_policy;
+
         /* Flag to indicate whether computing and verifying checksum
          * is disabled. */
-        bool checksum_disable;
+        int checksum_disable;
+
+        /* Threshold for rwnd update SACKS.  Receive buffer shifted this many
+         * bits is an indicator of when to send and window update SACK.
+         */
+        int rwnd_update_shift;
+
+        /* Threshold for autoclose timeout, in seconds. */
+        unsigned long max_autoclose;
 } sctp_globals;
 
+#define sctp_rto_initial                (sctp_globals.rto_initial)
+#define sctp_rto_min                    (sctp_globals.rto_min)
+#define sctp_rto_max                    (sctp_globals.rto_max)
+#define sctp_rto_alpha                  (sctp_globals.rto_alpha)
+#define sctp_rto_beta                   (sctp_globals.rto_beta)
+#define sctp_max_burst                  (sctp_globals.max_burst)
+#define sctp_valid_cookie_life          (sctp_globals.valid_cookie_life)
+#define sctp_cookie_preserve_enable     (sctp_globals.cookie_preserve_enable)
+#define sctp_max_retrans_association    (sctp_globals.max_retrans_association)
+#define sctp_sndbuf_policy              (sctp_globals.sndbuf_policy)
+#define sctp_rcvbuf_policy              (sctp_globals.rcvbuf_policy)
+#define sctp_max_retrans_path           (sctp_globals.max_retrans_path)
+#define sctp_max_retrans_init           (sctp_globals.max_retrans_init)
+#define sctp_sack_timeout               (sctp_globals.sack_timeout)
+#define sctp_hb_interval                (sctp_globals.hb_interval)
 #define sctp_max_instreams              (sctp_globals.max_instreams)
 #define sctp_max_outstreams             (sctp_globals.max_outstreams)
 #define sctp_address_families           (sctp_globals.address_families)
@@ -156,7 +270,21 @@ extern struct sctp_globals {
 #define sctp_assoc_hashtable            (sctp_globals.assoc_hashtable)
 #define sctp_port_hashsize              (sctp_globals.port_hashsize)
 #define sctp_port_hashtable             (sctp_globals.port_hashtable)
+#define sctp_local_addr_list            (sctp_globals.local_addr_list)
+#define sctp_local_addr_lock            (sctp_globals.addr_list_lock)
+#define sctp_auto_asconf_splist         (sctp_globals.auto_asconf_splist)
+#define sctp_addr_waitq                 (sctp_globals.addr_waitq)
+#define sctp_addr_wq_timer              (sctp_globals.addr_wq_timer)
+#define sctp_addr_wq_lock               (sctp_globals.addr_wq_lock)
+#define sctp_default_auto_asconf        (sctp_globals.default_auto_asconf)
+#define sctp_scope_policy               (sctp_globals.ipv4_scope_policy)
+#define sctp_addip_enable               (sctp_globals.addip_enable)
+#define sctp_addip_noauth               (sctp_globals.addip_noauth_enable)
+#define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
+#define sctp_auth_enable                (sctp_globals.auth_enable)
 #define sctp_checksum_disable           (sctp_globals.checksum_disable)
+#define sctp_rwnd_upd_shift             (sctp_globals.rwnd_update_shift)
+#define sctp_max_autoclose              (sctp_globals.max_autoclose)
 
 /* SCTP Socket type: UDP or TCP style. */
 typedef enum {
@@ -177,7 +305,6 @@ struct sctp_sock {
 
         /* Access to HMAC transform. */
         struct crypto_hash *hmac;
-        char *sctp_hmac_alg;
 
         /* What is our base endpointer? */
         struct sctp_endpoint *ep;
@@ -242,7 +369,7 @@ static inline struct sock *sctp_opt2sk(const struct sctp_sock *sp)
        return (struct sock *)sp;
 }
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 struct sctp6_sock {
        struct sctp_sock  sctp;
        struct ipv6_pinfo inet6;
@@ -785,9 +912,6 @@ struct sctp_transport {
                 /* Is this structure kfree()able? */
                 malloced:1;
 
-        /* Has this transport moved the ctsn since we last sacked */
-        __u32 sack_generation;
-
         struct flowi fl;
 
         /* This is the peer's IP address and port. */
@@ -863,15 +987,10 @@ struct sctp_transport {
 
         /* This is the max_retrans value for the transport and will
          * be initialized from the assocs value.  This can be changed
-         * using the SCTP_SET_PEER_ADDR_PARAMS socket option.
+         * using SCTP_SET_PEER_ADDR_PARAMS socket option.
          */
         __u16 pathmaxrxt;
 
-        /* This is the partially failed retrans value for the transport
-         * and will be initialized from the assocs value.  This can be changed
-         * using the SCTP_PEER_ADDR_THLDS socket option
-         */
-        int pf_retrans;
         /* PMTU       : The current known path MTU.  */
         __u32 pathmtu;
 
@@ -949,11 +1068,9 @@ struct sctp_transport {
 
         /* 64-bit random number sent with heartbeat. */
         __u64 hb_nonce;
-
-        struct rcu_head rcu;
 };
 
-struct sctp_transport *sctp_transport_new(struct net *, const union sctp_addr *,
+struct sctp_transport *sctp_transport_new(const union sctp_addr *,
                                           gfp_t);
 void sctp_transport_set_owner(struct sctp_transport *,
                               struct sctp_association *);
@@ -971,8 +1088,7 @@ void sctp_transport_burst_limited(struct sctp_transport *);
 void sctp_transport_burst_reset(struct sctp_transport *);
 unsigned long sctp_transport_timeout(struct sctp_transport *);
 void sctp_transport_reset(struct sctp_transport *);
-void sctp_transport_update_pmtu(struct sock *, struct sctp_transport *, u32);
-void sctp_transport_immediate_rtx(struct sctp_transport *);
+void sctp_transport_update_pmtu(struct sctp_transport *, u32);
 
 
 /* This is the structure we use to queue packets as they come into
@@ -1028,10 +1144,10 @@ struct sctp_outq {
         /* Data pending that has never been transmitted.  */
         struct list_head out_chunk_list;
 
-        unsigned int out_qlen;  /* Total length of queued data chunks. */
+        unsigned out_qlen;      /* Total length of queued data chunks. */
 
         /* Error of send failed, may used in SCTP_SEND_FAILED event. */
-        unsigned int error;
+        unsigned error;
 
         /* These are control chunks we want to send.  */
         struct list_head control_chunk_list;
@@ -1071,7 +1187,7 @@ void sctp_outq_init(struct sctp_association *, struct sctp_outq *);
 void sctp_outq_teardown(struct sctp_outq *);
 void sctp_outq_free(struct sctp_outq*);
 int sctp_outq_tail(struct sctp_outq *, struct sctp_chunk *chunk);
-int sctp_outq_sack(struct sctp_outq *, struct sctp_chunk *);
+int sctp_outq_sack(struct sctp_outq *, struct sctp_sackhdr *);
 int sctp_outq_is_empty(const struct sctp_outq *);
 void sctp_outq_restart(struct sctp_outq *);
 
@@ -1108,7 +1224,7 @@ struct sctp_bind_addr {
 
 void sctp_bind_addr_init(struct sctp_bind_addr *, __u16 port);
 void sctp_bind_addr_free(struct sctp_bind_addr *);
-int sctp_bind_addr_copy(struct net *net, struct sctp_bind_addr *dest,
+int sctp_bind_addr_copy(struct sctp_bind_addr *dest,
                         const struct sctp_bind_addr *src,
                         sctp_scope_t scope, gfp_t gfp,
                         int flags);
@@ -1135,7 +1251,7 @@ int sctp_raw_to_bind_addrs(struct sctp_bind_addr *bp, __u8 *raw, int len,
                            __u16 port, gfp_t gfp);
 
 sctp_scope_t sctp_scope(const union sctp_addr *);
-int sctp_in_scope(struct net *net, const union sctp_addr *addr, const sctp_scope_t scope);
+int sctp_in_scope(const union sctp_addr *addr, const sctp_scope_t scope);
 int sctp_is_any(struct sock *sk, const union sctp_addr *addr);
 int sctp_addr_is_valid(const union sctp_addr *addr);
 int sctp_is_ep_boundall(struct sock *sk);
@@ -1293,13 +1409,13 @@ struct sctp_association *sctp_endpoint_lookup_assoc(
 int sctp_endpoint_is_peeled_off(struct sctp_endpoint *,
                                 const union sctp_addr *);
 struct sctp_endpoint *sctp_endpoint_is_match(struct sctp_endpoint *,
-                                        struct net *, const union sctp_addr *);
-int sctp_has_association(struct net *net, const union sctp_addr *laddr,
+                                        const union sctp_addr *);
+int sctp_has_association(const union sctp_addr *laddr,
                          const union sctp_addr *paddr);
 
-int sctp_verify_init(struct net *net, const struct sctp_association *asoc,
-                     sctp_cid_t, sctp_init_chunk_t *peer_init,
-                     struct sctp_chunk *chunk, struct sctp_chunk **err_chunk);
+int sctp_verify_init(const struct sctp_association *asoc, sctp_cid_t,
+                     sctp_init_chunk_t *peer_init, struct sctp_chunk *chunk,
+                     struct sctp_chunk **err_chunk);
 int sctp_process_init(struct sctp_association *, struct sctp_chunk *chunk,
                       const union sctp_addr *peer,
                       sctp_init_chunk_t *init, gfp_t gfp);
@@ -1314,40 +1430,6 @@ struct sctp_inithdr_host {
         __u32 initial_tsn;
 };
 
-/* SCTP_GET_ASSOC_STATS counters */
-struct sctp_priv_assoc_stats {
-        /* Maximum observed rto in the association during subsequent
-         * observations. Value is set to 0 if no RTO measurement took place
-         * The transport where the max_rto was observed is returned in
-         * obs_rto_ipaddr
-         */
-        struct sockaddr_storage obs_rto_ipaddr;
-        __u64 max_obs_rto;
-        /* Total In and Out SACKs received and sent */
-        __u64 isacks;
-        __u64 osacks;
-        /* Total In and Out packets received and sent */
-        __u64 opackets;
-        __u64 ipackets;
-        /* Total retransmitted chunks */
-        __u64 rtxchunks;
-        /* TSN received > next expected */
-        __u64 outofseqtsns;
-        /* Duplicate Chunks received */
-        __u64 idupchunks;
-        /* Gap Ack Blocks received */
-        __u64 gapcnt;
-        /* Unordered data chunks sent and received */
-        __u64 ouodchunks;
-        __u64 iuodchunks;
-        /* Ordered data chunks sent and received */
-        __u64 oodchunks;
-        __u64 iodchunks;
-        /* Control chunks sent and received */
-        __u64 octrlchunks;
-        __u64 ictrlchunks;
-};
-
 /* RFC2960
  *
  * 12. Recommended Transmission Control Block (TCB) Parameters
@@ -1501,7 +1583,6 @@ struct sctp_association {
                  */
                 __u8    sack_needed;     /* Do we need to sack the peer? */
                 __u32   sack_cnt;
-                __u32   sack_generation;
 
                 /* These are capabilities which our peer advertised.  */
                 __u8    ecn_capable:1,      /* Can peer do ECN? */
@@ -1578,12 +1659,6 @@ struct sctp_association {
          */
         int max_retrans;
 
-        /* This is the partially failed retrans value for the transport
-         * and will be initialized from the assocs value.  This can be
-         * changed using the SCTP_PEER_ADDR_THLDS socket option
-         */
-        int pf_retrans;
-
         /* Maximum number of times the endpoint will retransmit INIT  */
         __u16 max_init_attempts;
 
@@ -1844,7 +1919,6 @@ struct sctp_association {
         __u32 addip_serial;
         union sctp_addr *asconf_addr_del_pending;
         int src_out_of_asoc_ok;
-        struct sctp_transport *new_transport;
 
         /* SCTP AUTH: list of the endpoint shared keys.  These
          * keys are provided out of band by the user applicaton
@@ -1866,8 +1940,6 @@ struct sctp_association {
 
         __u8 need_ecne:1,       /* Need to send an ECNE Chunk? */
              temp:1;            /* Is it a temporary association? */
-
-        struct sctp_priv_assoc_stats stats;
 };
 
 
@@ -1917,7 +1989,6 @@ void sctp_assoc_control_transport(struct sctp_association *,
                                   sctp_transport_cmd_t, sctp_sn_error_t);
 struct sctp_transport *sctp_assoc_lookup_tsn(struct sctp_association *, __u32);
 struct sctp_transport *sctp_assoc_is_match(struct sctp_association *,
-                                           struct net *,
                                            const union sctp_addr *,
                                            const union sctp_addr *);
 void sctp_assoc_migrate(struct sctp_association *, struct sock *);
@@ -1926,9 +1997,9 @@ void sctp_assoc_update(struct sctp_association *old,
 
 __u32 sctp_association_get_next_tsn(struct sctp_association *);
 
-void sctp_assoc_sync_pmtu(struct sock *, struct sctp_association *);
-void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int);
-void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int);
+void sctp_assoc_sync_pmtu(struct sctp_association *);
+void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned);
+void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned);
 void sctp_assoc_set_primary(struct sctp_association *,
                             struct sctp_transport *);
 void sctp_assoc_del_nonprimary_peers(struct sctp_association *,
diff --git a/include/net/sctp/tsnmap.h b/include/net/sctp/tsnmap.h
index 2c5d2b4d5d1..e7728bc14cc 100644
--- a/include/net/sctp/tsnmap.h
+++ b/include/net/sctp/tsnmap.h
@@ -117,8 +117,7 @@ void sctp_tsnmap_free(struct sctp_tsnmap *map);
 int sctp_tsnmap_check(const struct sctp_tsnmap *, __u32 tsn);
 
 /* Mark this TSN as seen.  */
-int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn,
-                     struct sctp_transport *trans);
+int sctp_tsnmap_mark(struct sctp_tsnmap *, __u32 tsn);
 
 /* Mark this TSN and all lower as seen. */
 void sctp_tsnmap_skip(struct sctp_tsnmap *map, __u32 tsn);
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h
index ff1b8ba73ab..2e5ee0d8458 100644
--- a/include/net/sctp/ulpqueue.h
+++ b/include/net/sctp/ulpqueue.h
@@ -72,7 +72,7 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *, struct sctp_ulpevent *ev);
 void sctp_ulpq_renege(struct sctp_ulpq *, struct sctp_chunk *, gfp_t);
 
 /* Perform partial delivery. */
-void sctp_ulpq_partial_delivery(struct sctp_ulpq *, gfp_t);
+void sctp_ulpq_partial_delivery(struct sctp_ulpq *, struct sctp_chunk *, gfp_t);
 
 /* Abort the partial delivery. */
 void sctp_ulpq_abort_pd(struct sctp_ulpq *, gfp_t);
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 9a0ae091366..0842ef00b2f 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -93,7 +93,6 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_GET_ASSOC_NUMBER   28      /* Read only */
 #define SCTP_GET_ASSOC_ID_LIST  29      /* Read only */
 #define SCTP_AUTO_ASCONF       30
-#define SCTP_PEER_ADDR_THLDS    31
 
 /* Internal Socket Options. Some of the sctp library functions are
  * implemented using these socket options.
@@ -107,7 +106,6 @@ typedef __s32 sctp_assoc_t;
 #define SCTP_GET_LOCAL_ADDRS    109             /* Get all local address. */
 #define SCTP_SOCKOPT_CONNECTX   110             /* CONNECTX requests. */
 #define SCTP_SOCKOPT_CONNECTX3  111     /* CONNECTX requests (updated) */
-#define SCTP_GET_ASSOC_STATS    112     /* Read only */
 
 /*
  * 5.2.1 SCTP Initiation Structure (SCTP_INIT)
@@ -651,7 +649,6 @@ struct sctp_paddrinfo {
  */
 enum sctp_spinfo_state {
         SCTP_INACTIVE,
-        SCTP_PF,
         SCTP_ACTIVE,
         SCTP_UNCONFIRMED,
         SCTP_UNKNOWN = 0xffff  /* Value used for transport state unknown */
@@ -720,32 +717,6 @@ struct sctp_getaddrs {
         __u8                    addrs[0]; /*output, variable size*/
 };
 
-/* A socket user request obtained via SCTP_GET_ASSOC_STATS that retrieves
- * association stats. All stats are counts except sas_maxrto and
- * sas_obs_rto_ipaddr. maxrto is the max observed rto + transport since
- * the last call. Will return 0 when RTO was not update since last call
- */
-struct sctp_assoc_stats {
-        sctp_assoc_t    sas_assoc_id;    /* Input */
-                                         /* Transport of observed max RTO */
-        struct sockaddr_storage sas_obs_rto_ipaddr;
-        __u64           sas_maxrto;      /* Maximum Observed RTO for period */
-        __u64           sas_isacks;      /* SACKs received */
-        __u64           sas_osacks;      /* SACKs sent */
-        __u64           sas_opackets;    /* Packets sent */
-        __u64           sas_ipackets;    /* Packets received */
-        __u64           sas_rtxchunks;   /* Retransmitted Chunks */
-        __u64           sas_outofseqtsns;/* TSN received > next expected */
-        __u64           sas_idupchunks;  /* Dups received (ordered+unordered) */
-        __u64           sas_gapcnt;      /* Gap Acknowledgements Received */
-        __u64           sas_ouodchunks;  /* Unordered data chunks sent */
-        __u64           sas_iuodchunks;  /* Unordered data chunks received */
-        __u64           sas_oodchunks;   /* Ordered data chunks sent */
-        __u64           sas_iodchunks;   /* Ordered data chunks received */
-        __u64           sas_octrlchunks; /* Control chunks sent */
-        __u64           sas_ictrlchunks; /* Control chunks received */
-};
-
 /* These are bit fields for msghdr->msg_flags.  See section 5.1.  */
 /* On user space Linux, these live in <bits/socket.h> as an enum.  */
 enum sctp_msg_flags {
@@ -770,13 +741,4 @@ typedef struct {
         int sd;
 } sctp_peeloff_arg_t;
 
-/*
- *  Peer Address Thresholds socket option
- */
-struct sctp_paddrthlds {
-        sctp_assoc_t spt_assoc_id;
-        struct sockaddr_storage spt_address;
-        __u16 spt_pathmaxrxt;
-        __u16 spt_pathpfthld;
-};
 #endif /* __net_sctp_user_h__ */
diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h
index c2e542b27a5..d97f6892c01 100644
--- a/include/net/secure_seq.h
+++ b/include/net/secure_seq.h
@@ -10,7 +10,7 @@ extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
                                       __be16 dport);
 extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
                                         __be16 sport, __be16 dport);
-extern __u32 secure_tcpv6_sequence_number(const __be32 *saddr, const __be32 *daddr,
+extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
                                           __be16 sport, __be16 dport);
 extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
                                        __be16 sport, __be16 dport);
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 71596261fa9..8f0f9ac0307 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -67,7 +67,7 @@ struct icmp_mib {
 
 #define ICMPMSG_MIB_MAX __ICMPMSG_MIB_MAX
 struct icmpmsg_mib {
-        atomic_long_t   mibs[ICMPMSG_MIB_MAX];
+        unsigned long   mibs[ICMPMSG_MIB_MAX];
 };
 
 /* ICMP6 (IPv6-ICMP) */
@@ -84,7 +84,7 @@ struct icmpv6_mib_device {
 #define ICMP6MSG_MIB_MAX  __ICMP6MSG_MIB_MAX
 /* per network ns counters */
 struct icmpv6msg_mib {
-        atomic_long_t   mibs[ICMP6MSG_MIB_MAX];
+        unsigned long   mibs[ICMP6MSG_MIB_MAX];
 };
 /* per device counters, (shared on all cpus) */
 struct icmpv6msg_mib_device {
@@ -129,40 +129,38 @@ struct linux_xfrm_mib {
                         __this_cpu_inc(mib[0]->mibs[field])
 
 #define SNMP_INC_STATS_USER(mib, field) \
-                        this_cpu_inc(mib[0]->mibs[field])
+                        irqsafe_cpu_inc(mib[0]->mibs[field])
 
 #define SNMP_INC_STATS_ATOMIC_LONG(mib, field)  \
                         atomic_long_inc(&mib->mibs[field])
 
 #define SNMP_INC_STATS(mib, field)      \
-                        this_cpu_inc(mib[0]->mibs[field])
+                        irqsafe_cpu_inc(mib[0]->mibs[field])
 
 #define SNMP_DEC_STATS(mib, field)      \
-                        this_cpu_dec(mib[0]->mibs[field])
+                        irqsafe_cpu_dec(mib[0]->mibs[field])
 
 #define SNMP_ADD_STATS_BH(mib, field, addend)   \
                         __this_cpu_add(mib[0]->mibs[field], addend)
 
 #define SNMP_ADD_STATS_USER(mib, field, addend) \
-                        this_cpu_add(mib[0]->mibs[field], addend)
+                        irqsafe_cpu_add(mib[0]->mibs[field], addend)
 
 #define SNMP_ADD_STATS(mib, field, addend)      \
-                        this_cpu_add(mib[0]->mibs[field], addend)
+                        irqsafe_cpu_add(mib[0]->mibs[field], addend)
 /*
  * Use "__typeof__(*mib[0]) *ptr" instead of "__typeof__(mib[0]) ptr"
  * to make @ptr a non-percpu pointer.
  */
 #define SNMP_UPD_PO_STATS(mib, basefield, addend)       \
         do { \
-                __typeof__(*mib[0]->mibs) *ptr = mib[0]->mibs;  \
-                this_cpu_inc(ptr[basefield##PKTS]);             \
-                this_cpu_add(ptr[basefield##OCTETS], addend);   \
+                irqsafe_cpu_inc(mib[0]->mibs[basefield##PKTS]);         \
+                irqsafe_cpu_add(mib[0]->mibs[basefield##OCTETS], addend);       \
         } while (0)
 #define SNMP_UPD_PO_STATS_BH(mib, basefield, addend)    \
         do { \
-                __typeof__(*mib[0]->mibs) *ptr = mib[0]->mibs;  \
-                __this_cpu_inc(ptr[basefield##PKTS]);           \
-                __this_cpu_add(ptr[basefield##OCTETS], addend); \
+                __this_cpu_inc(mib[0]->mibs[basefield##PKTS]);          \
+                __this_cpu_add(mib[0]->mibs[basefield##OCTETS], addend);        \
         } while (0)
 
 
diff --git a/include/net/sock.h b/include/net/sock.h
index 182ca99405a..8e4062f165b 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -46,7 +46,7 @@
 #include <linux/list_nulls.h>
 #include <linux/timer.h>
 #include <linux/cache.h>
-#include <linux/bitops.h>
+#include <linux/module.h>
 #include <linux/lockdep.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>       /* struct sk_buff */
@@ -54,11 +54,6 @@
 #include <linux/security.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>
-#include <linux/memcontrol.h>
-#include <linux/res_counter.h>
-#include <linux/static_key.h>
-#include <linux/aio.h>
-#include <linux/sched.h>
 
 #include <linux/filter.h>
 #include <linux/rculist_nulls.h>
@@ -68,22 +63,6 @@
 #include <net/dst.h>
 #include <net/checksum.h>
 
-struct cgroup;
-struct cgroup_subsys;
-#ifdef CONFIG_NET
-int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss);
-void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg);
-#else
-static inline
-int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
-{
-        return 0;
-}
-static inline
-void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg)
-{
-}
-#endif
 /*
  * This structure really needs to be cleaned up.
  * Most of it is for TCP, and not used by any of
@@ -97,8 +76,8 @@ void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg)
                                         printk(KERN_DEBUG msg); } while (0)
 #else
 /* Validate arguments and do nothing */
-static inline __printf(2, 3)
-void SOCK_DEBUG(const struct sock *sk, const char *msg, ...)
+static inline void __attribute__ ((format (printf, 2, 3)))
+SOCK_DEBUG(struct sock *sk, const char *msg, ...)
 {
 }
 #endif
@@ -126,17 +105,12 @@ struct sock;
 struct proto;
 struct net;
 
-typedef __u32 __bitwise __portpair;
-typedef __u64 __bitwise __addrpair;
-
 /**
  *      struct sock_common - minimal network layer representation of sockets
  *      @skc_daddr: Foreign IPv4 addr
  *      @skc_rcv_saddr: Bound local IPv4 addr
  *      @skc_hash: hash value used with various protocol lookup tables
  *      @skc_u16hashes: two u16 hash values used by UDP lookup tables
- *      @skc_dport: placeholder for inet_dport/tw_dport
- *      @skc_num: placeholder for inet_num/tw_num
  *      @skc_family: network address family
  *      @skc_state: Connection state
  *      @skc_reuse: %SO_REUSEADDR setting
@@ -154,29 +128,16 @@ typedef __u64 __bitwise __addrpair;
  *      for struct sock and struct inet_timewait_sock.
  */
 struct sock_common {
-        /* skc_daddr and skc_rcv_saddr must be grouped on a 8 bytes aligned
-         * address on 64bit arches : cf INET_MATCH() and INET_TW_MATCH()
+        /* skc_daddr and skc_rcv_saddr must be grouped :
+         * cf INET_MATCH() and INET_TW_MATCH()
          */
-        union {
-                __addrpair      skc_addrpair;
-                struct {
-                        __be32  skc_daddr;
-                        __be32  skc_rcv_saddr;
-                };
-        };
+        __be32                  skc_daddr;
+        __be32                  skc_rcv_saddr;
+
         union  {
                 unsigned int    skc_hash;
                 __u16           skc_u16hashes[2];
         };
-        /* skc_dport && skc_num must be grouped as well */
-        union {
-                __portpair      skc_portpair;
-                struct {
-                        __be16  skc_dport;
-                        __u16   skc_num;
-                };
-        };
-
         unsigned short          skc_family;
         volatile unsigned char  skc_state;
         unsigned char           skc_reuse;
@@ -207,7 +168,6 @@ struct sock_common {
         /* public: */
 };
 
-struct cg_proto;
 /**
   *     struct sock - network layer representation of sockets
   *     @__sk_common: shared layout with inet_timewait_sock
@@ -216,7 +176,6 @@ struct cg_proto;
   *     @sk_lock:       synchronizer
   *     @sk_rcvbuf: size of receive buffer in bytes
   *     @sk_wq: sock wait queue and async head
-  *     @sk_rx_dst: receive input route used by early tcp demux
   *     @sk_dst_cache: destination cache
   *     @sk_dst_lock: destination cache lock
   *     @sk_policy: flow policy
@@ -231,12 +190,11 @@ struct cg_proto;
   *     @sk_sndbuf: size of send buffer in bytes
   *     @sk_flags: %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE,
   *                %SO_OOBINLINE settings, %SO_TIMESTAMPING settings
-  *     @sk_no_check: %SO_NO_CHECK setting, whether or not checkup packets
+  *     @sk_no_check: %SO_NO_CHECK setting, wether or not checkup packets
   *     @sk_route_caps: route capabilities (e.g. %NETIF_F_TSO)
   *     @sk_route_nocaps: forbidden route capabilities (e.g NETIF_F_GSO_MASK)
   *     @sk_gso_type: GSO type (e.g. %SKB_GSO_TCPV4)
   *     @sk_gso_max_size: Maximum GSO segment size to build
-  *     @sk_gso_max_segs: Maximum number of GSO segments
   *     @sk_lingertime: %SO_LINGER l_linger setting
   *     @sk_backlog: always used with the per-socket spinlock held
   *     @sk_callback_lock: used with the callbacks in the end of this struct
@@ -250,7 +208,6 @@ struct cg_proto;
   *     @sk_ack_backlog: current listen backlog
   *     @sk_max_ack_backlog: listen backlog set in listen()
   *     @sk_priority: %SO_PRIORITY setting
-  *     @sk_cgrp_prioidx: socket group's priority map index
   *     @sk_type: socket type (%SOCK_STREAM, etc)
   *     @sk_protocol: which protocol this socket belongs in this network family
   *     @sk_peer_pid: &struct pid for this socket's peer
@@ -265,13 +222,12 @@ struct cg_proto;
   *     @sk_stamp: time stamp of last packet received
   *     @sk_socket: Identd and reporting IO signals
   *     @sk_user_data: RPC layer private data
-  *     @sk_frag: cached page frag
-  *     @sk_peek_off: current peek_offset value
+  *     @sk_sndmsg_page: cached page for sendmsg
+  *     @sk_sndmsg_off: cached offset for sendmsg
   *     @sk_send_head: front of stuff to transmit
   *     @sk_security: used by security modules
   *     @sk_mark: generic packet mark
   *     @sk_classid: this socket's cgroup classid
-  *     @sk_cgrp: this socket's cgroup-specific proto data
   *     @sk_write_pending: a write to stream socket waits to start
   *     @sk_state_change: callback to indicate change in the state of the sock
   *     @sk_data_ready: callback to indicate there is data to be processed
@@ -336,7 +292,6 @@ struct sock {
         struct xfrm_policy      *sk_policy[2];
 #endif
         unsigned long           sk_flags;
-        struct dst_entry        *sk_rx_dst;
         struct dst_entry        *sk_dst_cache;
         spinlock_t              sk_dst_lock;
         atomic_t                sk_wmem_alloc;
@@ -352,11 +307,10 @@ struct sock {
         kmemcheck_bitfield_end(flags);
         int                     sk_wmem_queued;
         gfp_t                   sk_allocation;
-        netdev_features_t       sk_route_caps;
-        netdev_features_t       sk_route_nocaps;
+        int                     sk_route_caps;
+        int                     sk_route_nocaps;
         int                     sk_gso_type;
         unsigned int            sk_gso_max_size;
-        u16                     sk_gso_max_segs;
         int                     sk_rcvlowat;
         unsigned long           sk_lingertime;
         struct sk_buff_head     sk_error_queue;
@@ -367,9 +321,6 @@ struct sock {
         unsigned short          sk_ack_backlog;
         unsigned short          sk_max_ack_backlog;
         __u32                   sk_priority;
-#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
-        __u32                   sk_cgrp_prioidx;
-#endif
         struct pid              *sk_peer_pid;
         const struct cred       *sk_peer_cred;
         long                    sk_rcvtimeo;
@@ -379,61 +330,25 @@ struct sock {
         ktime_t                 sk_stamp;
         struct socket           *sk_socket;
         void                    *sk_user_data;
-        struct page_frag        sk_frag;
+        struct page             *sk_sndmsg_page;
         struct sk_buff          *sk_send_head;
-        __s32                   sk_peek_off;
+        __u32                   sk_sndmsg_off;
         int                     sk_write_pending;
 #ifdef CONFIG_SECURITY
         void                    *sk_security;
 #endif
         __u32                   sk_mark;
         u32                     sk_classid;
-        struct cg_proto         *sk_cgrp;
         void                    (*sk_state_change)(struct sock *sk);
         void                    (*sk_data_ready)(struct sock *sk, int bytes);
         void                    (*sk_write_space)(struct sock *sk);
         void                    (*sk_error_report)(struct sock *sk);
-        int                     (*sk_backlog_rcv)(struct sock *sk,
-                                                  struct sk_buff *skb);
+        int                     (*sk_backlog_rcv)(struct sock *sk,
+                                                  struct sk_buff *skb);  
         void                    (*sk_destruct)(struct sock *sk);
 };
 
 /*
- * SK_CAN_REUSE and SK_NO_REUSE on a socket mean that the socket is OK
- * or not whether his port will be reused by someone else. SK_FORCE_REUSE
- * on a socket means that the socket will reuse everybody else's port
- * without looking at the other's sk_reuse value.
- */
-
-#define SK_NO_REUSE     0
-#define SK_CAN_REUSE    1
-#define SK_FORCE_REUSE  2
-
-static inline int sk_peek_offset(struct sock *sk, int flags)
-{
-        if ((flags & MSG_PEEK) && (sk->sk_peek_off >= 0))
-                return sk->sk_peek_off;
-        else
-                return 0;
-}
-
-static inline void sk_peek_offset_bwd(struct sock *sk, int val)
-{
-        if (sk->sk_peek_off >= 0) {
-                if (sk->sk_peek_off >= val)
-                        sk->sk_peek_off -= val;
-                else
-                        sk->sk_peek_off = 0;
-        }
-}
-
-static inline void sk_peek_offset_fwd(struct sock *sk, int val)
-{
-        if (sk->sk_peek_off >= 0)
-                sk->sk_peek_off += val;
-}
-
-/*
  * Hashed lists helper routines
  */
 static inline struct sock *sk_entry(const struct hlist_node *node)
@@ -475,40 +390,40 @@ static inline struct sock *sk_nulls_next(const struct sock *sk)
                 NULL;
 }
 
-static inline bool sk_unhashed(const struct sock *sk)
+static inline int sk_unhashed(const struct sock *sk)
 {
         return hlist_unhashed(&sk->sk_node);
 }
 
-static inline bool sk_hashed(const struct sock *sk)
+static inline int sk_hashed(const struct sock *sk)
 {
         return !sk_unhashed(sk);
 }
 
-static inline void sk_node_init(struct hlist_node *node)
+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)
+static __inline__ void sk_nulls_node_init(struct hlist_nulls_node *node)
 {
         node->pprev = NULL;
 }
 
-static inline void __sk_del_node(struct sock *sk)
+static __inline__ void __sk_del_node(struct sock *sk)
 {
         __hlist_del(&sk->sk_node);
 }
 
 /* NB: equivalent to hlist_del_init_rcu */
-static inline bool __sk_del_node_init(struct sock *sk)
+static __inline__ int __sk_del_node_init(struct sock *sk)
 {
         if (sk_hashed(sk)) {
                 __sk_del_node(sk);
                 sk_node_init(&sk->sk_node);
-                return true;
+                return 1;
         }
-        return false;
+        return 0;
 }
 
 /* Grab socket reference count. This operation is valid only
@@ -530,9 +445,9 @@ static inline void __sock_put(struct sock *sk)
         atomic_dec(&sk->sk_refcnt);
 }
 
-static inline bool sk_del_node_init(struct sock *sk)
+static __inline__ int sk_del_node_init(struct sock *sk)
 {
-        bool rc = __sk_del_node_init(sk);
+        int rc = __sk_del_node_init(sk);
 
         if (rc) {
                 /* paranoid for a while -acme */
@@ -543,18 +458,18 @@ static inline bool sk_del_node_init(struct sock *sk)
 }
 #define sk_del_node_init_rcu(sk)        sk_del_node_init(sk)
 
-static inline bool __sk_nulls_del_node_init_rcu(struct sock *sk)
+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 true;
+                return 1;
         }
-        return false;
+        return 0;
 }
 
-static inline bool sk_nulls_del_node_init_rcu(struct sock *sk)
+static __inline__ int sk_nulls_del_node_init_rcu(struct sock *sk)
 {
-        bool rc = __sk_nulls_del_node_init_rcu(sk);
+        int rc = __sk_nulls_del_node_init_rcu(sk);
 
         if (rc) {
                 /* paranoid for a while -acme */
@@ -564,40 +479,40 @@ static inline bool sk_nulls_del_node_init_rcu(struct sock *sk)
         return rc;
 }
 
-static inline void __sk_add_node(struct sock *sk, struct hlist_head *list)
+static __inline__ void __sk_add_node(struct sock *sk, struct hlist_head *list)
 {
         hlist_add_head(&sk->sk_node, list);
 }
 
-static inline void sk_add_node(struct sock *sk, struct hlist_head *list)
+static __inline__ void sk_add_node(struct sock *sk, struct hlist_head *list)
 {
         sock_hold(sk);
         __sk_add_node(sk, list);
 }
 
-static inline void sk_add_node_rcu(struct sock *sk, struct hlist_head *list)
+static __inline__ void sk_add_node_rcu(struct sock *sk, struct hlist_head *list)
 {
         sock_hold(sk);
         hlist_add_head_rcu(&sk->sk_node, list);
 }
 
-static inline void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_head *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)
+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)
+static __inline__ void __sk_del_bind_node(struct sock *sk)
 {
         __hlist_del(&sk->sk_bind_node);
 }
 
-static inline void sk_add_bind_node(struct sock *sk,
+static __inline__ void sk_add_bind_node(struct sock *sk,
                                         struct hlist_head *list)
 {
         hlist_add_head(&sk->sk_bind_node, list);
@@ -622,15 +537,6 @@ static inline void sk_add_bind_node(struct sock *sk,
 #define sk_for_each_bound(__sk, node, list) \
         hlist_for_each_entry(__sk, node, list, sk_bind_node)
 
-static inline struct user_namespace *sk_user_ns(struct sock *sk)
-{
-        /* Careful only use this in a context where these parameters
-         * can not change and must all be valid, such as recvmsg from
-         * userspace.
-         */
-        return sk->sk_socket->file->f_cred->user_ns;
-}
-
 /* Sock flags */
 enum sock_flags {
         SOCK_DEAD,
@@ -648,7 +554,6 @@ enum sock_flags {
         SOCK_RCVTSTAMPNS, /* %SO_TIMESTAMPNS setting */
         SOCK_LOCALROUTE, /* route locally only, %SO_DONTROUTE setting */
         SOCK_QUEUE_SHRUNK, /* write queue has been shrunk recently */
-        SOCK_MEMALLOC, /* VM depends on this socket for swapping */
         SOCK_TIMESTAMPING_TX_HARDWARE,  /* %SOF_TIMESTAMPING_TX_HARDWARE */
         SOCK_TIMESTAMPING_TX_SOFTWARE,  /* %SOF_TIMESTAMPING_TX_SOFTWARE */
         SOCK_TIMESTAMPING_RX_HARDWARE,  /* %SOF_TIMESTAMPING_RX_HARDWARE */
@@ -659,11 +564,6 @@ enum sock_flags {
         SOCK_FASYNC, /* fasync() active */
         SOCK_RXQ_OVFL,
         SOCK_ZEROCOPY, /* buffers from userspace */
-        SOCK_WIFI_STATUS, /* push wifi status to userspace */
-        SOCK_NOFCS, /* Tell NIC not to do the Ethernet FCS.
-                     * Will use last 4 bytes of packet sent from
-                     * user-space instead.
-                     */
 };
 
 static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)
@@ -681,31 +581,11 @@ static inline void sock_reset_flag(struct sock *sk, enum sock_flags flag)
         __clear_bit(flag, &sk->sk_flags);
 }
 
-static inline bool sock_flag(const struct sock *sk, enum sock_flags flag)
+static inline int sock_flag(struct sock *sk, enum sock_flags flag)
 {
         return test_bit(flag, &sk->sk_flags);
 }
 
-#ifdef CONFIG_NET
-extern struct static_key memalloc_socks;
-static inline int sk_memalloc_socks(void)
-{
-        return static_key_false(&memalloc_socks);
-}
-#else
-
-static inline int sk_memalloc_socks(void)
-{
-        return 0;
-}
-
-#endif
-
-static inline gfp_t sk_gfp_atomic(struct sock *sk, gfp_t gfp_mask)
-{
-        return GFP_ATOMIC | (sk->sk_allocation & __GFP_MEMALLOC);
-}
-
 static inline void sk_acceptq_removed(struct sock *sk)
 {
         sk->sk_ack_backlog--;
@@ -716,7 +596,7 @@ static inline void sk_acceptq_added(struct sock *sk)
         sk->sk_ack_backlog++;
 }
 
-static inline bool sk_acceptq_is_full(const struct sock *sk)
+static inline int sk_acceptq_is_full(struct sock *sk)
 {
         return sk->sk_ack_backlog > sk->sk_max_ack_backlog;
 }
@@ -724,19 +604,19 @@ static inline bool sk_acceptq_is_full(const struct sock *sk)
 /*
  * Compute minimal free write space needed to queue new packets.
  */
-static inline int sk_stream_min_wspace(const struct sock *sk)
+static inline int sk_stream_min_wspace(struct sock *sk)
 {
         return sk->sk_wmem_queued >> 1;
 }
 
-static inline int sk_stream_wspace(const struct sock *sk)
+static inline int sk_stream_wspace(struct sock *sk)
 {
         return sk->sk_sndbuf - sk->sk_wmem_queued;
 }
 
 extern void sk_stream_write_space(struct sock *sk);
 
-static inline bool sk_stream_memory_free(const struct sock *sk)
+static inline int sk_stream_memory_free(struct sock *sk)
 {
         return sk->sk_wmem_queued < sk->sk_sndbuf;
 }
@@ -758,22 +638,18 @@ static inline void __sk_add_backlog(struct sock *sk, struct sk_buff *skb)
 
 /*
  * Take into account size of receive queue and backlog queue
- * Do not take into account this skb truesize,
- * to allow even a single big packet to come.
  */
-static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb,
-                                     unsigned int limit)
+static inline bool sk_rcvqueues_full(const struct sock *sk, const struct sk_buff *skb)
 {
         unsigned int qsize = sk->sk_backlog.len + atomic_read(&sk->sk_rmem_alloc);
 
-        return qsize > limit;
+        return qsize + skb->truesize > sk->sk_rcvbuf;
 }
 
 /* The per-socket spinlock must be held here. */
-static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb,
-                                              unsigned int limit)
+static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *skb)
 {
-        if (sk_rcvqueues_full(sk, skb, limit))
+        if (sk_rcvqueues_full(sk, skb))
                 return -ENOBUFS;
 
         __sk_add_backlog(sk, skb);
@@ -781,13 +657,8 @@ static inline __must_check int sk_add_backlog(struct sock *sk, struct sk_buff *s
         return 0;
 }
 
-extern int __sk_backlog_rcv(struct sock *sk, struct sk_buff *skb);
-
 static inline int sk_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 {
-        if (sk_memalloc_socks() && skb_pfmemalloc(skb))
-                return __sk_backlog_rcv(sk, skb);
-
         return sk->sk_backlog_rcv(sk, skb);
 }
 
@@ -815,25 +686,16 @@ static inline void sock_rps_reset_flow(const struct sock *sk)
 #endif
 }
 
-static inline void sock_rps_save_rxhash(struct sock *sk,
-                                        const struct sk_buff *skb)
+static inline void sock_rps_save_rxhash(struct sock *sk, u32 rxhash)
 {
 #ifdef CONFIG_RPS
-        if (unlikely(sk->sk_rxhash != skb->rxhash)) {
+        if (unlikely(sk->sk_rxhash != rxhash)) {
                 sock_rps_reset_flow(sk);
-                sk->sk_rxhash = skb->rxhash;
+                sk->sk_rxhash = rxhash;
         }
 #endif
 }
 
-static inline void sock_rps_reset_rxhash(struct sock *sk)
-{
-#ifdef CONFIG_RPS
-        sock_rps_reset_flow(sk);
-        sk->sk_rxhash = 0;
-#endif
-}
-
 #define sk_wait_event(__sk, __timeo, __condition)                       \
         ({      int __rc;                                               \
                 release_sock(__sk);                                     \
@@ -851,8 +713,6 @@ extern int sk_stream_wait_memory(struct sock *sk, long *timeo_p);
 extern void sk_stream_wait_close(struct sock *sk, long timeo_p);
 extern int sk_stream_error(struct sock *sk, int flags, int err);
 extern void sk_stream_kill_queues(struct sock *sk);
-extern void sk_set_memalloc(struct sock *sk);
-extern void sk_clear_memalloc(struct sock *sk);
 
 extern int sk_wait_data(struct sock *sk, long *timeo);
 
@@ -860,33 +720,32 @@ struct request_sock_ops;
 struct timewait_sock_ops;
 struct inet_hashinfo;
 struct raw_hashinfo;
-struct module;
 
 /* Networking protocol blocks we attach to sockets.
  * socket layer -> transport layer interface
  * transport -> network interface is defined by struct inet_proto
  */
 struct proto {
-        void                    (*close)(struct sock *sk,
+        void                    (*close)(struct sock *sk, 
                                         long timeout);
         int                     (*connect)(struct sock *sk,
-                                        struct sockaddr *uaddr,
+                                        struct sockaddr *uaddr, 
                                         int addr_len);
         int                     (*disconnect)(struct sock *sk, int flags);
 
-        struct sock *           (*accept)(struct sock *sk, int flags, int *err);
+        struct sock *           (*accept) (struct sock *sk, int flags, int *err);
 
         int                     (*ioctl)(struct sock *sk, int cmd,
                                          unsigned long arg);
         int                     (*init)(struct sock *sk);
         void                    (*destroy)(struct sock *sk);
         void                    (*shutdown)(struct sock *sk, int how);
-        int                     (*setsockopt)(struct sock *sk, int level,
+        int                     (*setsockopt)(struct sock *sk, int level, 
                                         int optname, char __user *optval,
                                         unsigned int optlen);
-        int                     (*getsockopt)(struct sock *sk, int level,
-                                        int optname, char __user *optval,
-                                        int __user *option);
+        int                     (*getsockopt)(struct sock *sk, int level, 
+                                        int optname, char __user *optval, 
+                                        int __user *option);     
 #ifdef CONFIG_COMPAT
         int                     (*compat_setsockopt)(struct sock *sk,
                                         int level,
@@ -903,19 +762,16 @@ struct proto {
                                            struct msghdr *msg, size_t len);
         int                     (*recvmsg)(struct kiocb *iocb, struct sock *sk,
                                            struct msghdr *msg,
-                                           size_t len, int noblock, int flags,
-                                           int *addr_len);
+                                        size_t len, int noblock, int flags, 
+                                        int *addr_len);
         int                     (*sendpage)(struct sock *sk, struct page *page,
                                         int offset, size_t size, int flags);
-        int                     (*bind)(struct sock *sk,
+        int                     (*bind)(struct sock *sk, 
                                         struct sockaddr *uaddr, int addr_len);
 
-        int                     (*backlog_rcv) (struct sock *sk,
+        int                     (*backlog_rcv) (struct sock *sk, 
                                                 struct sk_buff *skb);
 
-        void            (*release_cb)(struct sock *sk);
-        void            (*mtu_reduced)(struct sock *sk);
-
         /* Keeping track of sk's, looking them up, and port selection methods. */
         void                    (*hash)(struct sock *sk);
         void                    (*unhash)(struct sock *sk);
@@ -968,62 +824,11 @@ struct proto {
 #ifdef SOCK_REFCNT_DEBUG
         atomic_t                socks;
 #endif
-#ifdef CONFIG_MEMCG_KMEM
-        /*
-         * cgroup specific init/deinit functions. Called once for all
-         * protocols that implement it, from cgroups populate function.
-         * This function has to setup any files the protocol want to
-         * appear in the kmem cgroup filesystem.
-         */
-        int                     (*init_cgroup)(struct mem_cgroup *memcg,
-                                               struct cgroup_subsys *ss);
-        void                    (*destroy_cgroup)(struct mem_cgroup *memcg);
-        struct cg_proto         *(*proto_cgroup)(struct mem_cgroup *memcg);
-#endif
-};
-
-/*
- * Bits in struct cg_proto.flags
- */
-enum cg_proto_flags {
-        /* Currently active and new sockets should be assigned to cgroups */
-        MEMCG_SOCK_ACTIVE,
-        /* It was ever activated; we must disarm static keys on destruction */
-        MEMCG_SOCK_ACTIVATED,
-};
-
-struct cg_proto {
-        void                    (*enter_memory_pressure)(struct sock *sk);
-        struct res_counter      *memory_allocated;      /* Current allocated memory. */
-        struct percpu_counter   *sockets_allocated;     /* Current number of sockets. */
-        int                     *memory_pressure;
-        long                    *sysctl_mem;
-        unsigned long           flags;
-        /*
-         * memcg field is used to find which memcg we belong directly
-         * Each memcg struct can hold more than one cg_proto, so container_of
-         * won't really cut.
-         *
-         * The elegant solution would be having an inverse function to
-         * proto_cgroup in struct proto, but that means polluting the structure
-         * for everybody, instead of just for memcg users.
-         */
-        struct mem_cgroup       *memcg;
 };
 
 extern int proto_register(struct proto *prot, int alloc_slab);
 extern void proto_unregister(struct proto *prot);
 
-static inline bool memcg_proto_active(struct cg_proto *cg_proto)
-{
-        return test_bit(MEMCG_SOCK_ACTIVE, &cg_proto->flags);
-}
-
-static inline bool memcg_proto_activated(struct cg_proto *cg_proto)
-{
-        return test_bit(MEMCG_SOCK_ACTIVATED, &cg_proto->flags);
-}
-
 #ifdef SOCK_REFCNT_DEBUG
 static inline void sk_refcnt_debug_inc(struct sock *sk)
 {
@@ -1037,7 +842,7 @@ static inline void sk_refcnt_debug_dec(struct sock *sk)
                sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks));
 }
 
-inline void sk_refcnt_debug_release(const struct sock *sk)
+static inline void sk_refcnt_debug_release(const struct sock *sk)
 {
         if (atomic_read(&sk->sk_refcnt) != 1)
                 printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n",
@@ -1049,213 +854,13 @@ inline void sk_refcnt_debug_release(const struct sock *sk)
 #define sk_refcnt_debug_release(sk) do { } while (0)
 #endif /* SOCK_REFCNT_DEBUG */
 
-#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_NET)
-extern struct static_key memcg_socket_limit_enabled;
-static inline struct cg_proto *parent_cg_proto(struct proto *proto,
-                                               struct cg_proto *cg_proto)
-{
-        return proto->proto_cgroup(parent_mem_cgroup(cg_proto->memcg));
-}
-#define mem_cgroup_sockets_enabled static_key_false(&memcg_socket_limit_enabled)
-#else
-#define mem_cgroup_sockets_enabled 0
-static inline struct cg_proto *parent_cg_proto(struct proto *proto,
-                                               struct cg_proto *cg_proto)
-{
-        return NULL;
-}
-#endif
-
-
-static inline bool sk_has_memory_pressure(const struct sock *sk)
-{
-        return sk->sk_prot->memory_pressure != NULL;
-}
-
-static inline bool sk_under_memory_pressure(const struct sock *sk)
-{
-        if (!sk->sk_prot->memory_pressure)
-                return false;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                return !!*sk->sk_cgrp->memory_pressure;
-
-        return !!*sk->sk_prot->memory_pressure;
-}
-
-static inline void sk_leave_memory_pressure(struct sock *sk)
-{
-        int *memory_pressure = sk->sk_prot->memory_pressure;
-
-        if (!memory_pressure)
-                return;
-
-        if (*memory_pressure)
-                *memory_pressure = 0;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
-                struct cg_proto *cg_proto = sk->sk_cgrp;
-                struct proto *prot = sk->sk_prot;
-
-                for (; cg_proto; cg_proto = parent_cg_proto(prot, cg_proto))
-                        if (*cg_proto->memory_pressure)
-                                *cg_proto->memory_pressure = 0;
-        }
-
-}
-
-static inline void sk_enter_memory_pressure(struct sock *sk)
-{
-        if (!sk->sk_prot->enter_memory_pressure)
-                return;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
-                struct cg_proto *cg_proto = sk->sk_cgrp;
-                struct proto *prot = sk->sk_prot;
-
-                for (; cg_proto; cg_proto = parent_cg_proto(prot, cg_proto))
-                        cg_proto->enter_memory_pressure(sk);
-        }
-
-        sk->sk_prot->enter_memory_pressure(sk);
-}
-
-static inline long sk_prot_mem_limits(const struct sock *sk, int index)
-{
-        long *prot = sk->sk_prot->sysctl_mem;
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                prot = sk->sk_cgrp->sysctl_mem;
-        return prot[index];
-}
-
-static inline void memcg_memory_allocated_add(struct cg_proto *prot,
-                                              unsigned long amt,
-                                              int *parent_status)
-{
-        struct res_counter *fail;
-        int ret;
-
-        ret = res_counter_charge_nofail(prot->memory_allocated,
-                                        amt << PAGE_SHIFT, &fail);
-        if (ret < 0)
-                *parent_status = OVER_LIMIT;
-}
-
-static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
-                                              unsigned long amt)
-{
-        res_counter_uncharge(prot->memory_allocated, amt << PAGE_SHIFT);
-}
-
-static inline u64 memcg_memory_allocated_read(struct cg_proto *prot)
-{
-        u64 ret;
-        ret = res_counter_read_u64(prot->memory_allocated, RES_USAGE);
-        return ret >> PAGE_SHIFT;
-}
-
-static inline long
-sk_memory_allocated(const struct sock *sk)
-{
-        struct proto *prot = sk->sk_prot;
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                return memcg_memory_allocated_read(sk->sk_cgrp);
-
-        return atomic_long_read(prot->memory_allocated);
-}
-
-static inline long
-sk_memory_allocated_add(struct sock *sk, int amt, int *parent_status)
-{
-        struct proto *prot = sk->sk_prot;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
-                memcg_memory_allocated_add(sk->sk_cgrp, amt, parent_status);
-                /* update the root cgroup regardless */
-                atomic_long_add_return(amt, prot->memory_allocated);
-                return memcg_memory_allocated_read(sk->sk_cgrp);
-        }
-
-        return atomic_long_add_return(amt, prot->memory_allocated);
-}
-
-static inline void
-sk_memory_allocated_sub(struct sock *sk, int amt)
-{
-        struct proto *prot = sk->sk_prot;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                memcg_memory_allocated_sub(sk->sk_cgrp, amt);
-
-        atomic_long_sub(amt, prot->memory_allocated);
-}
-
-static inline void sk_sockets_allocated_dec(struct sock *sk)
-{
-        struct proto *prot = sk->sk_prot;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
-                struct cg_proto *cg_proto = sk->sk_cgrp;
-
-                for (; cg_proto; cg_proto = parent_cg_proto(prot, cg_proto))
-                        percpu_counter_dec(cg_proto->sockets_allocated);
-        }
-
-        percpu_counter_dec(prot->sockets_allocated);
-}
-
-static inline void sk_sockets_allocated_inc(struct sock *sk)
-{
-        struct proto *prot = sk->sk_prot;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
-                struct cg_proto *cg_proto = sk->sk_cgrp;
-
-                for (; cg_proto; cg_proto = parent_cg_proto(prot, cg_proto))
-                        percpu_counter_inc(cg_proto->sockets_allocated);
-        }
-
-        percpu_counter_inc(prot->sockets_allocated);
-}
-
-static inline int
-sk_sockets_allocated_read_positive(struct sock *sk)
-{
-        struct proto *prot = sk->sk_prot;
-
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                return percpu_counter_read_positive(sk->sk_cgrp->sockets_allocated);
-
-        return percpu_counter_read_positive(prot->sockets_allocated);
-}
-
-static inline int
-proto_sockets_allocated_sum_positive(struct proto *prot)
-{
-        return percpu_counter_sum_positive(prot->sockets_allocated);
-}
-
-static inline long
-proto_memory_allocated(struct proto *prot)
-{
-        return atomic_long_read(prot->memory_allocated);
-}
-
-static inline bool
-proto_memory_pressure(struct proto *prot)
-{
-        if (!prot->memory_pressure)
-                return false;
-        return !!*prot->memory_pressure;
-}
-
 
 #ifdef CONFIG_PROC_FS
 /* Called with local bh disabled */
 extern void sock_prot_inuse_add(struct net *net, struct proto *prot, int inc);
 extern int sock_prot_inuse_get(struct net *net, struct proto *proto);
 #else
-static inline void sock_prot_inuse_add(struct net *net, struct proto *prot,
+static void inline sock_prot_inuse_add(struct net *net, struct proto *prot,
                 int inc)
 {
 }
@@ -1342,28 +947,26 @@ static inline int sk_mem_pages(int amt)
         return (amt + SK_MEM_QUANTUM - 1) >> SK_MEM_QUANTUM_SHIFT;
 }
 
-static inline bool sk_has_account(struct sock *sk)
+static inline int sk_has_account(struct sock *sk)
 {
         /* return true if protocol supports memory accounting */
         return !!sk->sk_prot->memory_allocated;
 }
 
-static inline bool sk_wmem_schedule(struct sock *sk, int size)
+static inline int sk_wmem_schedule(struct sock *sk, int size)
 {
         if (!sk_has_account(sk))
-                return true;
+                return 1;
         return size <= sk->sk_forward_alloc ||
                 __sk_mem_schedule(sk, size, SK_MEM_SEND);
 }
 
-static inline bool
-sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)
+static inline int sk_rmem_schedule(struct sock *sk, int size)
 {
         if (!sk_has_account(sk))
-                return true;
-        return size<= sk->sk_forward_alloc ||
-                __sk_mem_schedule(sk, size, SK_MEM_RECV) ||
-                skb_pfmemalloc(skb);
+                return 1;
+        return size <= sk->sk_forward_alloc ||
+                __sk_mem_schedule(sk, size, SK_MEM_RECV);
 }
 
 static inline void sk_mem_reclaim(struct sock *sk)
@@ -1426,7 +1029,7 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb)
  * Mark both the sk_lock and the sk_lock.slock as a
  * per-address-family lock class.
  */
-#define sock_lock_init_class_and_name(sk, sname, skey, name, key)       \
+#define sock_lock_init_class_and_name(sk, sname, skey, name, key)       \
 do {                                                                    \
         sk->sk_lock.owned = 0;                                          \
         init_waitqueue_head(&sk->sk_lock.wq);                           \
@@ -1434,7 +1037,7 @@ do {									\
         debug_check_no_locks_freed((void *)&(sk)->sk_lock,              \
                         sizeof((sk)->sk_lock));                         \
         lockdep_set_class_and_name(&(sk)->sk_lock.slock,                \
-                                (skey), (sname));                               \
+                        (skey), (sname));                               \
         lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0);     \
 } while (0)
 
@@ -1477,8 +1080,8 @@ extern struct sock		*sk_alloc(struct net *net, int family,
                                           struct proto *prot);
 extern void                     sk_free(struct sock *sk);
 extern void                     sk_release_kernel(struct sock *sk);
-extern struct sock              *sk_clone_lock(const struct sock *sk,
-                                               const gfp_t priority);
+extern struct sock              *sk_clone(const struct sock *sk,
+                                          const gfp_t priority);
 
 extern struct sk_buff           *sock_wmalloc(struct sock *sk,
                                               unsigned long size, int force,
@@ -1488,20 +1091,19 @@ extern struct sk_buff		*sock_rmalloc(struct sock *sk,
                                               gfp_t priority);
 extern void                     sock_wfree(struct sk_buff *skb);
 extern void                     sock_rfree(struct sk_buff *skb);
-extern void                     sock_edemux(struct sk_buff *skb);
 
 extern int                      sock_setsockopt(struct socket *sock, int level,
                                                 int op, char __user *optval,
                                                 unsigned int optlen);
 
 extern int                      sock_getsockopt(struct socket *sock, int level,
-                                                int op, char __user *optval,
+                                                int op, char __user *optval, 
                                                 int __user *optlen);
-extern struct sk_buff           *sock_alloc_send_skb(struct sock *sk,
+extern struct sk_buff           *sock_alloc_send_skb(struct sock *sk,
                                                      unsigned long size,
                                                      int noblock,
                                                      int *errcode);
-extern struct sk_buff           *sock_alloc_send_pskb(struct sock *sk,
+extern struct sk_buff           *sock_alloc_send_pskb(struct sock *sk,
                                                       unsigned long header_len,
                                                       unsigned long data_len,
                                                       int noblock,
@@ -1511,11 +1113,19 @@ extern void *sock_kmalloc(struct sock *sk, int size,
 extern void sock_kfree_s(struct sock *sk, void *mem, int size);
 extern void sk_send_sigurg(struct sock *sk);
 
+#ifdef CONFIG_CGROUPS
+extern void sock_update_classid(struct sock *sk);
+#else
+static inline void sock_update_classid(struct sock *sk)
+{
+}
+#endif
+
 /*
  * Functions to fill in entries in struct proto_ops when a protocol
  * does not implement a particular function.
  */
-extern int                      sock_no_bind(struct socket *,
+extern int                      sock_no_bind(struct socket *, 
                                              struct sockaddr *, int);
 extern int                      sock_no_connect(struct socket *,
                                                 struct sockaddr *, int, int);
@@ -1544,7 +1154,7 @@ extern int			sock_no_mmap(struct file *file,
                                              struct vm_area_struct *vma);
 extern ssize_t                  sock_no_sendpage(struct socket *sock,
                                                 struct page *page,
-                                                int offset, size_t size,
+                                                int offset, size_t size, 
                                                 int flags);
 
 /*
@@ -1567,7 +1177,7 @@ extern void sk_common_release(struct sock *sk);
 /*
  *      Default socket callbacks and setup code
  */
-
+ 
 /* Initialise core socket variables */
 extern void sock_init_data(struct socket *sock, struct sock *sk);
 
@@ -1687,7 +1297,7 @@ static inline void sock_graft(struct sock *sk, struct socket *parent)
         write_unlock_bh(&sk->sk_callback_lock);
 }
 
-extern kuid_t sock_i_uid(struct sock *sk);
+extern int sock_i_uid(struct sock *sk);
 extern unsigned long sock_i_ino(struct sock *sk);
 
 static inline struct dst_entry *
@@ -1767,14 +1377,14 @@ extern struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie);
 
 extern struct dst_entry *sk_dst_check(struct sock *sk, u32 cookie);
 
-static inline bool sk_can_gso(const struct sock *sk)
+static inline int sk_can_gso(const struct sock *sk)
 {
         return net_gso_ok(sk->sk_route_caps, sk->sk_gso_type);
 }
 
 extern void sk_setup_caps(struct sock *sk, struct dst_entry *dst);
 
-static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
+static inline void sk_nocaps_add(struct sock *sk, int flags)
 {
         sk->sk_route_nocaps |= flags;
         sk->sk_route_caps &= ~flags;
@@ -1884,7 +1494,7 @@ static inline int sk_rmem_alloc_get(const struct sock *sk)
  *
  * Returns true if socket has write or read allocations
  */
-static inline bool sk_has_allocations(const struct sock *sk)
+static inline int sk_has_allocations(const struct sock *sk)
 {
         return sk_wmem_alloc_get(sk) || sk_rmem_alloc_get(sk);
 }
@@ -1923,7 +1533,9 @@ static inline bool sk_has_allocations(const struct sock *sk)
  */
 static inline bool wq_has_sleeper(struct socket_wq *wq)
 {
-        /* We need to be sure we are in sync with the
+
+        /*
+         * We need to be sure we are in sync with the
          * add_wait_queue modifications to the wait queue.
          *
          * This memory barrier is paired in the sock_poll_wait.
@@ -1943,23 +1555,24 @@ static inline bool wq_has_sleeper(struct socket_wq *wq)
 static inline void sock_poll_wait(struct file *filp,
                 wait_queue_head_t *wait_address, poll_table *p)
 {
-        if (!poll_does_not_wait(p) && wait_address) {
+        if (p && wait_address) {
                 poll_wait(filp, wait_address, p);
-                /* We need to be sure we are in sync with the
+                /*
+                 * We need to be sure we are in sync with the
                  * socket flags modification.
                  *
                  * This memory barrier is paired in the wq_has_sleeper.
-                 */
+                */
                 smp_mb();
         }
 }
 
 /*
- *      Queue a received datagram if it will fit. Stream and sequenced
+ *      Queue a received datagram if it will fit. Stream and sequenced
  *      protocols can't normally use this as they need to fit buffers in
  *      and play with them.
  *
- *      Inlined as it's very short and called for pretty much every
+ *      Inlined as it's very short and called for pretty much every
  *      packet ever received.
  */
 
@@ -1985,10 +1598,10 @@ static inline void skb_set_owner_r(struct sk_buff *skb, struct sock *sk)
         sk_mem_charge(sk, skb->truesize);
 }
 
-extern void sk_reset_timer(struct sock *sk, struct timer_list *timer,
+extern void sk_reset_timer(struct sock *sk, struct timer_list* timer,
                            unsigned long expires);
 
-extern void sk_stop_timer(struct sock *sk, struct timer_list *timer);
+extern void sk_stop_timer(struct sock *sk, struct timer_list* timer);
 
 extern int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 
@@ -1997,7 +1610,7 @@ extern int sock_queue_err_skb(struct sock *sk, struct sk_buff *skb);
 /*
  *      Recover an error report and clear atomically
  */
-
+ 
 static inline int sock_error(struct sock *sk)
 {
         int err;
@@ -2013,7 +1626,7 @@ static inline unsigned long sock_wspace(struct sock *sk)
 
         if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
                 amt = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
-                if (amt < 0)
+                if (amt < 0) 
                         amt = 0;
         }
         return amt;
@@ -2042,27 +1655,22 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
 
 struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
 
-/**
- * sk_page_frag - return an appropriate page_frag
- * @sk: socket
- *
- * If socket allocation mode allows current thread to sleep, it means its
- * safe to use the per task page_frag instead of the per socket one.
- */
-static inline struct page_frag *sk_page_frag(struct sock *sk)
+static inline struct page *sk_stream_alloc_page(struct sock *sk)
 {
-        if (sk->sk_allocation & __GFP_WAIT)
-                return &current->task_frag;
+        struct page *page = NULL;
 
-        return &sk->sk_frag;
+        page = alloc_pages(sk->sk_allocation, 0);
+        if (!page) {
+                sk->sk_prot->enter_memory_pressure(sk);
+                sk_stream_moderate_sndbuf(sk);
+        }
+        return page;
 }
 
-extern bool sk_page_frag_refill(struct sock *sk, struct page_frag *pfrag);
-
 /*
  *      Default write policy as shown to user space via poll/select/SIGIO
  */
-static inline bool sock_writeable(const struct sock *sk)
+static inline int sock_writeable(const struct sock *sk) 
 {
         return atomic_read(&sk->sk_wmem_alloc) < (sk->sk_sndbuf >> 1);
 }
@@ -2072,12 +1680,12 @@ static inline gfp_t gfp_any(void)
         return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;
 }
 
-static inline long sock_rcvtimeo(const struct sock *sk, bool noblock)
+static inline long sock_rcvtimeo(const struct sock *sk, int noblock)
 {
         return noblock ? 0 : sk->sk_rcvtimeo;
 }
 
-static inline long sock_sndtimeo(const struct sock *sk, bool noblock)
+static inline long sock_sndtimeo(const struct sock *sk, int noblock)
 {
         return noblock ? 0 : sk->sk_sndtimeo;
 }
@@ -2097,10 +1705,8 @@ static inline int sock_intr_errno(long timeo)
 
 extern void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
         struct sk_buff *skb);
-extern void __sock_recv_wifi_status(struct msghdr *msg, struct sock *sk,
-        struct sk_buff *skb);
 
-static inline void
+static __inline__ void
 sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
 {
         ktime_t kt = skb->tstamp;
@@ -2126,9 +1732,6 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
                 __sock_recv_timestamp(msg, sk, skb);
         else
                 sk->sk_stamp = kt;
-
-        if (sock_flag(sk, SOCK_WIFI_STATUS) && skb->wifi_acked_valid)
-                __sock_recv_wifi_status(msg, sk, skb);
 }
 
 extern void __sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
@@ -2141,7 +1744,7 @@ static inline void sock_recv_ts_and_drops(struct msghdr *msg, struct sock *sk,
                            (1UL << SOCK_RCVTSTAMP)                      | \
                            (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)       | \
                            (1UL << SOCK_TIMESTAMPING_SOFTWARE)          | \
-                           (1UL << SOCK_TIMESTAMPING_RAW_HARDWARE)      | \
+                           (1UL << SOCK_TIMESTAMPING_RAW_HARDWARE)      | \
                            (1UL << SOCK_TIMESTAMPING_SYS_HARDWARE))
 
         if (sk->sk_flags & FLAGS_TS_OR_DROPS)
@@ -2170,7 +1773,7 @@ extern int sock_tx_timestamp(struct sock *sk, __u8 *tx_flags);
  * locked so that the sk_buff queue operation is ok.
 */
 #ifdef CONFIG_NET_DMA
-static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, bool copied_early)
+static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)
 {
         __skb_unlink(skb, &sk->sk_receive_queue);
         if (!copied_early)
@@ -2179,7 +1782,7 @@ static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, bool copied_
                 __skb_queue_tail(&sk->sk_async_wait_queue, skb);
 }
 #else
-static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, bool copied_early)
+static inline void sk_eat_skb(struct sock *sk, struct sk_buff *skb, int copied_early)
 {
         __skb_unlink(skb, &sk->sk_receive_queue);
         __kfree_skb(skb);
@@ -2212,7 +1815,7 @@ static inline void sk_change_net(struct sock *sk, struct net *net)
 
 static inline struct sock *skb_steal_sock(struct sk_buff *skb)
 {
-        if (skb->sk) {
+        if (unlikely(skb->sk)) {
                 struct sock *sk = skb->sk;
 
                 skb->destructor = NULL;
@@ -2226,8 +1829,8 @@ extern void sock_enable_timestamp(struct sock *sk, int flag);
 extern int sock_get_timestamp(struct sock *, struct timeval __user *);
 extern int sock_get_timestampns(struct sock *, struct timespec __user *);
 
-/*
- *      Enable debug/info messages
+/* 
+ *      Enable debug/info messages 
  */
 extern int net_msg_warn;
 #define NETDEBUG(fmt, args...) \
@@ -2239,6 +1842,8 @@ extern int net_msg_warn;
 extern __u32 sysctl_wmem_max;
 extern __u32 sysctl_rmem_max;
 
+extern void sk_init(void);
+
 extern int sysctl_optmem_max;
 
 extern __u32 sysctl_wmem_default;
diff --git a/include/net/tcp.h b/include/net/tcp.h
index aed42c78515..4fcd77af405 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -18,11 +18,11 @@
 #ifndef _TCP_H
 #define _TCP_H
 
+#define TCP_DEBUG 1
 #define FASTRETRANS_DEBUG 1
 
 #include <linux/list.h>
 #include <linux/tcp.h>
-#include <linux/bug.h>
 #include <linux/slab.h>
 #include <linux/cache.h>
 #include <linux/percpu.h>
@@ -45,7 +45,6 @@
 #include <net/dst.h>
 
 #include <linux/seq_file.h>
-#include <linux/memcontrol.h>
 
 extern struct inet_hashinfo tcp_hashinfo;
 
@@ -98,21 +97,11 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
                                  * 15 is ~13-30min depending on RTO.
                                  */
 
-#define TCP_SYN_RETRIES  6      /* This is how many retries are done
-                                 * when active opening a connection.
-                                 * RFC1122 says the minimum retry MUST
-                                 * be at least 180secs.  Nevertheless
-                                 * this value is corresponding to
-                                 * 63secs of retransmission with the
-                                 * current initial RTO.
-                                 */
+#define TCP_SYN_RETRIES  5      /* number of times to retry active opening a
+                                 * connection: ~180sec is RFC minimum   */
 
-#define TCP_SYNACK_RETRIES 5    /* This is how may retries are done
-                                 * when passive opening a connection.
-                                 * This is corresponding to 31secs of
-                                 * retransmission with the current
-                                 * initial RTO.
-                                 */
+#define TCP_SYNACK_RETRIES 5    /* number of times to retry passive opening a
+                                 * connection: ~180sec is RFC minimum   */
 
 #define TCP_TIMEWAIT_LEN (60*HZ) /* how long to wait to destroy TIME-WAIT
                                   * state, about 60 seconds     */
@@ -133,7 +122,7 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #endif
 #define TCP_RTO_MAX     ((unsigned)(120*HZ))
 #define TCP_RTO_MIN     ((unsigned)(HZ/5))
-#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ))     /* RFC6298 2.1 initial RTO value        */
+#define TCP_TIMEOUT_INIT ((unsigned)(1*HZ))     /* RFC2988bis initial RTO value */
 #define TCP_TIMEOUT_FALLBACK ((unsigned)(3*HZ)) /* RFC 1122 initial RTO value, now
                                                  * used as a fallback RTO for the
                                                  * initial data transmission if no
@@ -180,11 +169,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOPT_TIMESTAMP        8       /* Better RTT estimations/PAWS */
 #define TCPOPT_MD5SIG           19      /* MD5 Signature (RFC2385) */
 #define TCPOPT_COOKIE           253     /* Cookie extension (experimental) */
-#define TCPOPT_EXP              254     /* Experimental */
-/* Magic number to be after the option value for sharing TCP
- * experimental options. See draft-ietf-tcpm-experimental-options-00.txt
- */
-#define TCPOPT_FASTOPEN_MAGIC   0xF989
 
 /*
  *     TCP option lengths
@@ -195,7 +179,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 #define TCPOLEN_SACK_PERM      2
 #define TCPOLEN_TIMESTAMP      10
 #define TCPOLEN_MD5SIG         18
-#define TCPOLEN_EXP_FASTOPEN_BASE  4
 #define TCPOLEN_COOKIE_BASE    2        /* Cookie-less header extension */
 #define TCPOLEN_COOKIE_PAIR    3        /* Cookie pair header extension */
 #define TCPOLEN_COOKIE_MIN     (TCPOLEN_COOKIE_BASE+TCP_COOKIE_MIN)
@@ -222,26 +205,6 @@ extern void tcp_time_wait(struct sock *sk, int state, int timeo);
 /* TCP initial congestion window as per draft-hkchu-tcpm-initcwnd-01 */
 #define TCP_INIT_CWND           10
 
-/* Bit Flags for sysctl_tcp_fastopen */
-#define TFO_CLIENT_ENABLE       1
-#define TFO_SERVER_ENABLE       2
-#define TFO_CLIENT_NO_COOKIE    4       /* Data in SYN w/o cookie option */
-
-/* Process SYN data but skip cookie validation */
-#define TFO_SERVER_COOKIE_NOT_CHKED     0x100
-/* Accept SYN data w/o any cookie option */
-#define TFO_SERVER_COOKIE_NOT_REQD      0x200
-
-/* Force enable TFO on all listeners, i.e., not requiring the
- * TCP_FASTOPEN socket option. SOCKOPT1/2 determine how to set max_qlen.
- */
-#define TFO_SERVER_WO_SOCKOPT1  0x400
-#define TFO_SERVER_WO_SOCKOPT2  0x800
-/* Always create TFO child sockets on a TFO listener even when
- * cookie/data not present. (For testing purpose!)
- */
-#define TFO_SERVER_ALWAYS       0x1000
-
 extern struct inet_timewait_death_row tcp_death_row;
 
 /* sysctl variables for tcp */
@@ -258,7 +221,6 @@ extern int sysctl_tcp_retries1;
 extern int sysctl_tcp_retries2;
 extern int sysctl_tcp_orphan_retries;
 extern int sysctl_tcp_syncookies;
-extern int sysctl_tcp_fastopen;
 extern int sysctl_tcp_retrans_collapse;
 extern int sysctl_tcp_stdurg;
 extern int sysctl_tcp_rfc1337;
@@ -268,6 +230,7 @@ extern int sysctl_tcp_fack;
 extern int sysctl_tcp_reordering;
 extern int sysctl_tcp_ecn;
 extern int sysctl_tcp_dsack;
+extern long sysctl_tcp_mem[3];
 extern int sysctl_tcp_wmem[3];
 extern int sysctl_tcp_rmem[3];
 extern int sysctl_tcp_app_win;
@@ -289,9 +252,6 @@ extern int sysctl_tcp_max_ssthresh;
 extern int sysctl_tcp_cookie_size;
 extern int sysctl_tcp_thin_linear_timeouts;
 extern int sysctl_tcp_thin_dupack;
-extern int sysctl_tcp_early_retrans;
-extern int sysctl_tcp_limit_output_bytes;
-extern int sysctl_tcp_challenge_ack_limit;
 
 extern atomic_long_t tcp_memory_allocated;
 extern struct percpu_counter tcp_sockets_allocated;
@@ -302,26 +262,18 @@ extern int tcp_memory_pressure;
  * and worry about wraparound (automatic with unsigned arithmetic).
  */
 
-static inline bool before(__u32 seq1, __u32 seq2)
+static inline int before(__u32 seq1, __u32 seq2)
 {
         return (__s32)(seq1-seq2) < 0;
 }
 #define after(seq2, seq1)       before(seq1, seq2)
 
 /* is s2<=s1<=s3 ? */
-static inline bool between(__u32 seq1, __u32 seq2, __u32 seq3)
+static inline int between(__u32 seq1, __u32 seq2, __u32 seq3)
 {
         return seq3 - seq2 >= seq1 - seq2;
 }
 
-static inline bool tcp_out_of_memory(struct sock *sk)
-{
-        if (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
-            sk_memory_allocated(sk) > sk_prot_mem_limits(sk, 2))
-                return true;
-        return false;
-}
-
 static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
 {
         struct percpu_counter *ocp = sk->sk_prot->orphan_count;
@@ -332,11 +284,13 @@ static inline bool tcp_too_many_orphans(struct sock *sk, int shift)
                 if (orphans << shift > sysctl_tcp_max_orphans)
                         return true;
         }
+
+        if (sk->sk_wmem_queued > SOCK_MIN_SNDBUF &&
+            atomic_long_read(&tcp_memory_allocated) > sysctl_tcp_mem[2])
+                return true;
         return false;
 }
 
-extern bool tcp_check_oom(struct sock *sk, int shift);
-
 /* syncookies: remember time of last synqueue overflow */
 static inline void tcp_synq_overflow(struct sock *sk)
 {
@@ -344,7 +298,7 @@ static inline void tcp_synq_overflow(struct sock *sk)
 }
 
 /* syncookies: no recent synqueue overflow on this listening socket? */
-static inline bool tcp_synq_no_recent_overflow(const struct sock *sk)
+static inline int tcp_synq_no_recent_overflow(const struct sock *sk)
 {
         unsigned long last_overflow = tcp_sk(sk)->rx_opt.ts_recent_stamp;
         return time_after(jiffies, last_overflow + TCP_TIMEOUT_FALLBACK);
@@ -358,30 +312,24 @@ extern struct proto tcp_prot;
 #define TCP_ADD_STATS_USER(net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)
 #define TCP_ADD_STATS(net, field, val)  SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val)
 
-extern void tcp_init_mem(struct net *net);
-
-extern void tcp_tasklet_init(void);
-
 extern void tcp_v4_err(struct sk_buff *skb, u32);
 
 extern void tcp_shutdown (struct sock *sk, int how);
 
-extern void tcp_v4_early_demux(struct sk_buff *skb);
 extern int tcp_v4_rcv(struct sk_buff *skb);
 
+extern struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it);
+extern void *tcp_v4_tw_get_peer(struct sock *sk);
 extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw);
 extern int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        size_t size);
 extern int tcp_sendpage(struct sock *sk, struct page *page, int offset,
                         size_t size, int flags);
-extern void tcp_release_cb(struct sock *sk);
-extern void tcp_write_timer_handler(struct sock *sk);
-extern void tcp_delack_timer_handler(struct sock *sk);
 extern int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg);
 extern int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
-                                 const struct tcphdr *th, unsigned int len);
+                                 struct tcphdr *th, unsigned len);
 extern int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
-                               const struct tcphdr *th, unsigned int len);
+                               struct tcphdr *th, unsigned len);
 extern void tcp_rcv_space_adjust(struct sock *sk);
 extern void tcp_cleanup_rbuf(struct sock *sk, int copied);
 extern int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp);
@@ -408,7 +356,13 @@ static inline void tcp_dec_quickack_mode(struct sock *sk,
 #define TCP_ECN_OK              1
 #define TCP_ECN_QUEUE_CWR       2
 #define TCP_ECN_DEMAND_CWR      4
-#define TCP_ECN_SEEN            8
+
+static __inline__ void
+TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th)
+{
+        if (sysctl_tcp_ecn && th->ece && th->cwr)
+                inet_rsk(req)->ecn_ok = 1;
+}
 
 enum tcp_tw_status {
         TCP_TW_SUCCESS = 0,
@@ -423,24 +377,15 @@ extern enum tcp_tw_status tcp_timewait_state_process(struct inet_timewait_sock *
                                                      const struct tcphdr *th);
 extern struct sock * tcp_check_req(struct sock *sk,struct sk_buff *skb,
                                    struct request_sock *req,
-                                   struct request_sock **prev,
-                                   bool fastopen);
+                                   struct request_sock **prev);
 extern int tcp_child_process(struct sock *parent, struct sock *child,
                              struct sk_buff *skb);
-extern bool tcp_use_frto(struct sock *sk);
+extern int tcp_use_frto(struct sock *sk);
 extern void tcp_enter_frto(struct sock *sk);
 extern void tcp_enter_loss(struct sock *sk, int how);
 extern void tcp_clear_retrans(struct tcp_sock *tp);
 extern void tcp_update_metrics(struct sock *sk);
-extern void tcp_init_metrics(struct sock *sk);
-extern void tcp_metrics_init(void);
-extern bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst, bool paws_check);
-extern bool tcp_remember_stamp(struct sock *sk);
-extern bool tcp_tw_remember_stamp(struct inet_timewait_sock *tw);
-extern void tcp_fetch_timewait_stamp(struct sock *sk, struct dst_entry *dst);
-extern void tcp_disable_fack(struct tcp_sock *tp);
 extern void tcp_close(struct sock *sk, long timeout);
-extern void tcp_init_sock(struct sock *sk);
 extern unsigned int tcp_poll(struct file * file, struct socket *sock,
                              struct poll_table_struct *wait);
 extern int tcp_getsockopt(struct sock *sk, int level, int optname,
@@ -455,10 +400,10 @@ extern void tcp_set_keepalive(struct sock *sk, int val);
 extern void tcp_syn_ack_timeout(struct sock *sk, struct request_sock *req);
 extern int tcp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                        size_t len, int nonblock, int flags, int *addr_len);
-extern void tcp_parse_options(const struct sk_buff *skb,
-                              struct tcp_options_received *opt_rx, const u8 **hvpp,
-                              int estab, struct tcp_fastopen_cookie *foc);
-extern const u8 *tcp_parse_md5sig_option(const struct tcphdr *th);
+extern void tcp_parse_options(struct sk_buff *skb,
+                              struct tcp_options_received *opt_rx, u8 **hvpp,
+                              int estab);
+extern u8 *tcp_parse_md5sig_option(struct tcphdr *th);
 
 /*
  *      TCP v4 functions exported for the inet6 API
@@ -478,14 +423,9 @@ extern int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr,
 extern int tcp_connect(struct sock *sk);
 extern struct sk_buff * tcp_make_synack(struct sock *sk, struct dst_entry *dst,
                                         struct request_sock *req,
-                                        struct request_values *rvp,
-                                        struct tcp_fastopen_cookie *foc);
+                                        struct request_values *rvp);
 extern int tcp_disconnect(struct sock *sk, int flags);
 
-void tcp_connect_init(struct sock *sk);
-void tcp_finish_connect(struct sock *sk, struct sk_buff *skb);
-int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size);
-void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb);
 
 /* From syncookies.c */
 extern __u32 syncookie_secret[2][16-4+SHA_DIGEST_WORDS];
@@ -509,7 +449,7 @@ extern bool cookie_check_timestamp(struct tcp_options_received *opt, bool *);
 /* From net/ipv6/syncookies.c */
 extern struct sock *cookie_v6_check(struct sock *sk, struct sk_buff *skb);
 #ifdef CONFIG_SYN_COOKIES
-extern __u32 cookie_v6_init_sequence(struct sock *sk, const struct sk_buff *skb,
+extern __u32 cookie_v6_init_sequence(struct sock *sk, struct sk_buff *skb,
                                      __u16 *mss);
 #else
 static inline __u32 cookie_v6_init_sequence(struct sock *sk,
@@ -523,8 +463,7 @@ static inline __u32 cookie_v6_init_sequence(struct sock *sk,
 
 extern void __tcp_push_pending_frames(struct sock *sk, unsigned int cur_mss,
                                       int nonagle);
-extern bool tcp_may_send_now(struct sock *sk);
-extern int __tcp_retransmit_skb(struct sock *, struct sk_buff *);
+extern int tcp_may_send_now(struct sock *sk);
 extern int tcp_retransmit_skb(struct sock *, struct sk_buff *);
 extern void tcp_retransmit_timer(struct sock *sk);
 extern void tcp_xmit_retransmit_queue(struct sock *);
@@ -538,18 +477,15 @@ extern int tcp_write_wakeup(struct sock *);
 extern void tcp_send_fin(struct sock *sk);
 extern void tcp_send_active_reset(struct sock *sk, gfp_t priority);
 extern int tcp_send_synack(struct sock *);
-extern bool tcp_syn_flood_action(struct sock *sk,
-                                 const struct sk_buff *skb,
-                                 const char *proto);
+extern int tcp_syn_flood_action(struct sock *sk,
+                                const struct sk_buff *skb,
+                                const char *proto);
 extern void tcp_push_one(struct sock *, unsigned int mss_now);
 extern void tcp_send_ack(struct sock *sk);
 extern void tcp_send_delayed_ack(struct sock *sk);
 
 /* tcp_input.c */
 extern void tcp_cwnd_application_limited(struct sock *sk);
-extern void tcp_resume_early_retransmit(struct sock *sk);
-extern void tcp_rearm_rto(struct sock *sk);
-extern void tcp_reset(struct sock *sk);
 
 /* tcp_timer.c */
 extern void tcp_init_xmit_timers(struct sock *);
@@ -585,7 +521,7 @@ static inline int tcp_bound_to_half_wnd(struct tcp_sock *tp, int pktsize)
 }
 
 /* tcp.c */
-extern void tcp_get_info(const struct sock *, struct tcp_info *);
+extern void tcp_get_info(struct sock *, struct tcp_info *);
 
 /* Read 'sendfile()'-style from a TCP socket */
 typedef int (*sk_read_actor_t)(read_descriptor_t *, struct sk_buff *,
@@ -599,7 +535,6 @@ extern int tcp_mtu_to_mss(struct sock *sk, int pmtu);
 extern int tcp_mss_to_mtu(struct sock *sk, int mss);
 extern void tcp_mtup_init(struct sock *sk);
 extern void tcp_valid_rtt_meas(struct sock *sk, u32 seq_rtt);
-extern void tcp_init_buffer_space(struct sock *sk);
 
 static inline void tcp_bound_rto(const struct sock *sk)
 {
@@ -612,8 +547,6 @@ static inline u32 __tcp_set_rto(const struct tcp_sock *tp)
         return (tp->srtt >> 3) + tp->rttvar;
 }
 
-extern void tcp_set_rto(struct sock *sk);
-
 static inline void __tcp_fast_path_on(struct tcp_sock *tp, u32 snd_wnd)
 {
         tp->pred_flags = htonl((tp->tcp_header_len << 26) |
@@ -640,7 +573,7 @@ static inline void tcp_fast_path_check(struct sock *sk)
 /* Compute the actual rto_min value */
 static inline u32 tcp_rto_min(struct sock *sk)
 {
-        const struct dst_entry *dst = __sk_dst_get(sk);
+        struct dst_entry *dst = __sk_dst_get(sk);
         u32 rto_min = TCP_RTO_MIN;
 
         if (dst && dst_metric_locked(dst, RTAX_RTO_MIN))
@@ -667,8 +600,6 @@ static inline u32 tcp_receive_window(const struct tcp_sock *tp)
  */
 extern u32 __tcp_select_window(struct sock *sk);
 
-void tcp_send_window_probe(struct sock *sk);
-
 /* TCP timestamps are only 32-bits, this causes a slight
  * complication on 64-bit systems since we store a snapshot
  * of jiffies in the buffer control blocks below.  We decided
@@ -697,46 +628,28 @@ void tcp_send_window_probe(struct sock *sk);
 struct tcp_skb_cb {
         union {
                 struct inet_skb_parm    h4;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
                 struct inet6_skb_parm   h6;
 #endif
         } header;       /* For incoming frames          */
         __u32           seq;            /* Starting sequence number     */
         __u32           end_seq;        /* SEQ + FIN + SYN + datalen    */
         __u32           when;           /* used to compute rtt's        */
-        __u8            tcp_flags;      /* TCP header flags. (tcp[13])  */
-
+        __u8            flags;          /* TCP header flags.            */
         __u8            sacked;         /* State flags for SACK/FACK.   */
 #define TCPCB_SACKED_ACKED      0x01    /* SKB ACK'd by a SACK block    */
 #define TCPCB_SACKED_RETRANS    0x02    /* SKB retransmitted            */
 #define TCPCB_LOST              0x04    /* SKB is lost                  */
 #define TCPCB_TAGBITS           0x07    /* All tag bits                 */
+
 #define TCPCB_EVER_RETRANS      0x80    /* Ever retransmitted frame     */
 #define TCPCB_RETRANS           (TCPCB_SACKED_RETRANS|TCPCB_EVER_RETRANS)
 
-        __u8            ip_dsfield;     /* IPv4 tos or IPv6 dsfield     */
-        /* 1 byte hole */
         __u32           ack_seq;        /* Sequence number ACK'd        */
 };
 
 #define TCP_SKB_CB(__skb)       ((struct tcp_skb_cb *)&((__skb)->cb[0]))
 
-/* RFC3168 : 6.1.1 SYN packets must not have ECT/ECN bits set
- *
- * If we receive a SYN packet with these bits set, it means a network is
- * playing bad games with TOS bits. In order to avoid possible false congestion
- * notifications, we disable TCP ECN negociation.
- */
-static inline void
-TCP_ECN_create_request(struct request_sock *req, const struct sk_buff *skb)
-{
-        const struct tcphdr *th = tcp_hdr(skb);
-
-        if (sysctl_tcp_ecn && th->ece && th->cwr &&
-            INET_ECN_is_not_ect(TCP_SKB_CB(skb)->ip_dsfield))
-                inet_rsk(req)->ecn_ok = 1;
-}
-
 /* Due to TSO, an SKB can be composed of multiple actual
  * packets.  To keep these tracked properly, we use this.
  */
@@ -852,34 +765,19 @@ static inline int tcp_is_sack(const struct tcp_sock *tp)
         return tp->rx_opt.sack_ok;
 }
 
-static inline bool tcp_is_reno(const struct tcp_sock *tp)
+static inline int tcp_is_reno(const struct tcp_sock *tp)
 {
         return !tcp_is_sack(tp);
 }
 
-static inline bool tcp_is_fack(const struct tcp_sock *tp)
+static inline int tcp_is_fack(const struct tcp_sock *tp)
 {
-        return tp->rx_opt.sack_ok & TCP_FACK_ENABLED;
+        return tp->rx_opt.sack_ok & 2;
 }
 
 static inline void tcp_enable_fack(struct tcp_sock *tp)
 {
-        tp->rx_opt.sack_ok |= TCP_FACK_ENABLED;
-}
-
-/* TCP early-retransmit (ER) is similar to but more conservative than
- * the thin-dupack feature.  Enable ER only if thin-dupack is disabled.
- */
-static inline void tcp_enable_early_retrans(struct tcp_sock *tp)
-{
-        tp->do_early_retrans = sysctl_tcp_early_retrans &&
-                !sysctl_tcp_thin_dupack && sysctl_tcp_reordering == 3;
-        tp->early_retrans_delayed = 0;
-}
-
-static inline void tcp_disable_early_retrans(struct tcp_sock *tp)
-{
-        tp->do_early_retrans = 0;
+        tp->rx_opt.sack_ok |= 2;
 }
 
 static inline unsigned int tcp_left_out(const struct tcp_sock *tp)
@@ -913,21 +811,14 @@ static inline bool tcp_in_initial_slowstart(const struct tcp_sock *tp)
         return tp->snd_ssthresh >= TCP_INFINITE_SSTHRESH;
 }
 
-static inline bool tcp_in_cwnd_reduction(const struct sock *sk)
-{
-        return (TCPF_CA_CWR | TCPF_CA_Recovery) &
-               (1 << inet_csk(sk)->icsk_ca_state);
-}
-
 /* If cwnd > ssthresh, we may raise ssthresh to be half-way to cwnd.
- * The exception is cwnd reduction phase, when cwnd is decreasing towards
+ * The exception is rate halving phase, when cwnd is decreasing towards
  * ssthresh.
  */
 static inline __u32 tcp_current_ssthresh(const struct sock *sk)
 {
         const struct tcp_sock *tp = tcp_sk(sk);
-
-        if (tcp_in_cwnd_reduction(sk))
+        if ((1 << inet_csk(sk)->icsk_ca_state) & (TCPF_CA_CWR | TCPF_CA_Recovery))
                 return tp->snd_ssthresh;
         else
                 return max(tp->snd_ssthresh,
@@ -939,15 +830,7 @@ static inline __u32 tcp_current_ssthresh(const struct sock *sk)
 #define tcp_verify_left_out(tp) WARN_ON(tcp_left_out(tp) > tp->packets_out)
 
 extern void tcp_enter_cwr(struct sock *sk, const int set_ssthresh);
-extern __u32 tcp_init_cwnd(const struct tcp_sock *tp, const struct dst_entry *dst);
-
-/* The maximum number of MSS of available cwnd for which TSO defers
- * sending if not using sysctl_tcp_tso_win_divisor.
- */
-static inline __u32 tcp_max_tso_deferred_mss(const struct tcp_sock *tp)
-{
-        return 3;
-}
+extern __u32 tcp_init_cwnd(struct tcp_sock *tp, struct dst_entry *dst);
 
 /* Slow start with delack produces 3 packets of burst, so that
  * it is safe "de facto".  This will be the default - same as
@@ -965,7 +848,7 @@ static inline u32 tcp_wnd_end(const struct tcp_sock *tp)
 {
         return tp->snd_una + tp->snd_wnd;
 }
-extern bool tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight);
+extern int tcp_is_cwnd_limited(const struct sock *sk, u32 in_flight);
 
 static inline void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss,
                                        const struct sk_buff *skb)
@@ -976,7 +859,7 @@ static inline void tcp_minshall_update(struct tcp_sock *tp, unsigned int mss,
 
 static inline void tcp_check_probe_timer(struct sock *sk)
 {
-        const struct tcp_sock *tp = tcp_sk(sk);
+        struct tcp_sock *tp = tcp_sk(sk);
         const struct inet_connection_sock *icsk = inet_csk(sk);
 
         if (!tp->packets_out && !icsk->icsk_pending)
@@ -1008,7 +891,7 @@ static inline __sum16 __tcp_checksum_complete(struct sk_buff *skb)
         return __skb_checksum_complete(skb);
 }
 
-static inline bool tcp_checksum_complete(struct sk_buff *skb)
+static inline int tcp_checksum_complete(struct sk_buff *skb)
 {
         return !skb_csum_unnecessary(skb) &&
                 __tcp_checksum_complete(skb);
@@ -1038,12 +921,12 @@ static inline void tcp_prequeue_init(struct tcp_sock *tp)
  *
  * NOTE: is this not too big to inline?
  */
-static inline bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
+static inline int tcp_prequeue(struct sock *sk, struct sk_buff *skb)
 {
         struct tcp_sock *tp = tcp_sk(sk);
 
         if (sysctl_tcp_low_latency || !tp->ucopy.task)
-                return false;
+                return 0;
 
         __skb_queue_tail(&tp->ucopy.prequeue, skb);
         tp->ucopy.memory += skb->truesize;
@@ -1067,7 +950,7 @@ static inline bool tcp_prequeue(struct sock *sk, struct sk_buff *skb)
                                                   (3 * tcp_rto_min(sk)) / 4,
                                                   TCP_RTO_MAX);
         }
-        return true;
+        return 1;
 }
 
 
@@ -1124,8 +1007,6 @@ static inline void tcp_openreq_init(struct request_sock *req,
         req->rcv_wnd = 0;               /* So that tcp_send_synack() knows! */
         req->cookie_ts = 0;
         tcp_rsk(req)->rcv_isn = TCP_SKB_CB(skb)->seq;
-        tcp_rsk(req)->rcv_nxt = TCP_SKB_CB(skb)->seq + 1;
-        tcp_rsk(req)->snt_synack = 0;
         req->mss = rx_opt->mss_clamp;
         req->ts_recent = rx_opt->saw_tstamp ? rx_opt->rcv_tsval : 0;
         ireq->tstamp_ok = rx_opt->tstamp_ok;
@@ -1138,15 +1019,6 @@ static inline void tcp_openreq_init(struct request_sock *req,
         ireq->loc_port = tcp_hdr(skb)->dest;
 }
 
-/* Compute time elapsed between SYNACK and the ACK completing 3WHS */
-static inline void tcp_synack_rtt_meas(struct sock *sk,
-                                       struct request_sock *req)
-{
-        if (tcp_rsk(req)->snt_synack)
-                tcp_valid_rtt_meas(sk,
-                    tcp_time_stamp - tcp_rsk(req)->snt_synack);
-}
-
 extern void tcp_enter_memory_pressure(struct sock *sk);
 
 static inline int keepalive_intvl_when(const struct tcp_sock *tp)
@@ -1183,28 +1055,28 @@ static inline int tcp_fin_time(const struct sock *sk)
         return fin_timeout;
 }
 
-static inline bool tcp_paws_check(const struct tcp_options_received *rx_opt,
-                                  int paws_win)
+static inline int tcp_paws_check(const struct tcp_options_received *rx_opt,
+                                 int paws_win)
 {
         if ((s32)(rx_opt->ts_recent - rx_opt->rcv_tsval) <= paws_win)
-                return true;
+                return 1;
         if (unlikely(get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_24DAYS))
-                return true;
+                return 1;
         /*
          * Some OSes send SYN and SYNACK messages with tsval=0 tsecr=0,
          * then following tcp messages have valid values. Ignore 0 value,
          * or else 'negative' tsval might forbid us to accept their packets.
          */
         if (!rx_opt->ts_recent)
-                return true;
-        return false;
+                return 1;
+        return 0;
 }
 
-static inline bool tcp_paws_reject(const struct tcp_options_received *rx_opt,
-                                   int rst)
+static inline int tcp_paws_reject(const struct tcp_options_received *rx_opt,
+                                  int rst)
 {
         if (tcp_paws_check(rx_opt, 0))
-                return false;
+                return 0;
 
         /* RST segments are not recommended to carry timestamp,
            and, if they do, it is recommended to ignore PAWS because
@@ -1219,8 +1091,8 @@ static inline bool tcp_paws_reject(const struct tcp_options_received *rx_opt,
            However, we can relax time bounds for RST segments to MSL.
          */
         if (rst && get_seconds() >= rx_opt->ts_recent_stamp + TCP_PAWS_MSL)
-                return false;
-        return true;
+                return 0;
+        return 1;
 }
 
 static inline void tcp_mib_init(struct net *net)
@@ -1248,27 +1120,35 @@ static inline void tcp_clear_all_retrans_hints(struct tcp_sock *tp)
 /* MD5 Signature */
 struct crypto_hash;
 
-union tcp_md5_addr {
-        struct in_addr  a4;
-#if IS_ENABLED(CONFIG_IPV6)
-        struct in6_addr a6;
-#endif
-};
-
 /* - key database */
 struct tcp_md5sig_key {
-        struct hlist_node       node;
+        u8                      *key;
         u8                      keylen;
-        u8                      family; /* AF_INET or AF_INET6 */
-        union tcp_md5_addr      addr;
-        u8                      key[TCP_MD5SIG_MAXKEYLEN];
-        struct rcu_head         rcu;
+};
+
+struct tcp4_md5sig_key {
+        struct tcp_md5sig_key   base;
+        __be32                  addr;
+};
+
+struct tcp6_md5sig_key {
+        struct tcp_md5sig_key   base;
+#if 0
+        u32                     scope_id;       /* XXX */
+#endif
+        struct in6_addr         addr;
 };
 
 /* - sock block */
 struct tcp_md5sig_info {
-        struct hlist_head       head;
-        struct rcu_head         rcu;
+        struct tcp4_md5sig_key  *keys4;
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
+        struct tcp6_md5sig_key  *keys6;
+        u32                     entries6;
+        u32                     alloced6;
+#endif
+        u32                     entries4;
+        u32                     alloced4;
 };
 
 /* - pseudo header */
@@ -1289,7 +1169,7 @@ struct tcp6_pseudohdr {
 
 union tcp_md5sum_block {
         struct tcp4_pseudohdr ip4;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct tcp6_pseudohdr ip6;
 #endif
 };
@@ -1302,70 +1182,35 @@ struct tcp_md5sig_pool {
 
 /* - functions */
 extern int tcp_v4_md5_hash_skb(char *md5_hash, struct tcp_md5sig_key *key,
-                               const struct sock *sk,
-                               const struct request_sock *req,
-                               const struct sk_buff *skb);
-extern int tcp_md5_do_add(struct sock *sk, const union tcp_md5_addr *addr,
-                          int family, const u8 *newkey,
-                          u8 newkeylen, gfp_t gfp);
-extern int tcp_md5_do_del(struct sock *sk, const union tcp_md5_addr *addr,
-                          int family);
-extern struct tcp_md5sig_key *tcp_v4_md5_lookup(struct sock *sk,
-                                         struct sock *addr_sk);
+                               struct sock *sk, struct request_sock *req,
+                               struct sk_buff *skb);
+extern struct tcp_md5sig_key * tcp_v4_md5_lookup(struct sock *sk,
+                                                 struct sock *addr_sk);
+extern int tcp_v4_md5_do_add(struct sock *sk, __be32 addr, u8 *newkey,
+                             u8 newkeylen);
+extern int tcp_v4_md5_do_del(struct sock *sk, __be32 addr);
 
 #ifdef CONFIG_TCP_MD5SIG
-extern struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
-                        const union tcp_md5_addr *addr, int family);
-#define tcp_twsk_md5_key(twsk)  ((twsk)->tw_md5_key)
+#define tcp_twsk_md5_key(twsk)  ((twsk)->tw_md5_keylen ?                 \
+                                 &(struct tcp_md5sig_key) {              \
+                                        .key = (twsk)->tw_md5_key,       \
+                                        .keylen = (twsk)->tw_md5_keylen, \
+                                } : NULL)
 #else
-static inline struct tcp_md5sig_key *tcp_md5_do_lookup(struct sock *sk,
-                                         const union tcp_md5_addr *addr,
-                                         int family)
-{
-        return NULL;
-}
 #define tcp_twsk_md5_key(twsk)  NULL
 #endif
 
-extern struct tcp_md5sig_pool __percpu *tcp_alloc_md5sig_pool(struct sock *);
+extern struct tcp_md5sig_pool * __percpu *tcp_alloc_md5sig_pool(struct sock *);
 extern void tcp_free_md5sig_pool(void);
 
 extern struct tcp_md5sig_pool   *tcp_get_md5sig_pool(void);
 extern void tcp_put_md5sig_pool(void);
 
-extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, const struct tcphdr *);
-extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, const struct sk_buff *,
-                                 unsigned int header_len);
+extern int tcp_md5_hash_header(struct tcp_md5sig_pool *, struct tcphdr *);
+extern int tcp_md5_hash_skb_data(struct tcp_md5sig_pool *, struct sk_buff *,
+                                 unsigned header_len);
 extern int tcp_md5_hash_key(struct tcp_md5sig_pool *hp,
-                            const struct tcp_md5sig_key *key);
-
-/* From tcp_fastopen.c */
-extern void tcp_fastopen_cache_get(struct sock *sk, u16 *mss,
-                                   struct tcp_fastopen_cookie *cookie,
-                                   int *syn_loss, unsigned long *last_syn_loss);
-extern void tcp_fastopen_cache_set(struct sock *sk, u16 mss,
-                                   struct tcp_fastopen_cookie *cookie,
-                                   bool syn_lost);
-struct tcp_fastopen_request {
-        /* Fast Open cookie. Size 0 means a cookie request */
-        struct tcp_fastopen_cookie      cookie;
-        struct msghdr                   *data;  /* data in MSG_FASTOPEN */
-        u16                             copied; /* queued in tcp_connect() */
-};
-void tcp_free_fastopen_req(struct tcp_sock *tp);
-
-extern struct tcp_fastopen_context __rcu *tcp_fastopen_ctx;
-int tcp_fastopen_reset_cipher(void *key, unsigned int len);
-void tcp_fastopen_cookie_gen(__be32 addr, struct tcp_fastopen_cookie *foc);
-
-#define TCP_FASTOPEN_KEY_LENGTH 16
-
-/* Fastopen key context */
-struct tcp_fastopen_context {
-        struct crypto_cipher __rcu      *tfm;
-        __u8                            key[TCP_FASTOPEN_KEY_LENGTH];
-        struct rcu_head                 rcu;
-};
+                            struct tcp_md5sig_key *key);
 
 /* write queue abstraction */
 static inline void tcp_write_queue_purge(struct sock *sk)
@@ -1378,24 +1223,22 @@ static inline void tcp_write_queue_purge(struct sock *sk)
         tcp_clear_all_retrans_hints(tcp_sk(sk));
 }
 
-static inline struct sk_buff *tcp_write_queue_head(const struct sock *sk)
+static inline struct sk_buff *tcp_write_queue_head(struct sock *sk)
 {
         return skb_peek(&sk->sk_write_queue);
 }
 
-static inline struct sk_buff *tcp_write_queue_tail(const struct sock *sk)
+static inline struct sk_buff *tcp_write_queue_tail(struct sock *sk)
 {
         return skb_peek_tail(&sk->sk_write_queue);
 }
 
-static inline struct sk_buff *tcp_write_queue_next(const struct sock *sk,
-                                                   const struct sk_buff *skb)
+static inline struct sk_buff *tcp_write_queue_next(struct sock *sk, struct sk_buff *skb)
 {
         return skb_queue_next(&sk->sk_write_queue, skb);
 }
 
-static inline struct sk_buff *tcp_write_queue_prev(const struct sock *sk,
-                                                   const struct sk_buff *skb)
+static inline struct sk_buff *tcp_write_queue_prev(struct sock *sk, struct sk_buff *skb)
 {
         return skb_queue_prev(&sk->sk_write_queue, skb);
 }
@@ -1409,7 +1252,7 @@ static inline struct sk_buff *tcp_write_queue_prev(const struct sock *sk,
 #define tcp_for_write_queue_from_safe(skb, tmp, sk)                     \
         skb_queue_walk_from_safe(&(sk)->sk_write_queue, skb, tmp)
 
-static inline struct sk_buff *tcp_send_head(const struct sock *sk)
+static inline struct sk_buff *tcp_send_head(struct sock *sk)
 {
         return sk->sk_send_head;
 }
@@ -1420,7 +1263,7 @@ static inline bool tcp_skb_is_last(const struct sock *sk,
         return skb_queue_is_last(&sk->sk_write_queue, skb);
 }
 
-static inline void tcp_advance_send_head(struct sock *sk, const struct sk_buff *skb)
+static inline void tcp_advance_send_head(struct sock *sk, struct sk_buff *skb)
 {
         if (tcp_skb_is_last(sk, skb))
                 sk->sk_send_head = NULL;
@@ -1486,7 +1329,7 @@ static inline void tcp_unlink_write_queue(struct sk_buff *skb, struct sock *sk)
         __skb_unlink(skb, &sk->sk_write_queue);
 }
 
-static inline bool tcp_write_queue_empty(struct sock *sk)
+static inline int tcp_write_queue_empty(struct sock *sk)
 {
         return skb_queue_empty(&sk->sk_write_queue);
 }
@@ -1500,9 +1343,8 @@ static inline void tcp_push_pending_frames(struct sock *sk)
         }
 }
 
-/* Start sequence of the skb just after the highest skb with SACKed
- * bit, valid only if sacked_out > 0 or when the caller has ensured
- * validity by itself.
+/* Start sequence of the highest skb with SACKed bit, valid only if
+ * sacked > 0 or when the caller has ensured validity by itself.
  */
 static inline u32 tcp_highest_sack_seq(struct tcp_sock *tp)
 {
@@ -1543,7 +1385,7 @@ static inline void tcp_highest_sack_combine(struct sock *sk,
 /* Determines whether this is a thin stream (which may suffer from
  * increased latency). Used to trigger latency-reducing mechanisms.
  */
-static inline bool tcp_stream_is_thin(struct tcp_sock *tp)
+static inline unsigned int tcp_stream_is_thin(struct tcp_sock *tp)
 {
         return tp->packets_out < 4 && !tcp_in_initial_slowstart(tp);
 }
@@ -1556,13 +1398,11 @@ enum tcp_seq_states {
         TCP_SEQ_STATE_TIME_WAIT,
 };
 
-int tcp_seq_open(struct inode *inode, struct file *file);
-
 struct tcp_seq_afinfo {
-        char                            *name;
-        sa_family_t                     family;
-        const struct file_operations    *seq_fops;
-        struct seq_operations           seq_ops;
+        char                    *name;
+        sa_family_t             family;
+        struct file_operations  seq_fops;
+        struct seq_operations   seq_ops;
 };
 
 struct tcp_iter_state {
@@ -1570,8 +1410,7 @@ struct tcp_iter_state {
         sa_family_t             family;
         enum tcp_seq_states     state;
         struct sock             *syn_wait_sk;
-        int                     bucket, offset, sbucket, num;
-        kuid_t                  uid;
+        int                     bucket, offset, sbucket, num, uid;
         loff_t                  last_pos;
 };
 
@@ -1584,8 +1423,7 @@ extern struct request_sock_ops tcp6_request_sock_ops;
 extern void tcp_v4_destroy_sock(struct sock *sk);
 
 extern int tcp_v4_gso_send_check(struct sk_buff *skb);
-extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb,
-                                       netdev_features_t features);
+extern struct sk_buff *tcp_tso_segment(struct sk_buff *skb, u32 features);
 extern struct sk_buff **tcp_gro_receive(struct sk_buff **head,
                                         struct sk_buff *skb);
 extern struct sk_buff **tcp4_gro_receive(struct sk_buff **head,
@@ -1593,6 +1431,8 @@ extern struct sk_buff **tcp4_gro_receive(struct sk_buff **head,
 extern int tcp_gro_complete(struct sk_buff *skb);
 extern int tcp4_gro_complete(struct sk_buff *skb);
 
+extern int tcp_nuke_addr(struct net *net, struct sockaddr *addr);
+
 #ifdef CONFIG_PROC_FS
 extern int tcp4_proc_init(void);
 extern void tcp4_proc_exit(void);
@@ -1605,9 +1445,13 @@ struct tcp_sock_af_ops {
                                                 struct sock *addr_sk);
         int                     (*calc_md5_hash) (char *location,
                                                   struct tcp_md5sig_key *md5,
-                                                  const struct sock *sk,
-                                                  const struct request_sock *req,
-                                                  const struct sk_buff *skb);
+                                                  struct sock *sk,
+                                                  struct request_sock *req,
+                                                  struct sk_buff *skb);
+        int                     (*md5_add) (struct sock *sk,
+                                            struct sock *addr_sk,
+                                            u8 *newkey,
+                                            u8 len);
         int                     (*md5_parse) (struct sock *sk,
                                               char __user *optval,
                                               int optlen);
@@ -1620,9 +1464,9 @@ struct tcp_request_sock_ops {
                                                 struct request_sock *req);
         int                     (*calc_md5_hash) (char *location,
                                                   struct tcp_md5sig_key *md5,
-                                                  const struct sock *sk,
-                                                  const struct request_sock *req,
-                                                  const struct sk_buff *skb);
+                                                  struct sock *sk,
+                                                  struct request_sock *req,
+                                                  struct sk_buff *skb);
 #endif
 };
 
diff --git a/include/net/tcp_memcontrol.h b/include/net/tcp_memcontrol.h
deleted file mode 100644
index 7df18bc43a9..00000000000
--- a/include/net/tcp_memcontrol.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _TCP_MEMCG_H
-#define _TCP_MEMCG_H
-
-struct tcp_memcontrol {
-        struct cg_proto cg_proto;
-        /* per-cgroup tcp memory pressure knobs */
-        struct res_counter tcp_memory_allocated;
-        struct percpu_counter tcp_sockets_allocated;
-        /* those two are read-mostly, leave them at the end */
-        long tcp_prot_mem[3];
-        int tcp_memory_pressure;
-};
-
-struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg);
-int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss);
-void tcp_destroy_cgroup(struct mem_cgroup *memcg);
-unsigned long long tcp_max_memory(const struct mem_cgroup *memcg);
-void tcp_prot_mem(struct mem_cgroup *memcg, long val, int idx);
-#endif /* _TCP_MEMCG_H */
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h
index 68f0ecad6c6..053b3cf2c66 100644
--- a/include/net/timewait_sock.h
+++ b/include/net/timewait_sock.h
@@ -12,7 +12,6 @@
 #define _TIMEWAIT_SOCK_H
 
 #include <linux/slab.h>
-#include <linux/bug.h>
 #include <net/sock.h>
 
 struct timewait_sock_ops {
@@ -22,6 +21,7 @@ struct timewait_sock_ops {
         int             (*twsk_unique)(struct sock *sk,
                                        struct sock *sktw, void *twp);
         void            (*twsk_destructor)(struct sock *sk);
+        void            *(*twsk_getpeer)(struct sock *sk);
 };
 
 static inline int twsk_unique(struct sock *sk, struct sock *sktw, void *twp)
@@ -40,4 +40,11 @@ static inline void twsk_destructor(struct sock *sk)
                 sk->sk_prot->twsk_prot->twsk_destructor(sk);
 }
 
+static inline void *twsk_getpeer(struct sock *sk)
+{
+        if (sk->sk_prot->twsk_prot->twsk_getpeer)
+                return sk->sk_prot->twsk_prot->twsk_getpeer(sk);
+        return NULL;
+}
+
 #endif /* _TIMEWAIT_SOCK_H */
diff --git a/include/net/udp.h b/include/net/udp.h
index 065f379c650..67ea6fcb3ec 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -23,7 +23,6 @@
 #define _UDP_H
 
 #include <linux/list.h>
-#include <linux/bug.h>
 #include <net/inet_sock.h>
 #include <net/sock.h>
 #include <net/snmp.h>
@@ -42,7 +41,7 @@
 struct udp_skb_cb {
         union {
                 struct inet_skb_parm    h4;
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
                 struct inet6_skb_parm   h6;
 #endif
         } header;
@@ -81,7 +80,7 @@ struct udp_table {
 extern struct udp_table udp_table;
 extern void udp_table_init(struct udp_table *, const char *);
 static inline struct udp_hslot *udp_hashslot(struct udp_table *table,
-                                             struct net *net, unsigned int num)
+                                             struct net *net, unsigned num)
 {
         return &table->hash[udp_hashfn(net, num, table->mask)];
 }
@@ -195,15 +194,9 @@ extern int udp_lib_setsockopt(struct sock *sk, int level, int optname,
 extern struct sock *udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
                                     __be32 daddr, __be16 dport,
                                     int dif);
-extern struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, __be16 sport,
-                                    __be32 daddr, __be16 dport,
-                                    int dif, struct udp_table *tbl);
 extern struct sock *udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,
                                     const struct in6_addr *daddr, __be16 dport,
                                     int dif);
-extern struct sock *__udp6_lib_lookup(struct net *net, const struct in6_addr *saddr, __be16 sport,
-                                    const struct in6_addr *daddr, __be16 dport,
-                                    int dif, struct udp_table *tbl);
 
 /*
  *      SNMP statistics for UDP and UDP-Lite
@@ -224,7 +217,7 @@ extern struct sock *__udp6_lib_lookup(struct net *net, const struct in6_addr *sa
         else        SNMP_INC_STATS_USER((net)->mib.udp_stats_in6, field);      \
 } while(0)
 
-#if IS_ENABLED(CONFIG_IPV6)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
 #define UDPX_INC_STATS_BH(sk, field) \
         do { \
                 if ((sk)->sk_family == AF_INET) \
@@ -237,14 +230,12 @@ extern struct sock *__udp6_lib_lookup(struct net *net, const struct in6_addr *sa
 #endif
 
 /* /proc */
-int udp_seq_open(struct inode *inode, struct file *file);
-
 struct udp_seq_afinfo {
-        char                            *name;
-        sa_family_t                     family;
-        struct udp_table                *udp_table;
-        const struct file_operations    *seq_fops;
-        struct seq_operations           seq_ops;
+        char                    *name;
+        sa_family_t             family;
+        struct udp_table        *udp_table;
+        struct file_operations  seq_fops;
+        struct seq_operations   seq_ops;
 };
 
 struct udp_iter_state {
@@ -265,10 +256,5 @@ extern void udp4_proc_exit(void);
 extern void udp_init(void);
 
 extern int udp4_ufo_send_check(struct sk_buff *skb);
-extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,
-        netdev_features_t features);
-extern void udp_encap_enable(void);
-#if IS_ENABLED(CONFIG_IPV6)
-extern void udpv6_encap_enable(void);
-#endif
+extern struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb, u32 features);
 #endif  /* _UDP_H */
diff --git a/include/net/udplite.h b/include/net/udplite.h
index 71375459a88..5f097ca7d5c 100644
--- a/include/net/udplite.h
+++ b/include/net/udplite.h
@@ -40,7 +40,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh)
          * checksum. UDP-Lite (like IPv6) mandates checksums, hence packets
          * with a zero checksum field are illegal.                            */
         if (uh->check == 0) {
-                LIMIT_NETDEBUG(KERN_DEBUG "UDPLite: zeroed checksum field\n");
+                LIMIT_NETDEBUG(KERN_DEBUG "UDPLITE: zeroed checksum field\n");
                 return 1;
         }
 
@@ -52,7 +52,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh)
                 /*
                  * Coverage length violates RFC 3828: log and discard silently.
                  */
-                LIMIT_NETDEBUG(KERN_DEBUG "UDPLite: bad csum coverage %d/%d\n",
+                LIMIT_NETDEBUG(KERN_DEBUG "UDPLITE: bad csum coverage %d/%d\n",
                                cscov, skb->len);
                 return 1;
 
diff --git a/include/net/wimax.h b/include/net/wimax.h
index bbb74f990ca..322ff4fbdb4 100644
--- a/include/net/wimax.h
+++ b/include/net/wimax.h
@@ -423,8 +423,8 @@ struct wimax_dev {
         int (*op_reset)(struct wimax_dev *wimax_dev);
 
         struct rfkill *rfkill;
-        unsigned int rf_hw;
-        unsigned int rf_sw;
+        unsigned rf_hw;
+        unsigned rf_sw;
         char name[32];
 
         struct dentry *debugfs_dentry;
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index b52bda8d13b..d86fffd3c03 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -23,15 +23,6 @@
 
 #include <linux/netdevice.h>
 #include <linux/mutex.h>
-#include <linux/bug.h>
-
-/* According to the IEEE 802.15.4 stadard the upper most significant bits of
- * the 32-bit channel bitmaps shall be used as an integer value to specify 32
- * possible channel pages. The lower 27 bits of the channel bit map shall be
- * used as a bit mask to specify channel numbers within a channel page.
- */
-#define WPAN_NUM_CHANNELS       27
-#define WPAN_NUM_PAGES          32
 
 struct wpan_phy {
         struct mutex pib_lock;
@@ -51,7 +42,7 @@ struct wpan_phy {
         int idx;
 
         struct net_device *(*add_iface)(struct wpan_phy *phy,
-                                        const char *name, int type);
+                        const char *name);
         void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
 
         char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
diff --git a/include/net/x25.h b/include/net/x25.h
index b4a8a892312..a06119a0512 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -305,7 +305,7 @@ static inline void x25_unregister_sysctl(void) {};
 #endif /* CONFIG_SYSCTL */
 
 struct x25_skb_cb {
-        unsigned int flags;
+        unsigned flags;
 };
 #define X25_SKB_CB(s) ((struct x25_skb_cb *) ((s)->cb))
 
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 63445ede48b..b203e14d26b 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -213,9 +213,6 @@ struct xfrm_state {
         struct xfrm_lifetime_cur curlft;
         struct tasklet_hrtimer  mtimer;
 
-        /* used to fix curlft->add_time when changing date */
-        long            saved_tmo;
-
         /* Last used time */
         unsigned long           lastused;
 
@@ -241,7 +238,6 @@ static inline struct net *xs_net(struct xfrm_state *x)
 
 /* xflags - make enum if more show up */
 #define XFRM_TIME_DEFER 1
-#define XFRM_SOFT_EXPIRE 2
 
 enum {
         XFRM_STATE_VOID,
@@ -263,7 +259,7 @@ struct km_event {
         } data;
 
         u32     seq;
-        u32     portid;
+        u32     pid;
         u32     event;
         struct net *net;
 };
@@ -273,9 +269,6 @@ struct xfrm_replay {
         int     (*check)(struct xfrm_state *x,
                          struct sk_buff *skb,
                          __be32 net_seq);
-        int     (*recheck)(struct xfrm_state *x,
-                           struct sk_buff *skb,
-                           __be32 net_seq);
         void    (*notify)(struct xfrm_state *x, int event);
         int     (*overflow)(struct xfrm_state *x, struct sk_buff *skb);
 };
@@ -295,8 +288,6 @@ struct xfrm_policy_afinfo {
                                                   struct flowi *fl,
                                                   int reverse);
         int                     (*get_tos)(const struct flowi *fl);
-        void                    (*init_dst)(struct net *net,
-                                            struct xfrm_dst *dst);
         int                     (*init_path)(struct xfrm_dst *path,
                                              struct dst_entry *dst,
                                              int nfheader_len);
@@ -313,7 +304,7 @@ extern void km_state_notify(struct xfrm_state *x, const struct km_event *c);
 
 struct xfrm_tmpl;
 extern int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol);
-extern void km_state_expired(struct xfrm_state *x, int hard, u32 portid);
+extern void km_state_expired(struct xfrm_state *x, int hard, u32 pid);
 extern int __xfrm_state_delete(struct xfrm_state *x);
 
 struct xfrm_state_afinfo {
@@ -576,7 +567,7 @@ struct xfrm_mgr {
         struct list_head        list;
         char                    *id;
         int                     (*notify)(struct xfrm_state *x, const struct km_event *c);
-        int                     (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp);
+        int                     (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
         struct xfrm_policy      *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
         int                     (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
         int                     (*notify_policy)(struct xfrm_policy *x, int dir, const struct km_event *c);
@@ -671,7 +662,7 @@ struct xfrm_spi_skb_cb {
 /* Audit Information */
 struct xfrm_audit {
         u32     secid;
-        kuid_t  loginuid;
+        uid_t   loginuid;
         u32     sessionid;
 };
 
@@ -690,14 +681,13 @@ static inline struct audit_buffer *xfrm_audit_start(const char *op)
         return audit_buf;
 }
 
-static inline void xfrm_audit_helper_usrinfo(kuid_t auid, u32 ses, u32 secid,
+static inline void xfrm_audit_helper_usrinfo(uid_t auid, u32 ses, u32 secid,
                                              struct audit_buffer *audit_buf)
 {
         char *secctx;
         u32 secctx_len;
 
-        audit_log_format(audit_buf, " auid=%u ses=%u",
-                         from_kuid(&init_user_ns, auid), ses);
+        audit_log_format(audit_buf, " auid=%u ses=%u", auid, ses);
         if (secid != 0 &&
             security_secid_to_secctx(secid, &secctx, &secctx_len) == 0) {
                 audit_log_format(audit_buf, " subj=%s", secctx);
@@ -707,13 +697,13 @@ static inline void xfrm_audit_helper_usrinfo(kuid_t auid, u32 ses, u32 secid,
 }
 
 extern void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
-                                  kuid_t auid, u32 ses, u32 secid);
+                                  u32 auid, u32 ses, u32 secid);
 extern void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
-                                  kuid_t auid, u32 ses, u32 secid);
+                                  u32 auid, u32 ses, u32 secid);
 extern void xfrm_audit_state_add(struct xfrm_state *x, int result,
-                                 kuid_t auid, u32 ses, u32 secid);
+                                 u32 auid, u32 ses, u32 secid);
 extern void xfrm_audit_state_delete(struct xfrm_state *x, int result,
-                                    kuid_t auid, u32 ses, u32 secid);
+                                    u32 auid, u32 ses, u32 secid);
 extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x,
                                              struct sk_buff *skb);
 extern void xfrm_audit_state_replay(struct xfrm_state *x,
@@ -726,22 +716,22 @@ extern void xfrm_audit_state_icvfail(struct xfrm_state *x,
 #else
 
 static inline void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
-                                  kuid_t auid, u32 ses, u32 secid)
+                                  u32 auid, u32 ses, u32 secid)
 {
 }
 
 static inline void xfrm_audit_policy_delete(struct xfrm_policy *xp, int result,
-                                  kuid_t auid, u32 ses, u32 secid)
+                                  u32 auid, u32 ses, u32 secid)
 {
 }
 
 static inline void xfrm_audit_state_add(struct xfrm_state *x, int result,
-                                 kuid_t auid, u32 ses, u32 secid)
+                                 u32 auid, u32 ses, u32 secid)
 {
 }
 
 static inline void xfrm_audit_state_delete(struct xfrm_state *x, int result,
-                                    kuid_t auid, u32 ses, u32 secid)
+                                    u32 auid, u32 ses, u32 secid)
 {
 }
 
@@ -837,14 +827,6 @@ static inline bool addr_match(const void *token1, const void *token2,
         return true;
 }
 
-static inline bool addr4_match(__be32 a1, __be32 a2, u8 prefixlen)
-{
-        /* C99 6.5.7 (3): u32 << 32 is undefined behaviour */
-        if (prefixlen == 0)
-                return true;
-        return !((a1 ^ a2) & htonl(0xFFFFFFFFu << (32 - prefixlen)));
-}
-
 static __inline__
 __be16 xfrm_flowi_sport(const struct flowi *fl, const union flowi_uli *uli)
 {
@@ -896,15 +878,15 @@ __be16 xfrm_flowi_dport(const struct flowi *fl, const union flowi_uli *uli)
         return port;
 }
 
-extern bool xfrm_selector_match(const struct xfrm_selector *sel,
-                                const struct flowi *fl,
-                                unsigned short family);
+extern int xfrm_selector_match(const struct xfrm_selector *sel,
+                               const struct flowi *fl,
+                               unsigned short family);
 
 #ifdef CONFIG_SECURITY_NETWORK_XFRM
 /*      If neither has a context --> match
  *      Otherwise, both must have a context and the sids, doi, alg must match
  */
-static inline bool xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
+static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
 {
         return ((!s1 && !s2) ||
                 (s1 && s2 &&
@@ -913,9 +895,9 @@ static inline bool xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_c
                  (s1->ctx_alg == s2->ctx_alg)));
 }
 #else
-static inline bool xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
+static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ctx *s2)
 {
-        return true;
+        return 1;
 }
 #endif
 
@@ -1227,8 +1209,8 @@ void xfrm_flowi_addr_get(const struct flowi *fl,
                 memcpy(&daddr->a4, &fl->u.ip4.daddr, sizeof(daddr->a4));
                 break;
         case AF_INET6:
-                *(struct in6_addr *)saddr->a6 = fl->u.ip6.saddr;
-                *(struct in6_addr *)daddr->a6 = fl->u.ip6.daddr;
+                ipv6_addr_copy((struct in6_addr *)&saddr->a6, &fl->u.ip6.saddr);
+                ipv6_addr_copy((struct in6_addr *)&daddr->a6, &fl->u.ip6.daddr);
                 break;
         }
 }
@@ -1351,7 +1333,7 @@ struct xfrm6_tunnel {
 };
 
 extern void xfrm_init(void);
-extern void xfrm4_init(void);
+extern void xfrm4_init(int rt_hash_size);
 extern int xfrm_state_init(struct net *net);
 extern void xfrm_state_fini(struct net *net);
 extern void xfrm4_state_init(void);
@@ -1485,8 +1467,6 @@ extern int xfrm4_output(struct sk_buff *skb);
 extern int xfrm4_output_finish(struct sk_buff *skb);
 extern int xfrm4_tunnel_register(struct xfrm_tunnel *handler, unsigned short family);
 extern int xfrm4_tunnel_deregister(struct xfrm_tunnel *handler, unsigned short family);
-extern int xfrm4_mode_tunnel_input_register(struct xfrm_tunnel *handler);
-extern int xfrm4_mode_tunnel_input_deregister(struct xfrm_tunnel *handler);
 extern int xfrm6_extract_header(struct sk_buff *skb);
 extern int xfrm6_extract_input(struct xfrm_state *x, struct sk_buff *skb);
 extern int xfrm6_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi);
@@ -1558,7 +1538,7 @@ extern int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
 #endif
 
 extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
-extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 portid);
+extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
 extern int km_report(struct net *net, u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
 
 extern void xfrm_input_init(void);
@@ -1578,6 +1558,11 @@ extern struct xfrm_algo_desc *xfrm_calg_get_byname(const char *name, int probe);
 extern struct xfrm_algo_desc *xfrm_aead_get_byname(const char *name, int icv_len,
                                                    int probe);
 
+struct hash_desc;
+struct scatterlist;
+typedef int (icv_update_fn_t)(struct hash_desc *, struct scatterlist *,
+                              unsigned int);
+
 static inline int xfrm_addr_cmp(const xfrm_address_t *a,
                                 const xfrm_address_t *b,
                                 int family)
@@ -1694,11 +1679,12 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
 
 static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
 {
-        int ret = 0;
-
         if (m->m | m->v)
-                ret = nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);
-        return ret;
+                NLA_PUT(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);
+        return 0;
+
+nla_put_failure:
+        return -1;
 }
 
 #endif  /* _NET_XFRM_H */