Merge remote-tracking branch 'wireless-next/master' into mac80211-next

This brings in some mwifiex changes that further patches will
need to work on top to not cause merge conflicts.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

22 files changed, 236 insertions, 592 deletions

diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index d184df1d0d41..dc03d77ad23b 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -372,12 +372,12 @@ lowpan_uncompress_size(const struct sk_buff *skb, u16 *dgram_offset)
         return skb->len + uncomp_header - ret;
 }
 
-typedef int (*skb_delivery_cb)(struct sk_buff *skb, struct net_device *dev);
-
-int lowpan_process_data(struct sk_buff *skb, struct net_device *dev,
-                const u8 *saddr, const u8 saddr_type, const u8 saddr_len,
-                const u8 *daddr, const u8 daddr_type, const u8 daddr_len,
-                u8 iphc0, u8 iphc1, skb_delivery_cb skb_deliver);
+int
+lowpan_header_decompress(struct sk_buff *skb, struct net_device *dev,
+                         const u8 *saddr, const u8 saddr_type,
+                         const u8 saddr_len, const u8 *daddr,
+                         const u8 daddr_type, const u8 daddr_len,
+                         u8 iphc0, u8 iphc1);
 int lowpan_header_compress(struct sk_buff *skb, struct net_device *dev,
                         unsigned short type, const void *_daddr,
                         const void *_saddr, unsigned int len);
diff --git a/include/net/af_ieee802154.h b/include/net/af_ieee802154.h
index 085940f7eeec..7d38e2ffd256 100644
--- a/include/net/af_ieee802154.h
+++ b/include/net/af_ieee802154.h
@@ -12,10 +12,6 @@
  * 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.
- *
  * Written by:
  * Sergey Lapin <slapin@ossfans.org>
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 6e8f24967308..d5f85d7746bc 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -129,6 +129,15 @@ enum {
          * during the hdev->setup vendor callback.
          */
         HCI_QUIRK_INVALID_BDADDR,
+
+        /* When this quirk is set, the duplicate filtering during
+         * scanning is based on Bluetooth devices addresses. To allow
+         * RSSI based updates, restart scanning if needed.
+         *
+         * This quirk can be set before hci_register_dev is called or
+         * during the hdev->setup vendor callback.
+         */
+        HCI_QUIRK_STRICT_DUPLICATE_FILTER,
 };
 
 /* HCI device flags */
@@ -265,6 +274,7 @@ enum {
 /* Low Energy links do not have defined link type. Use invented one */
 #define LE_LINK         0x80
 #define AMP_LINK        0x81
+#define INVALID_LINK    0xff
 
 /* LMP features */
 #define LMP_3SLOT       0x01
@@ -1463,6 +1473,11 @@ struct hci_ev_cmd_status {
         __le16   opcode;
 } __packed;
 
+#define HCI_EV_HARDWARE_ERROR           0x10
+struct hci_ev_hardware_error {
+        __u8     code;
+} __packed;
+
 #define HCI_EV_ROLE_CHANGE              0x12
 struct hci_ev_role_change {
         __u8     status;
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 37ff1aef0845..4e39a5adfcab 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -398,6 +398,8 @@ struct hci_conn {
         __u16           le_conn_interval;
         __u16           le_conn_latency;
         __u16           le_supv_timeout;
+        __u8            le_adv_data[HCI_MAX_AD_LENGTH];
+        __u8            le_adv_data_len;
         __s8            rssi;
         __s8            tx_power;
         __s8            max_tx_power;
@@ -553,6 +555,7 @@ enum {
         HCI_CONN_STK_ENCRYPT,
         HCI_CONN_AUTH_INITIATOR,
         HCI_CONN_DROP,
+        HCI_CONN_PARAM_REMOVAL_PEND,
 };
 
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
@@ -643,6 +646,26 @@ static inline unsigned int hci_conn_count(struct hci_dev *hdev)
         return c->acl_num + c->amp_num + c->sco_num + c->le_num;
 }
 
+static inline __u8 hci_conn_lookup_type(struct hci_dev *hdev, __u16 handle)
+{
+        struct hci_conn_hash *h = &hdev->conn_hash;
+        struct hci_conn *c;
+        __u8 type = INVALID_LINK;
+
+        rcu_read_lock();
+
+        list_for_each_entry_rcu(c, &h->list, list) {
+                if (c->handle == handle) {
+                        type = c->type;
+                        break;
+                }
+        }
+
+        rcu_read_unlock();
+
+        return type;
+}
+
 static inline struct hci_conn *hci_conn_hash_lookup_handle(struct hci_dev *hdev,
                                                                 __u16 handle)
 {
@@ -853,6 +876,7 @@ int hci_register_dev(struct hci_dev *hdev);
 void 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_reset_dev(struct hci_dev *hdev);
 int hci_dev_open(__u16 dev);
 int hci_dev_close(__u16 dev);
 int hci_dev_reset(__u16 dev);
@@ -1310,9 +1334,8 @@ int mgmt_update_adv_data(struct hci_dev *hdev);
 void mgmt_discoverable_timeout(struct hci_dev *hdev);
 void mgmt_new_link_key(struct hci_dev *hdev, struct link_key *key,
                        bool persistent);
-void 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);
+void mgmt_device_connected(struct hci_dev *hdev, struct hci_conn *conn,
+                           u32 flags, u8 *name, u8 name_len);
 void mgmt_device_disconnected(struct hci_dev *hdev, bdaddr_t *bdaddr,
                               u8 link_type, u8 addr_type, u8 reason,
                               bool mgmt_connected);
diff --git a/include/net/wpan-phy.h b/include/net/cfg802154.h
index 10ab0fc6d4f7..9d99b9655760 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/cfg802154.h
@@ -10,16 +10,12 @@
  * 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.
- *
  * Written by:
  * Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  */
 
-#ifndef WPAN_PHY_H
-#define WPAN_PHY_H
+#ifndef __NET_CFG802154_H
+#define __NET_CFG802154_H
 
 #include <linux/netdevice.h>
 #include <linux/mutex.h>
@@ -33,6 +29,16 @@
 #define WPAN_NUM_CHANNELS       27
 #define WPAN_NUM_PAGES          32
 
+struct wpan_phy;
+
+struct cfg802154_ops {
+        struct net_device * (*add_virtual_intf_deprecated)(struct wpan_phy *wpan_phy,
+                                                           const char *name,
+                                                           int type);
+        void (*del_virtual_intf_deprecated)(struct wpan_phy *wpan_phy,
+                                            struct net_device *dev);
+};
+
 struct wpan_phy {
         struct mutex pib_lock;
 
@@ -51,34 +57,29 @@ struct wpan_phy {
         u8 csma_retries;
         s8 frame_retries;
 
+        __le64 perm_extended_addr;
+
         bool lbt;
         s32 cca_ed_level;
 
         struct device dev;
-        int idx;
 
-        struct net_device *(*add_iface)(struct wpan_phy *phy,
-                                        const char *name, int type);
-        void (*del_iface)(struct wpan_phy *phy, struct net_device *dev);
-
-        int (*set_txpower)(struct wpan_phy *phy, int db);
-        int (*set_lbt)(struct wpan_phy *phy, bool on);
-        int (*set_cca_mode)(struct wpan_phy *phy, u8 cca_mode);
-        int (*set_cca_ed_level)(struct wpan_phy *phy, int level);
-        int (*set_csma_params)(struct wpan_phy *phy, u8 min_be, u8 max_be,
-                               u8 retries);
-        int (*set_frame_retries)(struct wpan_phy *phy, s8 retries);
+        char priv[0] __aligned(NETDEV_ALIGN);
+};
 
-        char priv[0] __attribute__((__aligned__(NETDEV_ALIGN)));
+struct wpan_dev {
+        struct wpan_phy *wpan_phy;
 };
 
 #define to_phy(_dev)    container_of(_dev, struct wpan_phy, dev)
 
-struct wpan_phy *wpan_phy_alloc(size_t priv_size);
+struct wpan_phy *
+wpan_phy_alloc(const struct cfg802154_ops *ops, size_t priv_size);
 static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
 {
         phy->dev.parent = dev;
 }
+
 int wpan_phy_register(struct wpan_phy *phy);
 void wpan_phy_unregister(struct wpan_phy *phy);
 void wpan_phy_free(struct wpan_phy *phy);
@@ -102,4 +103,5 @@ static inline const char *wpan_phy_name(struct wpan_phy *phy)
 {
         return dev_name(&phy->dev);
 }
-#endif
+
+#endif /* __NET_CFG802154_H */
diff --git a/include/net/dsa.h b/include/net/dsa.h
index 58ad8c6492db..b76559293535 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -18,6 +18,7 @@
 #include <linux/of.h>
 #include <linux/phy.h>
 #include <linux/phy_fixed.h>
+#include <linux/ethtool.h>
 
 enum dsa_tag_protocol {
         DSA_TAG_PROTO_NONE = 0,
diff --git a/include/net/dst_ops.h b/include/net/dst_ops.h
index 2f26dfb8450e..1f99a1de0e4f 100644
--- a/include/net/dst_ops.h
+++ b/include/net/dst_ops.h
@@ -63,7 +63,7 @@ static inline void dst_entries_add(struct dst_ops *dst, int val)
 
 static inline int dst_entries_init(struct dst_ops *dst)
 {
-        return percpu_counter_init(&dst->pcpuc_entries, 0);
+        return percpu_counter_init(&dst->pcpuc_entries, 0, GFP_KERNEL);
 }
 
 static inline void dst_entries_destroy(struct dst_ops *dst)
diff --git a/include/net/ieee802154.h b/include/net/ieee802154.h
deleted file mode 100644
index 0aa7122e8f15..000000000000
--- a/include/net/ieee802154.h
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * IEEE802.15.4-2003 specification
- *
- * Copyright (C) 2007, 2008 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.
- *
- * Written by:
- * Pavel Smolenskiy <pavel.smolenskiy@gmail.com>
- * 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 */
-#define IEEE802154_FC_TYPE_MAC_CMD      0x3     /* Frame is MAC command */
-
-#define IEEE802154_FC_TYPE_SHIFT                0
-#define IEEE802154_FC_TYPE_MASK         ((1 << 3) - 1)
-#define IEEE802154_FC_TYPE(x)           ((x & IEEE802154_FC_TYPE_MASK) >> IEEE802154_FC_TYPE_SHIFT)
-#define IEEE802154_FC_SET_TYPE(v, x)    do {    \
-        v = (((v) & ~IEEE802154_FC_TYPE_MASK) | \
-            (((x) << IEEE802154_FC_TYPE_SHIFT) & IEEE802154_FC_TYPE_MASK)); \
-        } while (0)
-
-#define IEEE802154_FC_SECEN_SHIFT       3
-#define IEEE802154_FC_SECEN             (1 << IEEE802154_FC_SECEN_SHIFT)
-#define IEEE802154_FC_FRPEND_SHIFT      4
-#define IEEE802154_FC_FRPEND            (1 << IEEE802154_FC_FRPEND_SHIFT)
-#define IEEE802154_FC_ACK_REQ_SHIFT     5
-#define IEEE802154_FC_ACK_REQ           (1 << IEEE802154_FC_ACK_REQ_SHIFT)
-#define IEEE802154_FC_INTRA_PAN_SHIFT   6
-#define IEEE802154_FC_INTRA_PAN         (1 << IEEE802154_FC_INTRA_PAN_SHIFT)
-
-#define IEEE802154_FC_SAMODE_SHIFT      14
-#define IEEE802154_FC_SAMODE_MASK       (3 << IEEE802154_FC_SAMODE_SHIFT)
-#define IEEE802154_FC_DAMODE_SHIFT      10
-#define IEEE802154_FC_DAMODE_MASK       (3 << IEEE802154_FC_DAMODE_SHIFT)
-
-#define IEEE802154_FC_VERSION_SHIFT     12
-#define IEEE802154_FC_VERSION_MASK      (3 << IEEE802154_FC_VERSION_SHIFT)
-#define IEEE802154_FC_VERSION(x)        ((x & IEEE802154_FC_VERSION_MASK) >> IEEE802154_FC_VERSION_SHIFT)
-
-#define IEEE802154_FC_SAMODE(x)         \
-        (((x) & IEEE802154_FC_SAMODE_MASK) >> IEEE802154_FC_SAMODE_SHIFT)
-
-#define IEEE802154_FC_DAMODE(x)         \
-        (((x) & IEEE802154_FC_DAMODE_MASK) >> IEEE802154_FC_DAMODE_SHIFT)
-
-#define IEEE802154_SCF_SECLEVEL_MASK            7
-#define IEEE802154_SCF_SECLEVEL_SHIFT           0
-#define IEEE802154_SCF_SECLEVEL(x)              (x & IEEE802154_SCF_SECLEVEL_MASK)
-#define IEEE802154_SCF_KEY_ID_MODE_SHIFT        3
-#define IEEE802154_SCF_KEY_ID_MODE_MASK         (3 << IEEE802154_SCF_KEY_ID_MODE_SHIFT)
-#define IEEE802154_SCF_KEY_ID_MODE(x)           \
-        ((x & IEEE802154_SCF_KEY_ID_MODE_MASK) >> IEEE802154_SCF_KEY_ID_MODE_SHIFT)
-
-#define IEEE802154_SCF_KEY_IMPLICIT             0
-#define IEEE802154_SCF_KEY_INDEX                1
-#define IEEE802154_SCF_KEY_SHORT_INDEX          2
-#define IEEE802154_SCF_KEY_HW_INDEX             3
-
-#define IEEE802154_SCF_SECLEVEL_NONE            0
-#define IEEE802154_SCF_SECLEVEL_MIC32           1
-#define IEEE802154_SCF_SECLEVEL_MIC64           2
-#define IEEE802154_SCF_SECLEVEL_MIC128          3
-#define IEEE802154_SCF_SECLEVEL_ENC             4
-#define IEEE802154_SCF_SECLEVEL_ENC_MIC32       5
-#define IEEE802154_SCF_SECLEVEL_ENC_MIC64       6
-#define IEEE802154_SCF_SECLEVEL_ENC_MIC128      7
-
-/* 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
-#define IEEE802154_CMD_DISASSOCIATION_NOTIFY    0x03
-#define IEEE802154_CMD_DATA_REQ                 0x04
-#define IEEE802154_CMD_PANID_CONFLICT_NOTIFY    0x05
-#define IEEE802154_CMD_ORPHAN_NOTIFY            0x06
-#define IEEE802154_CMD_BEACON_REQ               0x07
-#define IEEE802154_CMD_COORD_REALIGN_NOTIFY     0x08
-#define IEEE802154_CMD_GTS_REQ                  0x09
-
-/*
- * The return values of MAC operations
- */
-enum {
-        /*
-         * The requested operation was completed successfully.
-         * For a transmission request, this value indicates
-         * a successful transmission.
-         */
-        IEEE802154_SUCCESS = 0x0,
-
-        /* The beacon was lost following a synchronization request. */
-        IEEE802154_BEACON_LOSS = 0xe0,
-        /*
-         * A transmission could not take place due to activity on the
-         * channel, i.e., the CSMA-CA mechanism has failed.
-         */
-        IEEE802154_CHNL_ACCESS_FAIL = 0xe1,
-        /* The GTS request has been denied by the PAN coordinator. */
-        IEEE802154_DENINED = 0xe2,
-        /* The attempt to disable the transceiver has failed. */
-        IEEE802154_DISABLE_TRX_FAIL = 0xe3,
-        /*
-         * The received frame induces a failed security check according to
-         * the security suite.
-         */
-        IEEE802154_FAILED_SECURITY_CHECK = 0xe4,
-        /*
-         * The frame resulting from secure processing has a length that is
-         * greater than aMACMaxFrameSize.
-         */
-        IEEE802154_FRAME_TOO_LONG = 0xe5,
-        /*
-         * The requested GTS transmission failed because the specified GTS
-         * either did not have a transmit GTS direction or was not defined.
-         */
-        IEEE802154_INVALID_GTS = 0xe6,
-        /*
-         * A request to purge an MSDU from the transaction queue was made using
-         * an MSDU handle that was not found in the transaction table.
-         */
-        IEEE802154_INVALID_HANDLE = 0xe7,
-        /* A parameter in the primitive is out of the valid range.*/
-        IEEE802154_INVALID_PARAMETER = 0xe8,
-        /* No acknowledgment was received after aMaxFrameRetries. */
-        IEEE802154_NO_ACK = 0xe9,
-        /* A scan operation failed to find any network beacons.*/
-        IEEE802154_NO_BEACON = 0xea,
-        /* No response data were available following a request. */
-        IEEE802154_NO_DATA = 0xeb,
-        /* The operation failed because a short address was not allocated. */
-        IEEE802154_NO_SHORT_ADDRESS = 0xec,
-        /*
-         * A receiver enable request was unsuccessful because it could not be
-         * completed within the CAP.
-         */
-        IEEE802154_OUT_OF_CAP = 0xed,
-        /*
-         * A PAN identifier conflict has been detected and communicated to the
-         * PAN coordinator.
-         */
-        IEEE802154_PANID_CONFLICT = 0xee,
-        /* A coordinator realignment command has been received. */
-        IEEE802154_REALIGMENT = 0xef,
-        /* The transaction has expired and its information discarded. */
-        IEEE802154_TRANSACTION_EXPIRED = 0xf0,
-        /* There is no capacity to store the transaction. */
-        IEEE802154_TRANSACTION_OVERFLOW = 0xf1,
-        /*
-         * The transceiver was in the transmitter enabled state when the
-         * receiver was requested to be enabled.
-         */
-        IEEE802154_TX_ACTIVE = 0xf2,
-        /* The appropriate key is not available in the ACL. */
-        IEEE802154_UNAVAILABLE_KEY = 0xf3,
-        /*
-         * A SET/GET request was issued with the identifier of a PIB attribute
-         * that is not supported.
-         */
-        IEEE802154_UNSUPPORTED_ATTR = 0xf4,
-        /*
-         * A request to perform a scan operation failed because the MLME was
-         * in the process of performing a previously initiated scan operation.
-         */
-        IEEE802154_SCAN_IN_PROGRESS = 0xfc,
-};
-
-
-#endif
-
-
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h
index 3b53c8e405e4..83bb8a73d23c 100644
--- a/include/net/ieee802154_netdev.h
+++ b/include/net/ieee802154_netdev.h
@@ -12,10 +12,6 @@
  * 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.
- *
  * Written by:
  * Pavel Smolenskiy <pavel.smolenskiy@gmail.com>
  * Maxim Gorbachyov <maxim.gorbachev@siemens.com>
@@ -27,10 +23,10 @@
 #ifndef IEEE802154_NETDEVICE_H
 #define IEEE802154_NETDEVICE_H
 
-#include <net/ieee802154.h>
 #include <net/af_ieee802154.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
+#include <linux/ieee802154.h>
 
 struct ieee802154_sechdr {
 #if defined(__LITTLE_ENDIAN_BITFIELD)
@@ -427,8 +423,6 @@ struct ieee802154_mlme_ops {
 
         /* The fields below are required. */
 
-        struct wpan_phy *(*get_phy)(const struct net_device *dev);
-
         /*
          * FIXME: these should become the part of PIB/MIB interface.
          * However we still don't have IB interface of any kind
@@ -438,16 +432,6 @@ struct ieee802154_mlme_ops {
         u8 (*get_dsn)(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)
 {
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 55a8d4056cc9..98e5f9578f86 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -146,7 +146,6 @@ struct ifacaddr6 {
         struct ifacaddr6        *aca_next;
         int                     aca_users;
         atomic_t                aca_refcnt;
-        spinlock_t              aca_lock;
         unsigned long           aca_cstamp;
         unsigned long           aca_tstamp;
 };
diff --git a/include/net/inet6_hashtables.h b/include/net/inet6_hashtables.h
index ae0613544308..d1d272843b3b 100644
--- a/include/net/inet6_hashtables.h
+++ b/include/net/inet6_hashtables.h
@@ -80,7 +80,8 @@ static inline struct sock *__inet6_lookup(struct net *net,
 static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
                                               struct sk_buff *skb,
                                               const __be16 sport,
-                                              const __be16 dport)
+                                              const __be16 dport,
+                                              int iif)
 {
         struct sock *sk = skb_steal_sock(skb);
 
@@ -90,7 +91,7 @@ static inline struct sock *__inet6_lookup_skb(struct inet_hashinfo *hashinfo,
         return __inet6_lookup(dev_net(skb_dst(skb)->dev), hashinfo,
                               &ipv6_hdr(skb)->saddr, sport,
                               &ipv6_hdr(skb)->daddr, ntohs(dport),
-                              inet6_iif(skb));
+                              iif);
 }
 
 struct sock *inet6_lookup(struct net *net, struct inet_hashinfo *hashinfo,
diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 65a8855e99fe..8d1765577acc 100644
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -151,7 +151,7 @@ static inline void add_frag_mem_limit(struct inet_frag_queue *q, int i)
 
 static inline void init_frag_mem_limit(struct netns_frags *nf)
 {
-        percpu_counter_init(&nf->mem, 0);
+        percpu_counter_init(&nf->mem, 0, GFP_KERNEL);
 }
 
 static inline unsigned int sum_frag_mem_limit(struct netns_frags *nf)
diff --git a/include/net/lib80211.h b/include/net/lib80211.h
index be95b9262801..aab0f427edb5 100644
--- a/include/net/lib80211.h
+++ b/include/net/lib80211.h
@@ -32,11 +32,6 @@
 #include <linux/timer.h>
 #include <linux/seq_file.h>
 
-/* print_ssid() is intended to be used in debug (and possibly error)
- * messages. It should never be used for passing ssid to user space. */
-const char *print_ssid(char *buf, const char *ssid, u8 ssid_len);
-#define DECLARE_SSID_BUF(var) char var[IEEE80211_MAX_SSID_LEN * 4 + 1] __maybe_unused
-
 #define NUM_WEP_KEYS    4
 
 enum {
diff --git a/include/net/mac802154.h b/include/net/mac802154.h
index 2e67cdd19cdc..632f6566adb5 100644
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
@@ -12,14 +12,12 @@
  * 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>
+#include <linux/ieee802154.h>
 #include <linux/skbuff.h>
 
 /* General MAC frame format:
@@ -35,13 +33,13 @@
  */
 
 /* indicates that the Short Address changed */
-#define IEEE802515_AFILT_SADDR_CHANGED          0x00000001
+#define IEEE802154_AFILT_SADDR_CHANGED          0x00000001
 /* indicates that the IEEE Address changed */
-#define IEEE802515_AFILT_IEEEADDR_CHANGED       0x00000002
+#define IEEE802154_AFILT_IEEEADDR_CHANGED       0x00000002
 /* indicates that the PAN ID changed */
-#define IEEE802515_AFILT_PANID_CHANGED          0x00000004
+#define IEEE802154_AFILT_PANID_CHANGED          0x00000004
 /* indicates that PAN Coordinator status changed */
-#define IEEE802515_AFILT_PANC_CHANGED           0x00000008
+#define IEEE802154_AFILT_PANC_CHANGED           0x00000008
 
 struct ieee802154_hw_addr_filt {
         __le16  pan_id;         /* Each independent PAN selects a unique
@@ -55,7 +53,14 @@ struct ieee802154_hw_addr_filt {
         u8      pan_coord;
 };
 
-struct ieee802154_dev {
+struct ieee802154_vif {
+        int type;
+
+        /* must be last */
+        u8 drv_priv[0] __aligned(sizeof(void *));
+};
+
+struct ieee802154_hw {
         /* filled by the driver */
         int     extra_tx_headroom;
         u32     flags;
@@ -65,6 +70,7 @@ struct ieee802154_dev {
         struct  ieee802154_hw_addr_filt hw_filt;
         void    *priv;
         struct  wpan_phy *phy;
+        size_t vif_data_size;
 };
 
 /* Checksum is in hardware and is omitted from a packet
@@ -76,28 +82,43 @@ struct ieee802154_dev {
  * 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 xmitter will add FCS on it's own. */
+#define IEEE802154_HW_TX_OMIT_CKSUM     0x00000001
 /* Indicates that receiver will autorespond with ACK frames. */
-#define IEEE802154_HW_AACK              0x00000002
+#define IEEE802154_HW_AACK              0x00000002
 /* Indicates that transceiver will support transmit power setting. */
-#define IEEE802154_HW_TXPOWER           0x00000004
+#define IEEE802154_HW_TXPOWER           0x00000004
 /* Indicates that transceiver will support listen before transmit. */
-#define IEEE802154_HW_LBT               0x00000008
+#define IEEE802154_HW_LBT               0x00000008
 /* Indicates that transceiver will support cca mode setting. */
-#define IEEE802154_HW_CCA_MODE          0x00000010
+#define IEEE802154_HW_CCA_MODE          0x00000010
 /* Indicates that transceiver will support cca ed level setting. */
-#define IEEE802154_HW_CCA_ED_LEVEL      0x00000020
+#define IEEE802154_HW_CCA_ED_LEVEL      0x00000020
 /* Indicates that transceiver will support csma (max_be, min_be, csma retries)
  * settings. */
-#define IEEE802154_HW_CSMA_PARAMS       0x00000040
+#define IEEE802154_HW_CSMA_PARAMS       0x00000040
 /* Indicates that transceiver will support ARET frame retries setting. */
-#define IEEE802154_HW_FRAME_RETRIES     0x00000080
+#define IEEE802154_HW_FRAME_RETRIES     0x00000080
+/* Indicates that transceiver will support hardware address filter setting. */
+#define IEEE802154_HW_AFILT             0x00000100
+/* Indicates that transceiver will support promiscuous mode setting. */
+#define IEEE802154_HW_PROMISCUOUS       0x00000200
+/* Indicates that receiver omits FCS. */
+#define IEEE802154_HW_RX_OMIT_CKSUM     0x00000400
+/* Indicates that receiver will not filter frames with bad checksum. */
+#define IEEE802154_HW_RX_DROP_BAD_CKSUM 0x00000800
+
+/* Indicates that receiver omits FCS and xmitter will add FCS on it's own. */
+#define IEEE802154_HW_OMIT_CKSUM        (IEEE802154_HW_TX_OMIT_CKSUM | \
+                                         IEEE802154_HW_RX_OMIT_CKSUM)
 
 /* This groups the most common CSMA support fields into one. */
 #define IEEE802154_HW_CSMA              (IEEE802154_HW_CCA_MODE | \
                                          IEEE802154_HW_CCA_ED_LEVEL | \
-                                         IEEE802154_HW_CSMA_PARAMS | \
+                                         IEEE802154_HW_CSMA_PARAMS)
+
+/* This groups the most common ARET support fields into one. */
+#define IEEE802154_HW_ARET              (IEEE802154_HW_CSMA | \
                                          IEEE802154_HW_FRAME_RETRIES)
 
 /* struct ieee802154_ops - callbacks from mac802154 to the driver
@@ -112,12 +133,24 @@ struct ieee802154_dev {
  * 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.
+ * xmit_sync:
+ *        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 is called by a workqueue and useful for
+ *        synchronous 802.15.4 drivers.
+ *        This function should return zero or negative errno.
+ *
+ *        WARNING:
+ *        This will be deprecated soon. We don't accept synced xmit callbacks
+ *        drivers anymore.
+ *
+ * xmit_async:
+ *        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.
+ *        This function should return zero or negative errno.
  *
  * ed:    Handler that 802.15.4 module calls for Energy Detection.
  *        This function should place the value for detected energy
@@ -159,40 +192,74 @@ struct ieee802154_dev {
  * set_frame_retries
  *        Sets the retransmission attempt limit. Called with pib_lock held.
  *        Returns either zero, or negative errno.
+ *
+ * set_promiscuous_mode
+ *        Enables or disable promiscuous mode.
  */
 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,
+        int             (*start)(struct ieee802154_hw *hw);
+        void            (*stop)(struct ieee802154_hw *hw);
+        int             (*xmit_sync)(struct ieee802154_hw *hw,
+                                     struct sk_buff *skb);
+        int             (*xmit_async)(struct ieee802154_hw *hw,
+                                      struct sk_buff *skb);
+        int             (*ed)(struct ieee802154_hw *hw, u8 *level);
+        int             (*set_channel)(struct ieee802154_hw *hw, u8 page,
+                                       u8 channel);
+        int             (*set_hw_addr_filt)(struct ieee802154_hw *hw,
+                                            struct ieee802154_hw_addr_filt *filt,
                                             unsigned long changed);
-        int             (*ieee_addr)(struct ieee802154_dev *dev, __le64 addr);
-        int             (*set_txpower)(struct ieee802154_dev *dev, int db);
-        int             (*set_lbt)(struct ieee802154_dev *dev, bool on);
-        int             (*set_cca_mode)(struct ieee802154_dev *dev, u8 mode);
-        int             (*set_cca_ed_level)(struct ieee802154_dev *dev,
+        int             (*set_txpower)(struct ieee802154_hw *hw, int db);
+        int             (*set_lbt)(struct ieee802154_hw *hw, bool on);
+        int             (*set_cca_mode)(struct ieee802154_hw *hw, u8 mode);
+        int             (*set_cca_ed_level)(struct ieee802154_hw *hw,
                                             s32 level);
-        int             (*set_csma_params)(struct ieee802154_dev *dev,
+        int             (*set_csma_params)(struct ieee802154_hw *hw,
                                            u8 min_be, u8 max_be, u8 retries);
-        int             (*set_frame_retries)(struct ieee802154_dev *dev,
+        int             (*set_frame_retries)(struct ieee802154_hw *hw,
                                              s8 retries);
+        int             (*set_promiscuous_mode)(struct ieee802154_hw *hw,
+                                                const bool on);
 };
 
-/* Basic interface to register ieee802154 device */
-struct ieee802154_dev *
-ieee802154_alloc_device(size_t priv_data_len, 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);
+/**
+ * ieee802154_be64_to_le64 - copies and convert be64 to le64
+ * @le64_dst: le64 destination pointer
+ * @be64_src: be64 source pointer
+ */
+static inline void ieee802154_be64_to_le64(void *le64_dst, const void *be64_src)
+{
+        __le64 tmp = (__force __le64)swab64p(be64_src);
+
+        memcpy(le64_dst, &tmp, IEEE802154_EXTENDED_ADDR_LEN);
+}
 
-void ieee802154_rx_irqsafe(struct ieee802154_dev *dev, struct sk_buff *skb,
+/**
+ * ieee802154_le64_to_be64 - copies and convert le64 to be64
+ * @be64_dst: be64 destination pointer
+ * @le64_src: le64 source pointer
+ */
+static inline void ieee802154_le64_to_be64(void *be64_dst, const void *le64_src)
+{
+        __be64 tmp = (__force __be64)swab64p(le64_src);
+
+        memcpy(be64_dst, &tmp, IEEE802154_EXTENDED_ADDR_LEN);
+}
+
+/* Basic interface to register ieee802154 hwice */
+struct ieee802154_hw *
+ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops);
+void ieee802154_free_hw(struct ieee802154_hw *hw);
+int ieee802154_register_hw(struct ieee802154_hw *hw);
+void ieee802154_unregister_hw(struct ieee802154_hw *hw);
+
+void ieee802154_rx(struct ieee802154_hw *hw, struct sk_buff *skb);
+void ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb,
                            u8 lqi);
 
+void ieee802154_wake_queue(struct ieee802154_hw *hw);
+void ieee802154_stop_queue(struct ieee802154_hw *hw);
+void ieee802154_xmit_complete(struct ieee802154_hw *hw, struct sk_buff *skb);
+
 #endif /* NET_MAC802154_H */
diff --git a/include/net/netfilter/ipv6/nf_reject.h b/include/net/netfilter/ipv6/nf_reject.h
index 7a10cfcd8e33..48e18810a9be 100644
--- a/include/net/netfilter/ipv6/nf_reject.h
+++ b/include/net/netfilter/ipv6/nf_reject.h
@@ -1,11 +1,7 @@
 #ifndef _IPV6_NF_REJECT_H
 #define _IPV6_NF_REJECT_H
 
-#include <net/ipv6.h>
-#include <net/ip6_route.h>
-#include <net/ip6_fib.h>
-#include <net/ip6_checksum.h>
-#include <linux/netfilter_ipv6.h>
+#include <linux/icmpv6.h>
 
 static inline void
 nf_send_unreach6(struct net *net, struct sk_buff *skb_in, unsigned char code,
@@ -17,155 +13,6 @@ nf_send_unreach6(struct net *net, struct sk_buff *skb_in, unsigned char code,
         icmpv6_send(skb_in, ICMPV6_DEST_UNREACH, code, 0);
 }
 
-/* Send RST reply */
-static void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook)
-{
-        struct sk_buff *nskb;
-        struct tcphdr otcph, *tcph;
-        unsigned int otcplen, hh_len;
-        int tcphoff, needs_ack;
-        const struct ipv6hdr *oip6h = ipv6_hdr(oldskb);
-        struct ipv6hdr *ip6h;
-#define DEFAULT_TOS_VALUE       0x0U
-        const __u8 tclass = DEFAULT_TOS_VALUE;
-        struct dst_entry *dst = NULL;
-        u8 proto;
-        __be16 frag_off;
-        struct flowi6 fl6;
-
-        if ((!(ipv6_addr_type(&oip6h->saddr) & IPV6_ADDR_UNICAST)) ||
-            (!(ipv6_addr_type(&oip6h->daddr) & IPV6_ADDR_UNICAST))) {
-                pr_debug("addr is not unicast.\n");
-                return;
-        }
-
-        proto = oip6h->nexthdr;
-        tcphoff = ipv6_skip_exthdr(oldskb, ((u8*)(oip6h+1) - oldskb->data), &proto, &frag_off);
-
-        if ((tcphoff < 0) || (tcphoff > oldskb->len)) {
-                pr_debug("Cannot get TCP header.\n");
-                return;
-        }
-
-        otcplen = oldskb->len - tcphoff;
-
-        /* IP header checks: fragment, too short. */
-        if (proto != IPPROTO_TCP || otcplen < sizeof(struct tcphdr)) {
-                pr_debug("proto(%d) != IPPROTO_TCP, "
-                         "or too short. otcplen = %d\n",
-                         proto, otcplen);
-                return;
-        }
-
-        if (skb_copy_bits(oldskb, tcphoff, &otcph, sizeof(struct tcphdr)))
-                BUG();
-
-        /* No RST for RST. */
-        if (otcph.rst) {
-                pr_debug("RST is set\n");
-                return;
-        }
-
-        /* Check checksum. */
-        if (nf_ip6_checksum(oldskb, hook, tcphoff, IPPROTO_TCP)) {
-                pr_debug("TCP checksum is invalid\n");
-                return;
-        }
-
-        memset(&fl6, 0, sizeof(fl6));
-        fl6.flowi6_proto = IPPROTO_TCP;
-        fl6.saddr = oip6h->daddr;
-        fl6.daddr = oip6h->saddr;
-        fl6.fl6_sport = otcph.dest;
-        fl6.fl6_dport = otcph.source;
-        security_skb_classify_flow(oldskb, flowi6_to_flowi(&fl6));
-        dst = ip6_route_output(net, NULL, &fl6);
-        if (dst == NULL || dst->error) {
-                dst_release(dst);
-                return;
-        }
-        dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-        if (IS_ERR(dst))
-                return;
-
-        hh_len = (dst->dev->hard_header_len + 15)&~15;
-        nskb = alloc_skb(hh_len + 15 + dst->header_len + sizeof(struct ipv6hdr)
-                         + sizeof(struct tcphdr) + dst->trailer_len,
-                         GFP_ATOMIC);
-
-        if (!nskb) {
-                net_dbg_ratelimited("cannot alloc skb\n");
-                dst_release(dst);
-                return;
-        }
-
-        skb_dst_set(nskb, dst);
-
-        skb_reserve(nskb, hh_len + dst->header_len);
-
-        skb_put(nskb, sizeof(struct ipv6hdr));
-        skb_reset_network_header(nskb);
-        ip6h = ipv6_hdr(nskb);
-        ip6_flow_hdr(ip6h, tclass, 0);
-        ip6h->hop_limit = ip6_dst_hoplimit(dst);
-        ip6h->nexthdr = IPPROTO_TCP;
-        ip6h->saddr = oip6h->daddr;
-        ip6h->daddr = oip6h->saddr;
-
-        skb_reset_transport_header(nskb);
-        tcph = (struct tcphdr *)skb_put(nskb, sizeof(struct tcphdr));
-        /* Truncate to length (no data) */
-        tcph->doff = sizeof(struct tcphdr)/4;
-        tcph->source = otcph.dest;
-        tcph->dest = otcph.source;
-
-        if (otcph.ack) {
-                needs_ack = 0;
-                tcph->seq = otcph.ack_seq;
-                tcph->ack_seq = 0;
-        } else {
-                needs_ack = 1;
-                tcph->ack_seq = htonl(ntohl(otcph.seq) + otcph.syn + otcph.fin
-                                      + otcplen - (otcph.doff<<2));
-                tcph->seq = 0;
-        }
-
-        /* Reset flags */
-        ((u_int8_t *)tcph)[13] = 0;
-        tcph->rst = 1;
-        tcph->ack = needs_ack;
-        tcph->window = 0;
-        tcph->urg_ptr = 0;
-        tcph->check = 0;
-
-        /* Adjust TCP checksum */
-        tcph->check = csum_ipv6_magic(&ipv6_hdr(nskb)->saddr,
-                                      &ipv6_hdr(nskb)->daddr,
-                                      sizeof(struct tcphdr), IPPROTO_TCP,
-                                      csum_partial(tcph,
-                                                   sizeof(struct tcphdr), 0));
-
-        nf_ct_attach(nskb, oldskb);
-
-#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
-        /* If we use ip6_local_out for bridged traffic, the MAC source on
-         * the RST will be ours, instead of the destination's.  This confuses
-         * some routers/firewalls, and they drop the packet.  So we need to
-         * build the eth header using the original destination's MAC as the
-         * source, and send the RST packet directly.
-         */
-        if (oldskb->nf_bridge) {
-                struct ethhdr *oeth = eth_hdr(oldskb);
-                nskb->dev = oldskb->nf_bridge->physindev;
-                nskb->protocol = htons(ETH_P_IPV6);
-                ip6h->payload_len = htons(sizeof(struct tcphdr));
-                if (dev_hard_header(nskb, nskb->dev, ntohs(nskb->protocol),
-                                    oeth->h_source, oeth->h_dest, nskb->len) < 0)
-                        return;
-                dev_queue_xmit(nskb);
-        } else
-#endif
-                ip6_local_out(nskb);
-}
+void nf_send_reset6(struct net *net, struct sk_buff *oldskb, int hook);
 
 #endif /* _IPV6_NF_REJECT_H */
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index 37252f71a380..c8a7db605e03 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -242,7 +242,7 @@ extern s32 (*nf_ct_nat_offset)(const struct nf_conn *ct,
 DECLARE_PER_CPU(struct nf_conn, nf_conntrack_untracked);
 static inline struct nf_conn *nf_ct_untracked_get(void)
 {
-        return &__raw_get_cpu_var(nf_conntrack_untracked);
+        return raw_cpu_ptr(&nf_conntrack_untracked);
 }
 void nf_ct_untracked_status_or(unsigned long bits);
 
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 6c1076275aaa..7b903e1bdbbb 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -431,7 +431,7 @@ static inline int nlmsg_report(const struct nlmsghdr *nlh)
 /**
  * nlmsg_put - Add a new netlink message to an skb
  * @skb: socket buffer to store message in
- * @portid: netlink process id
+ * @portid: netlink PORTID of requesting application
  * @seq: sequence number of message
  * @type: message type
  * @payload: length of message payload
diff --git a/include/net/nl802154.h b/include/net/nl802154.h
deleted file mode 100644
index b23548e04098..000000000000
--- a/include/net/nl802154.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * nl802154.h
- *
- * 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
- * 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 IEEE802154_NL_H
-#define IEEE802154_NL_H
-
-struct net_device;
-struct ieee802154_addr;
-
-/**
- * ieee802154_nl_assoc_indic - Notify userland of an association request.
- * @dev: The network device on which this association request was
- *       received.
- * @addr: The address of the device requesting association.
- * @cap: The capability information field from the device.
- *
- * This informs a userland coordinator of a device requesting to
- * associate with the PAN controlled by the coordinator.
- *
- * Note: This is in section 7.3.1 of the IEEE 802.15.4-2006 document.
- */
-int ieee802154_nl_assoc_indic(struct net_device *dev,
-                struct ieee802154_addr *addr, u8 cap);
-
-/**
- * ieee802154_nl_assoc_confirm - Notify userland of association.
- * @dev: The device which has completed association.
- * @short_addr: The short address assigned to the device.
- * @status: The status of the association.
- *
- * Inform userland of the result of an association request. If the
- * association request included asking the coordinator to allocate
- * a short address then it is returned in @short_addr.
- *
- * Note: This is in section 7.3.2 of the IEEE 802.15.4 document.
- */
-int ieee802154_nl_assoc_confirm(struct net_device *dev,
-                __le16 short_addr, u8 status);
-
-/**
- * ieee802154_nl_disassoc_indic - Notify userland of disassociation.
- * @dev: The device on which disassociation was indicated.
- * @addr: The device which is disassociating.
- * @reason: The reason for the disassociation.
- *
- * Inform userland that a device has disassociated from the network.
- *
- * Note: This is in section 7.3.3 of the IEEE 802.15.4 document.
- */
-int ieee802154_nl_disassoc_indic(struct net_device *dev,
-                struct ieee802154_addr *addr, u8 reason);
-
-/**
- * ieee802154_nl_disassoc_confirm - Notify userland of disassociation
- * completion.
- * @dev: The device on which disassociation was ordered.
- * @status: The result of the disassociation.
- *
- * Inform userland of the result of requesting that a device
- * disassociate, or the result of requesting that we disassociate from
- * a PAN managed by another coordinator.
- *
- * Note: This is in section 7.1.4.3 of the IEEE 802.15.4 document.
- */
-int ieee802154_nl_disassoc_confirm(struct net_device *dev,
-                u8 status);
-
-/**
- * ieee802154_nl_scan_confirm - Notify userland of completion of scan.
- * @dev: The device which was instructed to scan.
- * @status: The status of the scan operation.
- * @scan_type: What type of scan was performed.
- * @unscanned: Any channels that the device was unable to scan.
- * @edl: The energy levels (if a passive scan).
- *
- *
- * Note: This is in section 7.1.11 of the IEEE 802.15.4 document.
- * Note: This API does not permit the return of an active scan result.
- */
-int ieee802154_nl_scan_confirm(struct net_device *dev,
-                u8 status, u8 scan_type, u32 unscanned, u8 page,
-                u8 *edl/*, struct list_head *pan_desc_list */);
-
-/**
- * ieee802154_nl_beacon_indic - Notify userland of a received beacon.
- * @dev: The device on which a beacon was received.
- * @panid: The PAN of the coordinator.
- * @coord_addr: The short address of the coordinator on that PAN.
- *
- * Note: This is in section 7.1.5 of the IEEE 802.15.4 document.
- * Note: This API does not provide extended information such as what
- * channel the PAN is on or what the LQI of the beacon frame was on
- * receipt.
- * Note: This API cannot indicate a beacon frame for a coordinator
- *       operating in long addressing mode.
- */
-int ieee802154_nl_beacon_indic(struct net_device *dev, __le16 panid,
-                __le16 coord_addr);
-
-/**
- * ieee802154_nl_start_confirm - Notify userland of completion of start.
- * @dev: The device which was instructed to scan.
- * @status: The status of the scan operation.
- *
- * Note: This is in section 7.1.14 of the IEEE 802.15.4 document.
- */
-int ieee802154_nl_start_confirm(struct net_device *dev, u8 status);
-
-#endif
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
index 9fbd856e6713..856f01cb51dd 100644
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@ -426,6 +426,11 @@ static inline void sctp_assoc_pending_pmtu(struct sock *sk, struct sctp_associat
         asoc->pmtu_pending = 0;
 }
 
+static inline bool sctp_chunk_pending(const struct sctp_chunk *chunk)
+{
+        return !list_empty(&chunk->list);
+}
+
 /* Walk through a list of TLV parameters.  Don't trust the
  * individual parameter lengths and instead depend on
  * the chunk length to indicate when to stop.  Make sure
diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
index 7f4eeb340a54..72a31db47ded 100644
--- a/include/net/sctp/sm.h
+++ b/include/net/sctp/sm.h
@@ -248,9 +248,9 @@ struct sctp_chunk *sctp_make_asconf_update_ip(struct sctp_association *,
                                               int, __be16);
 struct sctp_chunk *sctp_make_asconf_set_prim(struct sctp_association *asoc,
                                              union sctp_addr *addr);
-int sctp_verify_asconf(const struct sctp_association *asoc,
-                       struct sctp_paramhdr *param_hdr, void *chunk_end,
-                       struct sctp_paramhdr **errp);
+bool sctp_verify_asconf(const struct sctp_association *asoc,
+                        struct sctp_chunk *chunk, bool addr_param_needed,
+                        struct sctp_paramhdr **errp);
 struct sctp_chunk *sctp_process_asconf(struct sctp_association *asoc,
                                        struct sctp_chunk *asconf);
 int sctp_process_asconf_ack(struct sctp_association *asoc,
diff --git a/include/net/snmp.h b/include/net/snmp.h
index 8fd2f498782e..35512ac6dcfb 100644
--- a/include/net/snmp.h
+++ b/include/net/snmp.h
@@ -164,7 +164,7 @@ struct linux_xfrm_mib {
 
 #define SNMP_ADD_STATS64_BH(mib, field, addend)                         \
         do {                                                            \
-                __typeof__(*mib) *ptr = __this_cpu_ptr(mib);            \
+                __typeof__(*mib) *ptr = raw_cpu_ptr(mib);               \
                 u64_stats_update_begin(&ptr->syncp);                    \
                 ptr->mibs[field] += addend;                             \
                 u64_stats_update_end(&ptr->syncp);                      \
@@ -185,8 +185,8 @@ struct linux_xfrm_mib {
 #define SNMP_INC_STATS64(mib, field) SNMP_ADD_STATS64(mib, field, 1)
 #define SNMP_UPD_PO_STATS64_BH(mib, basefield, addend)                  \
         do {                                                            \
-                __typeof__(*mib) *ptr;                                  \
-                ptr = __this_cpu_ptr(mib);                              \
+                __typeof__(*mib) *ptr;                          \
+                ptr = raw_cpu_ptr((mib));                               \
                 u64_stats_update_begin(&ptr->syncp);                    \
                 ptr->mibs[basefield##PKTS]++;                           \
                 ptr->mibs[basefield##OCTETS] += addend;                 \
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 74efeda994b3..4062b4f0d121 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -468,8 +468,7 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb);
 /* From syncookies.c */
 int __cookie_v4_check(const struct iphdr *iph, const struct tcphdr *th,
                       u32 cookie);
-struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
-                             struct ip_options *opt);
+struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb);
 #ifdef CONFIG_SYN_COOKIES
 
 /* Syncookies use a monotonic timer which increments every 60 seconds.
@@ -730,6 +729,17 @@ struct tcp_skb_cb {
 
 #define TCP_SKB_CB(__skb)       ((struct tcp_skb_cb *)&((__skb)->cb[0]))
 
+
+#if IS_ENABLED(CONFIG_IPV6)
+/* This is the variant of inet6_iif() that must be used by TCP,
+ * as TCP moves IP6CB into a different location in skb->cb[]
+ */
+static inline int tcp_v6_iif(const struct sk_buff *skb)
+{
+        return TCP_SKB_CB(skb)->header.h6.iif;
+}
+#endif
+
 /* Due to TSO, an SKB can be composed of multiple actual
  * packets.  To keep these tracked properly, we use this.
  */
@@ -1666,4 +1676,24 @@ int tcpv4_offload_init(void);
 void tcp_v4_init(void);
 void tcp_init(void);
 
+/*
+ * Save and compile IPv4 options, return a pointer to it
+ */
+static inline struct ip_options_rcu *tcp_v4_save_options(struct sk_buff *skb)
+{
+        const struct ip_options *opt = &TCP_SKB_CB(skb)->header.h4.opt;
+        struct ip_options_rcu *dopt = NULL;
+
+        if (opt->optlen) {
+                int opt_size = sizeof(*dopt) + opt->optlen;
+
+                dopt = kmalloc(opt_size, GFP_ATOMIC);
+                if (dopt && __ip_options_echo(&dopt->opt, skb, opt)) {
+                        kfree(dopt);
+                        dopt = NULL;
+                }
+        }
+        return dopt;
+}
+
 #endif  /* _TCP_H */