Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking updates from David Miller:
 "Here is my initial pull request for the networking subsystem during
  this merge window:

   1) Support for ESN in AH (RFC 4302) from Fan Du.

   2) Add full kernel doc for ethtool command structures, from Ben
      Hutchings.

   3) Add BCM7xxx PHY driver, from Florian Fainelli.

   4) Export computed TCP rate information in netlink socket dumps, from
      Eric Dumazet.

   5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
      Dichtel.

   6) Convert many drivers to pci_enable_msix_range(), from Alexander
      Gordeev.

   7) Record SKB timestamps more efficiently, from Eric Dumazet.

   8) Switch to microsecond resolution for TCP round trip times, also
      from Eric Dumazet.

   9) Clean up and fix 6lowpan fragmentation handling by making use of
      the existing inet_frag api for it's implementation.

  10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

  11) Auto size SKB lengths when composing netlink messages based upon
      past message sizes used, from Eric Dumazet.

  12) qdisc dumps can take a long time, add a cond_resched(), From Eric
      Dumazet.

  13) Sanitize netpoll core and drivers wrt.  SKB handling semantics.
      Get rid of never-used-in-tree netpoll RX handling.  From Eric W
      Biederman.

  14) Support inter-address-family and namespace changing in VTI tunnel
      driver(s).  From Steffen Klassert.

  15) Add Altera TSE driver, from Vince Bridgers.

  16) Optimizing csum_replace2() so that it doesn't adjust the checksum
      by checksumming the entire header, from Eric Dumazet.

  17) Expand BPF internal implementation for faster interpreting, more
      direct translations into JIT'd code, and much cleaner uses of BPF
      filtering in non-socket ocntexts.  From Daniel Borkmann and Alexei
      Starovoitov"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
  netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
  net: Add a test to see if a skb is freeable in irq context
  qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
  net: ptp: move PTP classifier in its own file
  net: sxgbe: make "core_ops" static
  net: sxgbe: fix logical vs bitwise operation
  net: sxgbe: sxgbe_mdio_register() frees the bus
  Call efx_set_channels() before efx->type->dimension_resources()
  xen-netback: disable rogue vif in kthread context
  net/mlx4: Set proper build dependancy with vxlan
  be2net: fix build dependency on VxLAN
  mac802154: make csma/cca parameters per-wpan
  mac802154: allow only one WPAN to be up at any given time
  net: filter: minor: fix kdoc in __sk_run_filter
  netlink: don't compare the nul-termination in nla_strcmp
  can: c_can: Avoid led toggling for every packet.
  can: c_can: Simplify TX interrupt cleanup
  can: c_can: Store dlc private
  can: c_can: Reduce register access
  can: c_can: Make the code readable
  ...

30 files changed, 848 insertions, 366 deletions

diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 677b4f01b2d0..6f76277baf39 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -13,10 +13,17 @@
 #define PHY_ID_BCM5461                  0x002060c0
 #define PHY_ID_BCM57780                 0x03625d90
 
+#define PHY_ID_BCM7366                  0x600d8490
+#define PHY_ID_BCM7439                  0x600d8480
+#define PHY_ID_BCM7445                  0x600d8510
+#define PHY_ID_BCM7XXX_28               0x600d8400
+
 #define PHY_BCM_OUI_MASK                0xfffffc00
 #define PHY_BCM_OUI_1                   0x00206000
 #define PHY_BCM_OUI_2                   0x0143bc00
 #define PHY_BCM_OUI_3                   0x03625c00
+#define PHY_BCM_OUI_4                   0x600d0000
+#define PHY_BCM_OUI_5                   0x03625e00
 
 
 #define PHY_BCM_FLAGS_MODE_COPPER       0x00000001
@@ -31,6 +38,59 @@
 #define PHY_BRCM_EXT_IBND_TX_ENABLE     0x00002000
 #define PHY_BRCM_CLEAR_RGMII_MODE       0x00004000
 #define PHY_BRCM_DIS_TXCRXC_NOENRGY     0x00008000
+/* Broadcom BCM7xxx specific workarounds */
+#define PHY_BRCM_100MBPS_WAR            0x00010000
 #define PHY_BCM_FLAGS_VALID             0x80000000
 
+/* Broadcom BCM54XX register definitions, common to most Broadcom PHYs */
+#define MII_BCM54XX_ECR         0x10    /* BCM54xx extended control register */
+#define MII_BCM54XX_ECR_IM      0x1000  /* Interrupt mask */
+#define MII_BCM54XX_ECR_IF      0x0800  /* Interrupt force */
+
+#define MII_BCM54XX_ESR         0x11    /* BCM54xx extended status register */
+#define MII_BCM54XX_ESR_IS      0x1000  /* Interrupt status */
+
+#define MII_BCM54XX_EXP_DATA    0x15    /* Expansion register data */
+#define MII_BCM54XX_EXP_SEL     0x17    /* Expansion register select */
+#define MII_BCM54XX_EXP_SEL_SSD 0x0e00  /* Secondary SerDes select */
+#define MII_BCM54XX_EXP_SEL_ER  0x0f00  /* Expansion register select */
+
+#define MII_BCM54XX_AUX_CTL     0x18    /* Auxiliary control register */
+#define MII_BCM54XX_ISR         0x1a    /* BCM54xx interrupt status register */
+#define MII_BCM54XX_IMR         0x1b    /* BCM54xx interrupt mask register */
+#define MII_BCM54XX_INT_CRCERR  0x0001  /* CRC error */
+#define MII_BCM54XX_INT_LINK    0x0002  /* Link status changed */
+#define MII_BCM54XX_INT_SPEED   0x0004  /* Link speed change */
+#define MII_BCM54XX_INT_DUPLEX  0x0008  /* Duplex mode changed */
+#define MII_BCM54XX_INT_LRS     0x0010  /* Local receiver status changed */
+#define MII_BCM54XX_INT_RRS     0x0020  /* Remote receiver status changed */
+#define MII_BCM54XX_INT_SSERR   0x0040  /* Scrambler synchronization error */
+#define MII_BCM54XX_INT_UHCD    0x0080  /* Unsupported HCD negotiated */
+#define MII_BCM54XX_INT_NHCD    0x0100  /* No HCD */
+#define MII_BCM54XX_INT_NHCDL   0x0200  /* No HCD link */
+#define MII_BCM54XX_INT_ANPR    0x0400  /* Auto-negotiation page received */
+#define MII_BCM54XX_INT_LC      0x0800  /* All counters below 128 */
+#define MII_BCM54XX_INT_HC      0x1000  /* Counter above 32768 */
+#define MII_BCM54XX_INT_MDIX    0x2000  /* MDIX status change */
+#define MII_BCM54XX_INT_PSERR   0x4000  /* Pair swap error */
+
+#define MII_BCM54XX_SHD         0x1c    /* 0x1c shadow registers */
+#define MII_BCM54XX_SHD_WRITE   0x8000
+#define MII_BCM54XX_SHD_VAL(x)  ((x & 0x1f) << 10)
+#define MII_BCM54XX_SHD_DATA(x) ((x & 0x3ff) << 0)
+
+/*
+ * AUXILIARY CONTROL SHADOW ACCESS REGISTERS.  (PHY REG 0x18)
+ */
+#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL       0x0000
+#define MII_BCM54XX_AUXCTL_ACTL_TX_6DB          0x0400
+#define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA       0x0800
+
+#define MII_BCM54XX_AUXCTL_MISC_WREN    0x8000
+#define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX     0x0200
+#define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC      0x7000
+#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007
+
+#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL       0x0000
+
 #endif /* _LINUX_BRCMPHY_H */
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index fb0ab651a041..3ce5e526525f 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -33,8 +33,9 @@ enum can_mode {
 struct can_priv {
         struct can_device_stats can_stats;
 
-        struct can_bittiming bittiming;
-        const struct can_bittiming_const *bittiming_const;
+        struct can_bittiming bittiming, data_bittiming;
+        const struct can_bittiming_const *bittiming_const,
+                *data_bittiming_const;
         struct can_clock clock;
 
         enum can_state state;
@@ -45,6 +46,7 @@ struct can_priv {
         struct timer_list restart_timer;
 
         int (*do_set_bittiming)(struct net_device *dev);
+        int (*do_set_data_bittiming)(struct net_device *dev);
         int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
         int (*do_get_state)(const struct net_device *dev,
                             enum can_state *state);
@@ -111,6 +113,7 @@ struct can_priv *safe_candev_priv(struct net_device *dev);
 
 int open_candev(struct net_device *dev);
 void close_candev(struct net_device *dev);
+int can_change_mtu(struct net_device *dev, int new_mtu);
 
 int register_candev(struct net_device *dev);
 void unregister_candev(struct net_device *dev);
@@ -124,6 +127,8 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx);
 void can_free_echo_skb(struct net_device *dev, unsigned int idx);
 
 struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf);
+struct sk_buff *alloc_canfd_skb(struct net_device *dev,
+                                struct canfd_frame **cfd);
 struct sk_buff *alloc_can_err_skb(struct net_device *dev,
                                   struct can_frame **cf);
 
diff --git a/include/linux/ethtool.h b/include/linux/ethtool.h
index c8e3e7e39c6b..0a114d05f68d 100644
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
@@ -183,6 +183,9 @@ static inline u32 ethtool_rxfh_indir_default(u32 index, u32 n_rx_rings)
  * hold the RTNL lock.
  *
  * See the structures used by these operations for further documentation.
+ * Note that for all operations using a structure ending with a zero-
+ * length array, the array is allocated separately in the kernel and
+ * is passed to the driver as an additional parameter.
  *
  * See &struct net_device and &struct net_device_ops for documentation
  * of the generic netdev features interface.
diff --git a/include/linux/filter.h b/include/linux/filter.h
index e568c8ef896b..262dcbb75ffe 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -9,28 +9,81 @@
 #include <linux/workqueue.h>
 #include <uapi/linux/filter.h>
 
-#ifdef CONFIG_COMPAT
-/*
- * A struct sock_filter is architecture independent.
+/* Internally used and optimized filter representation with extended
+ * instruction set based on top of classic BPF.
  */
+
+/* instruction classes */
+#define BPF_ALU64       0x07    /* alu mode in double word width */
+
+/* ld/ldx fields */
+#define BPF_DW          0x18    /* double word */
+#define BPF_XADD        0xc0    /* exclusive add */
+
+/* alu/jmp fields */
+#define BPF_MOV         0xb0    /* mov reg to reg */
+#define BPF_ARSH        0xc0    /* sign extending arithmetic shift right */
+
+/* change endianness of a register */
+#define BPF_END         0xd0    /* flags for endianness conversion: */
+#define BPF_TO_LE       0x00    /* convert to little-endian */
+#define BPF_TO_BE       0x08    /* convert to big-endian */
+#define BPF_FROM_LE     BPF_TO_LE
+#define BPF_FROM_BE     BPF_TO_BE
+
+#define BPF_JNE         0x50    /* jump != */
+#define BPF_JSGT        0x60    /* SGT is signed '>', GT in x86 */
+#define BPF_JSGE        0x70    /* SGE is signed '>=', GE in x86 */
+#define BPF_CALL        0x80    /* function call */
+#define BPF_EXIT        0x90    /* function return */
+
+/* BPF has 10 general purpose 64-bit registers and stack frame. */
+#define MAX_BPF_REG     11
+
+/* BPF program can access up to 512 bytes of stack space. */
+#define MAX_BPF_STACK   512
+
+/* Arg1, context and stack frame pointer register positions. */
+#define ARG1_REG        1
+#define CTX_REG         6
+#define FP_REG          10
+
+struct sock_filter_int {
+        __u8    code;           /* opcode */
+        __u8    a_reg:4;        /* dest register */
+        __u8    x_reg:4;        /* source register */
+        __s16   off;            /* signed offset */
+        __s32   imm;            /* signed immediate constant */
+};
+
+#ifdef CONFIG_COMPAT
+/* A struct sock_filter is architecture independent. */
 struct compat_sock_fprog {
         u16             len;
-        compat_uptr_t   filter;         /* struct sock_filter * */
+        compat_uptr_t   filter; /* struct sock_filter * */
 };
 #endif
 
+struct sock_fprog_kern {
+        u16                     len;
+        struct sock_filter      *filter;
+};
+
 struct sk_buff;
 struct sock;
+struct seccomp_data;
 
-struct sk_filter
-{
+struct sk_filter {
         atomic_t                refcnt;
-        unsigned int            len;    /* Number of filter blocks */
+        u32                     jited:1,        /* Is our filter JIT'ed? */
+                                len:31;         /* Number of filter blocks */
+        struct sock_fprog_kern  *orig_prog;     /* Original BPF program */
         struct rcu_head         rcu;
         unsigned int            (*bpf_func)(const struct sk_buff *skb,
-                                            const struct sock_filter *filter);
+                                            const struct sock_filter_int *filter);
         union {
-                struct sock_filter      insns[0];
+                struct sock_filter      insns[0];
+                struct sock_filter_int  insnsi[0];
                 struct work_struct      work;
         };
 };
@@ -41,25 +94,44 @@ static inline unsigned int sk_filter_size(unsigned int proglen)
                    offsetof(struct sk_filter, insns[proglen]));
 }
 
-extern int sk_filter(struct sock *sk, struct sk_buff *skb);
-extern unsigned int sk_run_filter(const struct sk_buff *skb,
-                                  const struct sock_filter *filter);
-extern int sk_unattached_filter_create(struct sk_filter **pfp,
-                                       struct sock_fprog *fprog);
-extern void sk_unattached_filter_destroy(struct sk_filter *fp);
-extern int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
-extern int sk_detach_filter(struct sock *sk);
-extern int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
-extern int sk_get_filter(struct sock *sk, struct sock_filter __user *filter, unsigned len);
-extern void sk_decode_filter(struct sock_filter *filt, struct sock_filter *to);
+#define sk_filter_proglen(fprog)                        \
+                (fprog->len * sizeof(fprog->filter[0]))
+
+#define SK_RUN_FILTER(filter, ctx)                      \
+                (*filter->bpf_func)(ctx, filter->insnsi)
+
+int sk_filter(struct sock *sk, struct sk_buff *skb);
+
+u32 sk_run_filter_int_seccomp(const struct seccomp_data *ctx,
+                              const struct sock_filter_int *insni);
+u32 sk_run_filter_int_skb(const struct sk_buff *ctx,
+                          const struct sock_filter_int *insni);
+
+int sk_convert_filter(struct sock_filter *prog, int len,
+                      struct sock_filter_int *new_prog, int *new_len);
+
+int sk_unattached_filter_create(struct sk_filter **pfp,
+                                struct sock_fprog *fprog);
+void sk_unattached_filter_destroy(struct sk_filter *fp);
+
+int sk_attach_filter(struct sock_fprog *fprog, struct sock *sk);
+int sk_detach_filter(struct sock *sk);
+
+int sk_chk_filter(struct sock_filter *filter, unsigned int flen);
+int sk_get_filter(struct sock *sk, struct sock_filter __user *filter,
+                  unsigned int len);
+void sk_decode_filter(struct sock_filter *filt, struct sock_filter *to);
+
+void sk_filter_charge(struct sock *sk, struct sk_filter *fp);
+void sk_filter_uncharge(struct sock *sk, struct sk_filter *fp);
 
 #ifdef CONFIG_BPF_JIT
 #include <stdarg.h>
 #include <linux/linkage.h>
 #include <linux/printk.h>
 
-extern void bpf_jit_compile(struct sk_filter *fp);
-extern void bpf_jit_free(struct sk_filter *fp);
+void bpf_jit_compile(struct sk_filter *fp);
+void bpf_jit_free(struct sk_filter *fp);
 
 static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
                                 u32 pass, void *image)
@@ -70,7 +142,6 @@ static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
                 print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_OFFSET,
                                16, 1, image, proglen, false);
 }
-#define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns)
 #else
 #include <linux/slab.h>
 static inline void bpf_jit_compile(struct sk_filter *fp)
@@ -80,7 +151,6 @@ static inline void bpf_jit_free(struct sk_filter *fp)
 {
         kfree(fp);
 }
-#define SK_RUN_FILTER(FILTER, SKB) sk_run_filter(SKB, FILTER->insns)
 #endif
 
 static inline int bpf_tell_extensions(void)
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index e526a8cecb70..f194ccb8539c 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -154,6 +154,10 @@ static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
    802.11e clarifies the figure in section 7.1.2. The frame body is
    up to 2304 octets long (maximum MSDU size) plus any crypt overhead. */
 #define IEEE80211_MAX_DATA_LEN          2304
+/* 802.11ad extends maximum MSDU size for DMG (freq > 40Ghz) networks
+ * to 7920 bytes, see 8.2.3 General frame format
+ */
+#define IEEE80211_MAX_DATA_LEN_DMG      7920
 /* 30 byte 4 addr hdr, 2 byte QoS, 2304 byte MSDU, 12 byte crypt, 4 byte FCS */
 #define IEEE80211_MAX_FRAME_LEN         2352
 
@@ -597,6 +601,20 @@ static inline int ieee80211_is_qos_nullfunc(__le16 fc)
 }
 
 /**
+ * ieee80211_is_bufferable_mmpdu - check if frame is bufferable MMPDU
+ * @fc: frame control field in little-endian byteorder
+ */
+static inline bool ieee80211_is_bufferable_mmpdu(__le16 fc)
+{
+        /* IEEE 802.11-2012, definition of "bufferable management frame";
+         * note that this ignores the IBSS special case. */
+        return ieee80211_is_mgmt(fc) &&
+               (ieee80211_is_action(fc) ||
+                ieee80211_is_disassoc(fc) ||
+                ieee80211_is_deauth(fc));
+}
+
+/**
  * ieee80211_is_first_frag - check if IEEE80211_SCTL_FRAG is not set
  * @seq_ctrl: frame sequence control bytes in little-endian byteorder
  */
@@ -1636,51 +1654,22 @@ enum ieee80211_reasoncode {
 enum ieee80211_eid {
         WLAN_EID_SSID = 0,
         WLAN_EID_SUPP_RATES = 1,
-        WLAN_EID_FH_PARAMS = 2,
+        WLAN_EID_FH_PARAMS = 2, /* reserved now */
         WLAN_EID_DS_PARAMS = 3,
         WLAN_EID_CF_PARAMS = 4,
         WLAN_EID_TIM = 5,
         WLAN_EID_IBSS_PARAMS = 6,
-        WLAN_EID_CHALLENGE = 16,
-
         WLAN_EID_COUNTRY = 7,
         WLAN_EID_HP_PARAMS = 8,
         WLAN_EID_HP_TABLE = 9,
         WLAN_EID_REQUEST = 10,
-
         WLAN_EID_QBSS_LOAD = 11,
         WLAN_EID_EDCA_PARAM_SET = 12,
         WLAN_EID_TSPEC = 13,
         WLAN_EID_TCLAS = 14,
         WLAN_EID_SCHEDULE = 15,
-        WLAN_EID_TS_DELAY = 43,
-        WLAN_EID_TCLAS_PROCESSING = 44,
-        WLAN_EID_QOS_CAPA = 46,
-        /* 802.11z */
-        WLAN_EID_LINK_ID = 101,
-        /* 802.11s */
-        WLAN_EID_MESH_CONFIG = 113,
-        WLAN_EID_MESH_ID = 114,
-        WLAN_EID_LINK_METRIC_REPORT = 115,
-        WLAN_EID_CONGESTION_NOTIFICATION = 116,
-        WLAN_EID_PEER_MGMT = 117,
-        WLAN_EID_CHAN_SWITCH_PARAM = 118,
-        WLAN_EID_MESH_AWAKE_WINDOW = 119,
-        WLAN_EID_BEACON_TIMING = 120,
-        WLAN_EID_MCCAOP_SETUP_REQ = 121,
-        WLAN_EID_MCCAOP_SETUP_RESP = 122,
-        WLAN_EID_MCCAOP_ADVERT = 123,
-        WLAN_EID_MCCAOP_TEARDOWN = 124,
-        WLAN_EID_GANN = 125,
-        WLAN_EID_RANN = 126,
-        WLAN_EID_PREQ = 130,
-        WLAN_EID_PREP = 131,
-        WLAN_EID_PERR = 132,
-        WLAN_EID_PXU = 137,
-        WLAN_EID_PXUC = 138,
-        WLAN_EID_AUTH_MESH_PEER_EXCH = 139,
-        WLAN_EID_MIC = 140,
-
+        WLAN_EID_CHALLENGE = 16,
+        /* 17-31 reserved for challenge text extension */
         WLAN_EID_PWR_CONSTRAINT = 32,
         WLAN_EID_PWR_CAPABILITY = 33,
         WLAN_EID_TPC_REQUEST = 34,
@@ -1691,66 +1680,114 @@ enum ieee80211_eid {
         WLAN_EID_MEASURE_REPORT = 39,
         WLAN_EID_QUIET = 40,
         WLAN_EID_IBSS_DFS = 41,
-
         WLAN_EID_ERP_INFO = 42,
-        WLAN_EID_EXT_SUPP_RATES = 50,
-
+        WLAN_EID_TS_DELAY = 43,
+        WLAN_EID_TCLAS_PROCESSING = 44,
         WLAN_EID_HT_CAPABILITY = 45,
-        WLAN_EID_HT_OPERATION = 61,
-        WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
-
+        WLAN_EID_QOS_CAPA = 46,
+        /* 47 reserved for Broadcom */
         WLAN_EID_RSN = 48,
-        WLAN_EID_MMIE = 76,
-        WLAN_EID_VENDOR_SPECIFIC = 221,
-        WLAN_EID_QOS_PARAMETER = 222,
-
+        WLAN_EID_802_15_COEX = 49,
+        WLAN_EID_EXT_SUPP_RATES = 50,
         WLAN_EID_AP_CHAN_REPORT = 51,
         WLAN_EID_NEIGHBOR_REPORT = 52,
         WLAN_EID_RCPI = 53,
+        WLAN_EID_MOBILITY_DOMAIN = 54,
+        WLAN_EID_FAST_BSS_TRANSITION = 55,
+        WLAN_EID_TIMEOUT_INTERVAL = 56,
+        WLAN_EID_RIC_DATA = 57,
+        WLAN_EID_DSE_REGISTERED_LOCATION = 58,
+        WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
+        WLAN_EID_EXT_CHANSWITCH_ANN = 60,
+        WLAN_EID_HT_OPERATION = 61,
+        WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
         WLAN_EID_BSS_AVG_ACCESS_DELAY = 63,
         WLAN_EID_ANTENNA_INFO = 64,
         WLAN_EID_RSNI = 65,
         WLAN_EID_MEASUREMENT_PILOT_TX_INFO = 66,
         WLAN_EID_BSS_AVAILABLE_CAPACITY = 67,
         WLAN_EID_BSS_AC_ACCESS_DELAY = 68,
+        WLAN_EID_TIME_ADVERTISEMENT = 69,
         WLAN_EID_RRM_ENABLED_CAPABILITIES = 70,
         WLAN_EID_MULTIPLE_BSSID = 71,
         WLAN_EID_BSS_COEX_2040 = 72,
         WLAN_EID_OVERLAP_BSS_SCAN_PARAM = 74,
-        WLAN_EID_EXT_CAPABILITY = 127,
-
-        WLAN_EID_MOBILITY_DOMAIN = 54,
-        WLAN_EID_FAST_BSS_TRANSITION = 55,
-        WLAN_EID_TIMEOUT_INTERVAL = 56,
-        WLAN_EID_RIC_DATA = 57,
         WLAN_EID_RIC_DESCRIPTOR = 75,
-
-        WLAN_EID_DSE_REGISTERED_LOCATION = 58,
-        WLAN_EID_SUPPORTED_REGULATORY_CLASSES = 59,
-        WLAN_EID_EXT_CHANSWITCH_ANN = 60,
-
-        WLAN_EID_VHT_CAPABILITY = 191,
-        WLAN_EID_VHT_OPERATION = 192,
-        WLAN_EID_OPMODE_NOTIF = 199,
-        WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
-        WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
-        WLAN_EID_EXTENDED_BSS_LOAD = 193,
-        WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
-        WLAN_EID_AID = 197,
-        WLAN_EID_QUIET_CHANNEL = 198,
-
-        /* 802.11ad */
+        WLAN_EID_MMIE = 76,
+        WLAN_EID_ASSOC_COMEBACK_TIME = 77,
+        WLAN_EID_EVENT_REQUEST = 78,
+        WLAN_EID_EVENT_REPORT = 79,
+        WLAN_EID_DIAGNOSTIC_REQUEST = 80,
+        WLAN_EID_DIAGNOSTIC_REPORT = 81,
+        WLAN_EID_LOCATION_PARAMS = 82,
         WLAN_EID_NON_TX_BSSID_CAP =  83,
+        WLAN_EID_SSID_LIST = 84,
+        WLAN_EID_MULTI_BSSID_IDX = 85,
+        WLAN_EID_FMS_DESCRIPTOR = 86,
+        WLAN_EID_FMS_REQUEST = 87,
+        WLAN_EID_FMS_RESPONSE = 88,
+        WLAN_EID_QOS_TRAFFIC_CAPA = 89,
+        WLAN_EID_BSS_MAX_IDLE_PERIOD = 90,
+        WLAN_EID_TSF_REQUEST = 91,
+        WLAN_EID_TSF_RESPOSNE = 92,
+        WLAN_EID_WNM_SLEEP_MODE = 93,
+        WLAN_EID_TIM_BCAST_REQ = 94,
+        WLAN_EID_TIM_BCAST_RESP = 95,
+        WLAN_EID_COLL_IF_REPORT = 96,
+        WLAN_EID_CHANNEL_USAGE = 97,
+        WLAN_EID_TIME_ZONE = 98,
+        WLAN_EID_DMS_REQUEST = 99,
+        WLAN_EID_DMS_RESPONSE = 100,
+        WLAN_EID_LINK_ID = 101,
+        WLAN_EID_WAKEUP_SCHEDUL = 102,
+        /* 103 reserved */
+        WLAN_EID_CHAN_SWITCH_TIMING = 104,
+        WLAN_EID_PTI_CONTROL = 105,
+        WLAN_EID_PU_BUFFER_STATUS = 106,
+        WLAN_EID_INTERWORKING = 107,
+        WLAN_EID_ADVERTISEMENT_PROTOCOL = 108,
+        WLAN_EID_EXPEDITED_BW_REQ = 109,
+        WLAN_EID_QOS_MAP_SET = 110,
+        WLAN_EID_ROAMING_CONSORTIUM = 111,
+        WLAN_EID_EMERGENCY_ALERT = 112,
+        WLAN_EID_MESH_CONFIG = 113,
+        WLAN_EID_MESH_ID = 114,
+        WLAN_EID_LINK_METRIC_REPORT = 115,
+        WLAN_EID_CONGESTION_NOTIFICATION = 116,
+        WLAN_EID_PEER_MGMT = 117,
+        WLAN_EID_CHAN_SWITCH_PARAM = 118,
+        WLAN_EID_MESH_AWAKE_WINDOW = 119,
+        WLAN_EID_BEACON_TIMING = 120,
+        WLAN_EID_MCCAOP_SETUP_REQ = 121,
+        WLAN_EID_MCCAOP_SETUP_RESP = 122,
+        WLAN_EID_MCCAOP_ADVERT = 123,
+        WLAN_EID_MCCAOP_TEARDOWN = 124,
+        WLAN_EID_GANN = 125,
+        WLAN_EID_RANN = 126,
+        WLAN_EID_EXT_CAPABILITY = 127,
+        /* 128, 129 reserved for Agere */
+        WLAN_EID_PREQ = 130,
+        WLAN_EID_PREP = 131,
+        WLAN_EID_PERR = 132,
+        /* 133-136 reserved for Cisco */
+        WLAN_EID_PXU = 137,
+        WLAN_EID_PXUC = 138,
+        WLAN_EID_AUTH_MESH_PEER_EXCH = 139,
+        WLAN_EID_MIC = 140,
+        WLAN_EID_DESTINATION_URI = 141,
+        WLAN_EID_UAPSD_COEX = 142,
         WLAN_EID_WAKEUP_SCHEDULE = 143,
         WLAN_EID_EXT_SCHEDULE = 144,
         WLAN_EID_STA_AVAILABILITY = 145,
         WLAN_EID_DMG_TSPEC = 146,
         WLAN_EID_DMG_AT = 147,
         WLAN_EID_DMG_CAP = 148,
+        /* 149-150 reserved for Cisco */
         WLAN_EID_DMG_OPERATION = 151,
         WLAN_EID_DMG_BSS_PARAM_CHANGE = 152,
         WLAN_EID_DMG_BEAM_REFINEMENT = 153,
         WLAN_EID_CHANNEL_MEASURE_FEEDBACK = 154,
+        /* 155-156 reserved for Cisco */
         WLAN_EID_AWAKE_WINDOW = 157,
         WLAN_EID_MULTI_BAND = 158,
         WLAN_EID_ADDBA_EXT = 159,
@@ -1767,11 +1804,34 @@ enum ieee80211_eid {
         WLAN_EID_MULTIPLE_MAC_ADDR = 170,
         WLAN_EID_U_PID = 171,
         WLAN_EID_DMG_LINK_ADAPT_ACK = 172,
+        /* 173 reserved for Symbol */
+        WLAN_EID_MCCAOP_ADV_OVERVIEW = 174,
         WLAN_EID_QUIET_PERIOD_REQ = 175,
+        /* 176 reserved for Symbol */
         WLAN_EID_QUIET_PERIOD_RESP = 177,
+        /* 178-179 reserved for Symbol */
+        /* 180 reserved for ISO/IEC 20011 */
         WLAN_EID_EPAC_POLICY = 182,
         WLAN_EID_CLISTER_TIME_OFF = 183,
+        WLAN_EID_INTER_AC_PRIO = 184,
+        WLAN_EID_SCS_DESCRIPTOR = 185,
+        WLAN_EID_QLOAD_REPORT = 186,
+        WLAN_EID_HCCA_TXOP_UPDATE_COUNT = 187,
+        WLAN_EID_HL_STREAM_ID = 188,
+        WLAN_EID_GCR_GROUP_ADDR = 189,
         WLAN_EID_ANTENNA_SECTOR_ID_PATTERN = 190,
+        WLAN_EID_VHT_CAPABILITY = 191,
+        WLAN_EID_VHT_OPERATION = 192,
+        WLAN_EID_EXTENDED_BSS_LOAD = 193,
+        WLAN_EID_WIDE_BW_CHANNEL_SWITCH = 194,
+        WLAN_EID_VHT_TX_POWER_ENVELOPE = 195,
+        WLAN_EID_CHANNEL_SWITCH_WRAPPER = 196,
+        WLAN_EID_AID = 197,
+        WLAN_EID_QUIET_CHANNEL = 198,
+        WLAN_EID_OPMODE_NOTIF = 199,
+
+        WLAN_EID_VENDOR_SPECIFIC = 221,
+        WLAN_EID_QOS_PARAMETER = 222,
 };
 
 /* Action category code */
@@ -2192,10 +2252,10 @@ static inline u8 *ieee80211_get_DA(struct ieee80211_hdr *hdr)
 }
 
 /**
- * ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
+ * _ieee80211_is_robust_mgmt_frame - check if frame is a robust management frame
  * @hdr: the frame (buffer must include at least the first octet of payload)
  */
-static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
+static inline bool _ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
 {
         if (ieee80211_is_disassoc(hdr->frame_control) ||
             ieee80211_is_deauth(hdr->frame_control))
@@ -2224,6 +2284,17 @@ static inline bool ieee80211_is_robust_mgmt_frame(struct ieee80211_hdr *hdr)
 }
 
 /**
+ * ieee80211_is_robust_mgmt_frame - check if skb contains a robust mgmt frame
+ * @skb: the skb containing the frame, length will be checked
+ */
+static inline bool ieee80211_is_robust_mgmt_frame(struct sk_buff *skb)
+{
+        if (skb->len < 25)
+                return false;
+        return _ieee80211_is_robust_mgmt_frame((void *)skb->data);
+}
+
+/**
  * ieee80211_is_public_action - check if frame is a public action frame
  * @hdr: the frame
  * @len: length of the frame
@@ -2241,42 +2312,6 @@ static inline bool ieee80211_is_public_action(struct ieee80211_hdr *hdr,
 }
 
 /**
- * ieee80211_dsss_chan_to_freq - get channel center frequency
- * @channel: the DSSS channel
- *
- * Convert IEEE802.11 DSSS channel to the center frequency (MHz).
- * Ref IEEE 802.11-2007 section 15.6
- */
-static inline int ieee80211_dsss_chan_to_freq(int channel)
-{
-        if ((channel > 0) && (channel < 14))
-                return 2407 + (channel * 5);
-        else if (channel == 14)
-                return 2484;
-        else
-                return -1;
-}
-
-/**
- * ieee80211_freq_to_dsss_chan - get channel
- * @freq: the frequency
- *
- * Convert frequency (MHz) to IEEE802.11 DSSS channel
- * Ref IEEE 802.11-2007 section 15.6
- *
- * This routine selects the channel with the closest center frequency.
- */
-static inline int ieee80211_freq_to_dsss_chan(int freq)
-{
-        if ((freq >= 2410) && (freq < 2475))
-                return (freq - 2405) / 5;
-        else if ((freq >= 2482) && (freq < 2487))
-                return 14;
-        else
-                return -1;
-}
-
-/**
  * ieee80211_tu_to_usec - convert time units (TU) to microseconds
  * @tu: the TUs
  */
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index bbedfb56bd66..13bbbde00e68 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -110,6 +110,7 @@ extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
                                                __be16 vlan_proto, u16 vlan_id);
 extern struct net_device *vlan_dev_real_dev(const struct net_device *dev);
 extern u16 vlan_dev_vlan_id(const struct net_device *dev);
+extern __be16 vlan_dev_vlan_proto(const struct net_device *dev);
 
 /**
  *      struct vlan_priority_tci_mapping - vlan egress priority mappings
@@ -216,6 +217,12 @@ static inline u16 vlan_dev_vlan_id(const struct net_device *dev)
         return 0;
 }
 
+static inline __be16 vlan_dev_vlan_proto(const struct net_device *dev)
+{
+        BUG();
+        return 0;
+}
+
 static inline u16 vlan_dev_get_egress_qos_mask(struct net_device *dev,
                                                u32 skprio)
 {
@@ -288,7 +295,7 @@ static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb,
         struct vlan_ethhdr *veth;
 
         if (skb_cow_head(skb, VLAN_HLEN) < 0) {
-                kfree_skb(skb);
+                dev_kfree_skb_any(skb);
                 return NULL;
         }
         veth = (struct vlan_ethhdr *)skb_push(skb, VLAN_HLEN);
diff --git a/include/linux/isdn_ppp.h b/include/linux/isdn_ppp.h
index d5f62bc5f4be..8e10f57f109f 100644
--- a/include/linux/isdn_ppp.h
+++ b/include/linux/isdn_ppp.h
@@ -180,9 +180,8 @@ struct ippp_struct {
   struct slcompress *slcomp;
 #endif
 #ifdef CONFIG_IPPP_FILTER
-  struct sock_filter *pass_filter;      /* filter for packets to pass */
-  struct sock_filter *active_filter;    /* filter for pkts to reset idle */
-  unsigned pass_len, active_len;
+  struct sk_filter *pass_filter;   /* filter for packets to pass */
+  struct sk_filter *active_filter; /* filter for pkts to reset idle */
 #endif
   unsigned long debug;
   struct isdn_ppp_compressor *compressor,*decompressor;
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 2cf1547096d9..51e26f3cd3b3 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -23,6 +23,7 @@
 #define TEMP_MINOR              131     /* Temperature Sensor */
 #define RTC_MINOR               135
 #define EFI_RTC_MINOR           136     /* EFI Time services */
+#define VHCI_MINOR              137
 #define SUN_OPENPROM_MINOR      139
 #define DMAPI_MINOR             140     /* unused */
 #define NVRAM_MINOR             144
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 79a347238168..c8450366c130 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -125,6 +125,7 @@ enum {
         /* miscellaneous commands */
         MLX4_CMD_DIAG_RPRT       = 0x30,
         MLX4_CMD_NOP             = 0x31,
+        MLX4_CMD_CONFIG_DEV      = 0x3a,
         MLX4_CMD_ACCESS_MEM      = 0x2e,
         MLX4_CMD_SET_VEP         = 0x52,
 
@@ -240,6 +241,13 @@ int mlx4_set_vf_vlan(struct mlx4_dev *dev, int port, int vf, u16 vlan, u8 qos);
 int mlx4_set_vf_spoofchk(struct mlx4_dev *dev, int port, int vf, bool setting);
 int mlx4_get_vf_config(struct mlx4_dev *dev, int port, int vf, struct ifla_vf_info *ivf);
 int mlx4_set_vf_link_state(struct mlx4_dev *dev, int port, int vf, int link_state);
+/*
+ * mlx4_get_slave_default_vlan -
+ * return true if VST ( default vlan)
+ * if VST, will return vlan & qos (if not NULL)
+ */
+bool mlx4_get_slave_default_vlan(struct mlx4_dev *dev, int port, int slave,
+                                 u16 *vlan, u8 *qos);
 
 #define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)
 
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 5edd2c68274d..ba87bd21295a 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -48,6 +48,9 @@
 #define MSIX_LEGACY_SZ          4
 #define MIN_MSIX_P_PORT         5
 
+#define MLX4_ROCE_MAX_GIDS      128
+#define MLX4_ROCE_PF_GIDS       16
+
 enum {
         MLX4_FLAG_MSI_X         = 1 << 0,
         MLX4_FLAG_OLD_PORT_CMDS = 1 << 1,
@@ -81,6 +84,7 @@ enum {
 enum {
         MLX4_MAX_NUM_PF         = 16,
         MLX4_MAX_NUM_VF         = 64,
+        MLX4_MAX_NUM_VF_P_PORT  = 64,
         MLX4_MFUNC_MAX          = 80,
         MLX4_MAX_EQ_NUM         = 1024,
         MLX4_MFUNC_EQ_NUM       = 4,
@@ -629,7 +633,8 @@ struct mlx4_eth_av {
         u8              hop_limit;
         __be32          sl_tclass_flowlabel;
         u8              dgid[16];
-        u32             reserved4[2];
+        u8              s_mac[6];
+        u8              reserved4[2];
         __be16          vlan;
         u8              mac[ETH_ALEN];
 };
@@ -660,6 +665,11 @@ struct mlx4_quotas {
         int xrcd;
 };
 
+struct mlx4_vf_dev {
+        u8                      min_port;
+        u8                      n_ports;
+};
+
 struct mlx4_dev {
         struct pci_dev         *pdev;
         unsigned long           flags;
@@ -675,6 +685,7 @@ struct mlx4_dev {
         int                     oper_log_mgm_entry_size;
         u64                     regid_promisc_array[MLX4_MAX_PORTS + 1];
         u64                     regid_allmulti_array[MLX4_MAX_PORTS + 1];
+        struct mlx4_vf_dev     *dev_vfs;
 };
 
 struct mlx4_eqe {
@@ -1131,7 +1142,7 @@ int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
 int mlx4_SET_PORT_PRIO2TC(struct mlx4_dev *dev, u8 port, u8 *prio2tc);
 int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw,
                 u8 *pg, u16 *ratelimit);
-int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering);
+int mlx4_SET_PORT_VXLAN(struct mlx4_dev *dev, u8 port, u8 steering, int enable);
 int mlx4_find_cached_mac(struct mlx4_dev *dev, u8 port, u64 mac, int *idx);
 int mlx4_find_cached_vlan(struct mlx4_dev *dev, u8 port, u16 vid, int *idx);
 int mlx4_register_vlan(struct mlx4_dev *dev, u8 port, u16 vlan, int *index);
@@ -1183,9 +1194,44 @@ int set_and_calc_slave_port_state(struct mlx4_dev *dev, int slave, u8 port, int
 void mlx4_put_slave_node_guid(struct mlx4_dev *dev, int slave, __be64 guid);
 __be64 mlx4_get_slave_node_guid(struct mlx4_dev *dev, int slave);
 
+int mlx4_get_slave_from_roce_gid(struct mlx4_dev *dev, int port, u8 *gid,
+                                 int *slave_id);
+int mlx4_get_roce_gid_from_slave(struct mlx4_dev *dev, int port, int slave_id,
+                                 u8 *gid);
+
 int mlx4_FLOW_STEERING_IB_UC_QP_RANGE(struct mlx4_dev *dev, u32 min_range_qpn,
                                       u32 max_range_qpn);
 
 cycle_t mlx4_read_clock(struct mlx4_dev *dev);
 
+struct mlx4_active_ports {
+        DECLARE_BITMAP(ports, MLX4_MAX_PORTS);
+};
+/* Returns a bitmap of the physical ports which are assigned to slave */
+struct mlx4_active_ports mlx4_get_active_ports(struct mlx4_dev *dev, int slave);
+
+/* Returns the physical port that represents the virtual port of the slave, */
+/* or a value < 0 in case of an error. If a slave has 2 ports, the identity */
+/* mapping is returned.                                                     */
+int mlx4_slave_convert_port(struct mlx4_dev *dev, int slave, int port);
+
+struct mlx4_slaves_pport {
+        DECLARE_BITMAP(slaves, MLX4_MFUNC_MAX);
+};
+/* Returns a bitmap of all slaves that are assigned to port. */
+struct mlx4_slaves_pport mlx4_phys_to_slaves_pport(struct mlx4_dev *dev,
+                                                   int port);
+
+/* Returns a bitmap of all slaves that are assigned exactly to all the */
+/* the ports that are set in crit_ports.                               */
+struct mlx4_slaves_pport mlx4_phys_to_slaves_pport_actv(
+                struct mlx4_dev *dev,
+                const struct mlx4_active_ports *crit_ports);
+
+/* Returns the slave's virtual port that represents the physical port. */
+int mlx4_phys_to_slave_port(struct mlx4_dev *dev, int slave, int port);
+
+int mlx4_get_base_gid_ix(struct mlx4_dev *dev, int slave, int port);
+
+int mlx4_config_vxlan_port(struct mlx4_dev *dev, __be16 udp_port);
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/mlx4/driver.h b/include/linux/mlx4/driver.h
index c257e1b211be..022055c8fb26 100644
--- a/include/linux/mlx4/driver.h
+++ b/include/linux/mlx4/driver.h
@@ -64,4 +64,16 @@ void mlx4_unregister_interface(struct mlx4_interface *intf);
 
 void *mlx4_get_protocol_dev(struct mlx4_dev *dev, enum mlx4_protocol proto, int port);
 
+static inline u64 mlx4_mac_to_u64(u8 *addr)
+{
+        u64 mac = 0;
+        int i;
+
+        for (i = 0; i < ETH_ALEN; i++) {
+                mac <<= 8;
+                mac |= addr[i];
+        }
+        return mac;
+}
+
 #endif /* MLX4_DRIVER_H */
diff --git a/include/linux/mlx4/qp.h b/include/linux/mlx4/qp.h
index 59f8ba84568b..b66e7610d4ee 100644
--- a/include/linux/mlx4/qp.h
+++ b/include/linux/mlx4/qp.h
@@ -270,9 +270,14 @@ enum {
 
 struct mlx4_wqe_ctrl_seg {
         __be32                  owner_opcode;
-        __be16                  vlan_tag;
-        u8                      ins_vlan;
-        u8                      fence_size;
+        union {
+                struct {
+                        __be16                  vlan_tag;
+                        u8                      ins_vlan;
+                        u8                      fence_size;
+                };
+                __be32                  bf_qpn;
+        };
         /*
          * High 24 bits are SRC remote buffer; low 8 bits are flags:
          * [7]   SO (strong ordering)
diff --git a/include/linux/mmc/sdio_ids.h b/include/linux/mmc/sdio_ids.h
index d8836623f36a..0f01fe065424 100644
--- a/include/linux/mmc/sdio_ids.h
+++ b/include/linux/mmc/sdio_ids.h
@@ -31,6 +31,7 @@
 #define SDIO_DEVICE_ID_BROADCOM_4334            0x4334
 #define SDIO_DEVICE_ID_BROADCOM_4335_4339       0x4335
 #define SDIO_DEVICE_ID_BROADCOM_43362           43362
+#define SDIO_DEVICE_ID_BROADCOM_4354            0x4354
 
 #define SDIO_VENDOR_ID_INTEL                    0x0089
 #define SDIO_DEVICE_ID_INTEL_IWMC3200WIMAX      0x1402
diff --git a/include/linux/mpls.h b/include/linux/mpls.h
new file mode 100644
index 000000000000..9999145bc190
--- /dev/null
+++ b/include/linux/mpls.h
@@ -0,0 +1,6 @@
+#ifndef _LINUX_MPLS_H
+#define _LINUX_MPLS_H
+
+#include <uapi/linux/mpls.h>
+
+#endif  /* _LINUX_MPLS_H */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index daafd9561cbc..775cc956ff78 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -63,13 +63,6 @@ struct wireless_dev;
 void netdev_set_default_ethtool_ops(struct net_device *dev,
                                     const struct ethtool_ops *ops);
 
-/* hardware address assignment types */
-#define NET_ADDR_PERM           0       /* address is permanent (default) */
-#define NET_ADDR_RANDOM         1       /* address is generated randomly */
-#define NET_ADDR_STOLEN         2       /* address is stolen from other device */
-#define NET_ADDR_SET            3       /* address is set using
-                                         * dev_set_mac_address() */
-
 /* Backlog congestion levels */
 #define NET_RX_SUCCESS          0       /* keep 'em coming, baby */
 #define NET_RX_DROP             1       /* packet dropped */
@@ -1037,8 +1030,7 @@ struct net_device_ops {
 #ifdef CONFIG_NET_POLL_CONTROLLER
         void                    (*ndo_poll_controller)(struct net_device *dev);
         int                     (*ndo_netpoll_setup)(struct net_device *dev,
-                                                     struct netpoll_info *info,
-                                                     gfp_t gfp);
+                                                     struct netpoll_info *info);
         void                    (*ndo_netpoll_cleanup)(struct net_device *dev);
 #endif
 #ifdef CONFIG_NET_RX_BUSY_POLL
@@ -1147,6 +1139,89 @@ struct net_device_ops {
                                                         void *priv);
 };
 
+/**
+ * enum net_device_priv_flags - &struct net_device priv_flags
+ *
+ * These are the &struct net_device, they are only set internally
+ * by drivers and used in the kernel. These flags are invisible to
+ * userspace, this means that the order of these flags can change
+ * during any kernel release.
+ *
+ * You should have a pretty good reason to be extending these flags.
+ *
+ * @IFF_802_1Q_VLAN: 802.1Q VLAN device
+ * @IFF_EBRIDGE: Ethernet bridging device
+ * @IFF_SLAVE_INACTIVE: bonding slave not the curr. active
+ * @IFF_MASTER_8023AD: bonding master, 802.3ad
+ * @IFF_MASTER_ALB: bonding master, balance-alb
+ * @IFF_BONDING: bonding master or slave
+ * @IFF_SLAVE_NEEDARP: need ARPs for validation
+ * @IFF_ISATAP: ISATAP interface (RFC4214)
+ * @IFF_MASTER_ARPMON: bonding master, ARP mon in use
+ * @IFF_WAN_HDLC: WAN HDLC device
+ * @IFF_XMIT_DST_RELEASE: dev_hard_start_xmit() is allowed to
+ *      release skb->dst
+ * @IFF_DONT_BRIDGE: disallow bridging this ether dev
+ * @IFF_DISABLE_NETPOLL: disable netpoll at run-time
+ * @IFF_MACVLAN_PORT: device used as macvlan port
+ * @IFF_BRIDGE_PORT: device used as bridge port
+ * @IFF_OVS_DATAPATH: device used as Open vSwitch datapath port
+ * @IFF_TX_SKB_SHARING: The interface supports sharing skbs on transmit
+ * @IFF_UNICAST_FLT: Supports unicast filtering
+ * @IFF_TEAM_PORT: device used as team port
+ * @IFF_SUPP_NOFCS: device supports sending custom FCS
+ * @IFF_LIVE_ADDR_CHANGE: device supports hardware address
+ *      change when it's running
+ * @IFF_MACVLAN: Macvlan device
+ */
+enum netdev_priv_flags {
+        IFF_802_1Q_VLAN                 = 1<<0,
+        IFF_EBRIDGE                     = 1<<1,
+        IFF_SLAVE_INACTIVE              = 1<<2,
+        IFF_MASTER_8023AD               = 1<<3,
+        IFF_MASTER_ALB                  = 1<<4,
+        IFF_BONDING                     = 1<<5,
+        IFF_SLAVE_NEEDARP               = 1<<6,
+        IFF_ISATAP                      = 1<<7,
+        IFF_MASTER_ARPMON               = 1<<8,
+        IFF_WAN_HDLC                    = 1<<9,
+        IFF_XMIT_DST_RELEASE            = 1<<10,
+        IFF_DONT_BRIDGE                 = 1<<11,
+        IFF_DISABLE_NETPOLL             = 1<<12,
+        IFF_MACVLAN_PORT                = 1<<13,
+        IFF_BRIDGE_PORT                 = 1<<14,
+        IFF_OVS_DATAPATH                = 1<<15,
+        IFF_TX_SKB_SHARING              = 1<<16,
+        IFF_UNICAST_FLT                 = 1<<17,
+        IFF_TEAM_PORT                   = 1<<18,
+        IFF_SUPP_NOFCS                  = 1<<19,
+        IFF_LIVE_ADDR_CHANGE            = 1<<20,
+        IFF_MACVLAN                     = 1<<21,
+};
+
+#define IFF_802_1Q_VLAN                 IFF_802_1Q_VLAN
+#define IFF_EBRIDGE                     IFF_EBRIDGE
+#define IFF_SLAVE_INACTIVE              IFF_SLAVE_INACTIVE
+#define IFF_MASTER_8023AD               IFF_MASTER_8023AD
+#define IFF_MASTER_ALB                  IFF_MASTER_ALB
+#define IFF_BONDING                     IFF_BONDING
+#define IFF_SLAVE_NEEDARP               IFF_SLAVE_NEEDARP
+#define IFF_ISATAP                      IFF_ISATAP
+#define IFF_MASTER_ARPMON               IFF_MASTER_ARPMON
+#define IFF_WAN_HDLC                    IFF_WAN_HDLC
+#define IFF_XMIT_DST_RELEASE            IFF_XMIT_DST_RELEASE
+#define IFF_DONT_BRIDGE                 IFF_DONT_BRIDGE
+#define IFF_DISABLE_NETPOLL             IFF_DISABLE_NETPOLL
+#define IFF_MACVLAN_PORT                IFF_MACVLAN_PORT
+#define IFF_BRIDGE_PORT                 IFF_BRIDGE_PORT
+#define IFF_OVS_DATAPATH                IFF_OVS_DATAPATH
+#define IFF_TX_SKB_SHARING              IFF_TX_SKB_SHARING
+#define IFF_UNICAST_FLT                 IFF_UNICAST_FLT
+#define IFF_TEAM_PORT                   IFF_TEAM_PORT
+#define IFF_SUPP_NOFCS                  IFF_SUPP_NOFCS
+#define IFF_LIVE_ADDR_CHANGE            IFF_LIVE_ADDR_CHANGE
+#define IFF_MACVLAN                     IFF_MACVLAN
+
 /*
  *      The DEVICE structure.
  *      Actually, this whole structure is a big mistake.  It mixes I/O
@@ -1228,9 +1303,13 @@ struct net_device {
         int                     iflink;
 
         struct net_device_stats stats;
-        atomic_long_t           rx_dropped; /* dropped packets by core network
-                                             * Do not use this in drivers.
-                                             */
+
+        /* dropped packets by core network, Do not use this in drivers */
+        atomic_long_t           rx_dropped;
+        atomic_long_t           tx_dropped;
+
+        /* Stats to monitor carrier on<->off transitions */
+        atomic_t                carrier_changes;
 
 #ifdef CONFIG_WIRELESS_EXT
         /* List of functions to handle Wireless Extensions (instead of ioctl).
@@ -1279,6 +1358,10 @@ struct net_device {
                                                  * that share the same link
                                                  * layer address
                                                  */
+        unsigned short          dev_port;       /* Used to differentiate
+                                                 * devices that share the same
+                                                 * function
+                                                 */
         spinlock_t              addr_list_lock;
         struct netdev_hw_addr_list      uc;     /* Unicast mac addresses */
         struct netdev_hw_addr_list      mc;     /* Multicast mac addresses */
@@ -1316,13 +1399,7 @@ struct net_device {
 /*
  * Cache lines mostly used on receive path (including eth_type_trans())
  */
-        unsigned long           last_rx;        /* Time of last Rx
-                                                 * This should not be set in
-                                                 * drivers, unless really needed,
-                                                 * because network stack (bonding)
-                                                 * use it if/when necessary, to
-                                                 * avoid dirtying this cache line.
-                                                 */
+        unsigned long           last_rx;        /* Time of last Rx */
 
         /* Interface address info used in eth_type_trans() */
         unsigned char           *dev_addr;      /* hw address, (before bcast
@@ -1729,6 +1806,20 @@ struct pcpu_sw_netstats {
         struct u64_stats_sync   syncp;
 };
 
+#define netdev_alloc_pcpu_stats(type)                           \
+({                                                              \
+        typeof(type) __percpu *pcpu_stats = alloc_percpu(type); \
+        if (pcpu_stats) {                                       \
+                int i;                                          \
+                for_each_possible_cpu(i) {                      \
+                        typeof(type) *stat;                     \
+                        stat = per_cpu_ptr(pcpu_stats, i);      \
+                        u64_stats_init(&stat->syncp);           \
+                }                                               \
+        }                                                       \
+        pcpu_stats;                                             \
+})
+
 #include <linux/notifier.h>
 
 /* netdevice notifier chain. Please remember to update the rtnetlink
@@ -1884,9 +1975,6 @@ struct net_device *__dev_get_by_index(struct net *net, int ifindex);
 struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
 int netdev_get_name(struct net *net, char *name, int ifindex);
 int dev_restart(struct net_device *dev);
-#ifdef CONFIG_NETPOLL_TRAP
-int netpoll_trap(void);
-#endif
 int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb);
 
 static inline unsigned int skb_gro_offset(const struct sk_buff *skb)
@@ -1926,11 +2014,6 @@ static inline void *skb_gro_header_slow(struct sk_buff *skb, unsigned int hlen,
         return skb->data + offset;
 }
 
-static inline void *skb_gro_mac_header(struct sk_buff *skb)
-{
-        return NAPI_GRO_CB(skb)->frag0 ?: skb_mac_header(skb);
-}
-
 static inline void *skb_gro_network_header(struct sk_buff *skb)
 {
         return (NAPI_GRO_CB(skb)->frag0 ?: skb->data) +
@@ -2091,12 +2174,6 @@ static inline void netif_tx_start_all_queues(struct net_device *dev)
 
 static inline void netif_tx_wake_queue(struct netdev_queue *dev_queue)
 {
-#ifdef CONFIG_NETPOLL_TRAP
-        if (netpoll_trap()) {
-                netif_tx_start_queue(dev_queue);
-                return;
-        }
-#endif
         if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &dev_queue->state))
                 __netif_schedule(dev_queue->qdisc);
 }
@@ -2340,10 +2417,6 @@ static inline void netif_start_subqueue(struct net_device *dev, u16 queue_index)
 static inline void netif_stop_subqueue(struct net_device *dev, u16 queue_index)
 {
         struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-#ifdef CONFIG_NETPOLL_TRAP
-        if (netpoll_trap())
-                return;
-#endif
         netif_tx_stop_queue(txq);
 }
 
@@ -2378,10 +2451,6 @@ static inline bool netif_subqueue_stopped(const struct net_device *dev,
 static inline void netif_wake_subqueue(struct net_device *dev, u16 queue_index)
 {
         struct netdev_queue *txq = netdev_get_tx_queue(dev, queue_index);
-#ifdef CONFIG_NETPOLL_TRAP
-        if (netpoll_trap())
-                return;
-#endif
         if (test_and_clear_bit(__QUEUE_STATE_DRV_XOFF, &txq->state))
                 __netif_schedule(txq->qdisc);
 }
@@ -2551,6 +2620,7 @@ int dev_get_phys_port_id(struct net_device *dev,
 int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev,
                         struct netdev_queue *txq);
 int dev_forward_skb(struct net_device *dev, struct sk_buff *skb);
+bool is_skb_forwardable(struct net_device *dev, struct sk_buff *skb);
 
 extern int              netdev_budget;
 
@@ -2831,6 +2901,11 @@ static inline void netif_tx_unlock_bh(struct net_device *dev)
         }                                               \
 }
 
+#define HARD_TX_TRYLOCK(dev, txq)                       \
+        (((dev->features & NETIF_F_LLTX) == 0) ?        \
+                __netif_tx_trylock(txq) :               \
+                true )
+
 #define HARD_TX_UNLOCK(dev, txq) {                      \
         if ((dev->features & NETIF_F_LLTX) == 0) {      \
                 __netif_tx_unlock(txq);                 \
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 0c7d01eae56c..96afc29184be 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -39,11 +39,13 @@ enum ip_set_feature {
         IPSET_TYPE_NAME = (1 << IPSET_TYPE_NAME_FLAG),
         IPSET_TYPE_IFACE_FLAG = 5,
         IPSET_TYPE_IFACE = (1 << IPSET_TYPE_IFACE_FLAG),
-        IPSET_TYPE_NOMATCH_FLAG = 6,
+        IPSET_TYPE_MARK_FLAG = 6,
+        IPSET_TYPE_MARK = (1 << IPSET_TYPE_MARK_FLAG),
+        IPSET_TYPE_NOMATCH_FLAG = 7,
         IPSET_TYPE_NOMATCH = (1 << IPSET_TYPE_NOMATCH_FLAG),
         /* Strictly speaking not a feature, but a flag for dumping:
          * this settype must be dumped last */
-        IPSET_DUMP_LAST_FLAG = 7,
+        IPSET_DUMP_LAST_FLAG = 8,
         IPSET_DUMP_LAST = (1 << IPSET_DUMP_LAST_FLAG),
 };
 
@@ -63,6 +65,7 @@ enum ip_set_extension {
 #define SET_WITH_TIMEOUT(s)     ((s)->extensions & IPSET_EXT_TIMEOUT)
 #define SET_WITH_COUNTER(s)     ((s)->extensions & IPSET_EXT_COUNTER)
 #define SET_WITH_COMMENT(s)     ((s)->extensions & IPSET_EXT_COMMENT)
+#define SET_WITH_FORCEADD(s)    ((s)->flags & IPSET_CREATE_FLAG_FORCEADD)
 
 /* Extension id, in size order */
 enum ip_set_ext_id {
@@ -171,8 +174,6 @@ struct ip_set_type {
         char name[IPSET_MAXNAMELEN];
         /* Protocol version */
         u8 protocol;
-        /* Set features to control swapping */
-        u8 features;
         /* Set type dimension */
         u8 dimension;
         /*
@@ -182,6 +183,8 @@ struct ip_set_type {
         u8 family;
         /* Type revisions */
         u8 revision_min, revision_max;
+        /* Set features to control swapping */
+        u16 features;
 
         /* Create set */
         int (*create)(struct net *net, struct ip_set *set,
@@ -217,6 +220,8 @@ struct ip_set {
         u8 revision;
         /* Extensions */
         u8 extensions;
+        /* Create flags */
+        u8 flags;
         /* Default timeout value, if enabled */
         u32 timeout;
         /* Element data size */
@@ -251,6 +256,8 @@ ip_set_put_flags(struct sk_buff *skb, struct ip_set *set)
                 cadt_flags |= IPSET_FLAG_WITH_COUNTERS;
         if (SET_WITH_COMMENT(set))
                 cadt_flags |= IPSET_FLAG_WITH_COMMENT;
+        if (SET_WITH_FORCEADD(set))
+                cadt_flags |= IPSET_FLAG_WITH_FORCEADD;
 
         if (!cadt_flags)
                 return 0;
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index 28c74367e900..e955d4730625 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -44,6 +44,27 @@ int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u32 portid,
 
 void nfnl_lock(__u8 subsys_id);
 void nfnl_unlock(__u8 subsys_id);
+#ifdef CONFIG_PROVE_LOCKING
+int lockdep_nfnl_is_held(__u8 subsys_id);
+#else
+static inline int lockdep_nfnl_is_held(__u8 subsys_id)
+{
+        return 1;
+}
+#endif /* CONFIG_PROVE_LOCKING */
+
+/*
+ * nfnl_dereference - fetch RCU pointer when updates are prevented by subsys mutex
+ *
+ * @p: The pointer to read, prior to dereferencing
+ * @ss: The nfnetlink subsystem ID
+ *
+ * Return the value of the specified RCU-protected pointer, but omit
+ * both the smp_read_barrier_depends() and the ACCESS_ONCE(), because
+ * caller holds the NFNL subsystem mutex.
+ */
+#define nfnl_dereference(p, ss)                                 \
+        rcu_dereference_protected(p, lockdep_nfnl_is_held(ss))
 
 #define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
         MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index fbfdb9d8d3a7..b25ee9ffdbe6 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -24,27 +24,20 @@ struct netpoll {
         struct net_device *dev;
         char dev_name[IFNAMSIZ];
         const char *name;
-        void (*rx_skb_hook)(struct netpoll *np, int source, struct sk_buff *skb,
-                            int offset, int len);
 
         union inet_addr local_ip, remote_ip;
         bool ipv6;
         u16 local_port, remote_port;
         u8 remote_mac[ETH_ALEN];
 
-        struct list_head rx; /* rx_np list element */
         struct work_struct cleanup_work;
 };
 
 struct netpoll_info {
         atomic_t refcnt;
 
-        unsigned long rx_flags;
-        spinlock_t rx_lock;
         struct semaphore dev_lock;
-        struct list_head rx_np; /* netpolls that registered an rx_skb_hook */
 
-        struct sk_buff_head neigh_tx; /* list of neigh requests to reply to */
         struct sk_buff_head txq;
 
         struct delayed_work tx_work;
@@ -54,24 +47,21 @@ struct netpoll_info {
 };
 
 #ifdef CONFIG_NETPOLL
-extern void netpoll_rx_disable(struct net_device *dev);
-extern void netpoll_rx_enable(struct net_device *dev);
+extern void netpoll_poll_disable(struct net_device *dev);
+extern void netpoll_poll_enable(struct net_device *dev);
 #else
-static inline void netpoll_rx_disable(struct net_device *dev) { return; }
-static inline void netpoll_rx_enable(struct net_device *dev) { return; }
+static inline void netpoll_poll_disable(struct net_device *dev) { return; }
+static inline void netpoll_poll_enable(struct net_device *dev) { return; }
 #endif
 
 void netpoll_send_udp(struct netpoll *np, const char *msg, int len);
 void netpoll_print_options(struct netpoll *np);
 int netpoll_parse_options(struct netpoll *np, char *opt);
-int __netpoll_setup(struct netpoll *np, struct net_device *ndev, gfp_t gfp);
+int __netpoll_setup(struct netpoll *np, struct net_device *ndev);
 int netpoll_setup(struct netpoll *np);
-int netpoll_trap(void);
-void netpoll_set_trap(int trap);
 void __netpoll_cleanup(struct netpoll *np);
 void __netpoll_free_async(struct netpoll *np);
 void netpoll_cleanup(struct netpoll *np);
-int __netpoll_rx(struct sk_buff *skb, struct netpoll_info *npinfo);
 void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
                              struct net_device *dev);
 static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
@@ -82,46 +72,7 @@ static inline void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
         local_irq_restore(flags);
 }
 
-
-
 #ifdef CONFIG_NETPOLL
-static inline bool netpoll_rx_on(struct sk_buff *skb)
-{
-        struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo);
-
-        return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags);
-}
-
-static inline bool netpoll_rx(struct sk_buff *skb)
-{
-        struct netpoll_info *npinfo;
-        unsigned long flags;
-        bool ret = false;
-
-        local_irq_save(flags);
-
-        if (!netpoll_rx_on(skb))
-                goto out;
-
-        npinfo = rcu_dereference_bh(skb->dev->npinfo);
-        spin_lock(&npinfo->rx_lock);
-        /* check rx_flags again with the lock held */
-        if (npinfo->rx_flags && __netpoll_rx(skb, npinfo))
-                ret = true;
-        spin_unlock(&npinfo->rx_lock);
-
-out:
-        local_irq_restore(flags);
-        return ret;
-}
-
-static inline int netpoll_receive_skb(struct sk_buff *skb)
-{
-        if (!list_empty(&skb->dev->napi_list))
-                return netpoll_rx(skb);
-        return 0;
-}
-
 static inline void *netpoll_poll_lock(struct napi_struct *napi)
 {
         struct net_device *dev = napi->dev;
@@ -150,18 +101,6 @@ static inline bool netpoll_tx_running(struct net_device *dev)
 }
 
 #else
-static inline bool netpoll_rx(struct sk_buff *skb)
-{
-        return false;
-}
-static inline bool netpoll_rx_on(struct sk_buff *skb)
-{
-        return false;
-}
-static inline int netpoll_receive_skb(struct sk_buff *skb)
-{
-        return 0;
-}
 static inline void *netpoll_poll_lock(struct napi_struct *napi)
 {
         return NULL;
diff --git a/include/linux/nl802154.h b/include/linux/nl802154.h
index fd4f2d1cdf6c..c8d7f3965fff 100644
--- a/include/linux/nl802154.h
+++ b/include/linux/nl802154.h
@@ -70,6 +70,16 @@ enum {
         IEEE802154_ATTR_PHY_NAME,
         IEEE802154_ATTR_DEV_TYPE,
 
+        IEEE802154_ATTR_TXPOWER,
+        IEEE802154_ATTR_LBT_ENABLED,
+        IEEE802154_ATTR_CCA_MODE,
+        IEEE802154_ATTR_CCA_ED_LEVEL,
+        IEEE802154_ATTR_CSMA_RETRIES,
+        IEEE802154_ATTR_CSMA_MIN_BE,
+        IEEE802154_ATTR_CSMA_MAX_BE,
+
+        IEEE802154_ATTR_FRAME_RETRIES,
+
         __IEEE802154_ATTR_MAX,
 };
 
@@ -122,6 +132,8 @@ enum {
         IEEE802154_ADD_IFACE,
         IEEE802154_DEL_IFACE,
 
+        IEEE802154_SET_MACPARAMS,
+
         __IEEE802154_CMD_MAX,
 };
 
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 565188ca328f..24126c4b27b5 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -74,8 +74,53 @@ typedef enum {
         PHY_INTERFACE_MODE_RTBI,
         PHY_INTERFACE_MODE_SMII,
         PHY_INTERFACE_MODE_XGMII,
+        PHY_INTERFACE_MODE_MOCA,
+        PHY_INTERFACE_MODE_MAX,
 } phy_interface_t;
 
+/**
+ * It maps 'enum phy_interface_t' found in include/linux/phy.h
+ * into the device tree binding of 'phy-mode', so that Ethernet
+ * device driver can get phy interface from device tree.
+ */
+static inline const char *phy_modes(phy_interface_t interface)
+{
+        switch (interface) {
+        case PHY_INTERFACE_MODE_NA:
+                return "";
+        case PHY_INTERFACE_MODE_MII:
+                return "mii";
+        case PHY_INTERFACE_MODE_GMII:
+                return "gmii";
+        case PHY_INTERFACE_MODE_SGMII:
+                return "sgmii";
+        case PHY_INTERFACE_MODE_TBI:
+                return "tbi";
+        case PHY_INTERFACE_MODE_REVMII:
+                return "rev-mii";
+        case PHY_INTERFACE_MODE_RMII:
+                return "rmii";
+        case PHY_INTERFACE_MODE_RGMII:
+                return "rgmii";
+        case PHY_INTERFACE_MODE_RGMII_ID:
+                return "rgmii-id";
+        case PHY_INTERFACE_MODE_RGMII_RXID:
+                return "rgmii-rxid";
+        case PHY_INTERFACE_MODE_RGMII_TXID:
+                return "rgmii-txid";
+        case PHY_INTERFACE_MODE_RTBI:
+                return "rtbi";
+        case PHY_INTERFACE_MODE_SMII:
+                return "smii";
+        case PHY_INTERFACE_MODE_XGMII:
+                return "xgmii";
+        case PHY_INTERFACE_MODE_MOCA:
+                return "moca";
+        default:
+                return "unknown";
+        }
+}
+
 
 #define PHY_INIT_TIMEOUT        100000
 #define PHY_STATE_TIME          1
@@ -308,6 +353,7 @@ struct phy_device {
         struct phy_c45_device_ids c45_ids;
         bool is_c45;
         bool is_internal;
+        bool has_fixups;
 
         enum phy_state state;
 
@@ -394,6 +440,11 @@ struct phy_driver {
         u32 flags;
 
         /*
+         * Called to issue a PHY software reset
+         */
+        int (*soft_reset)(struct phy_device *phydev);
+
+        /*
          * Called to initialize the PHY,
          * including after a reset
          */
@@ -417,6 +468,9 @@ struct phy_driver {
          */
         int (*config_aneg)(struct phy_device *phydev);
 
+        /* Determines the auto negotiation result */
+        int (*aneg_done)(struct phy_device *phydev);
+
         /* Determines the negotiated speed and duplex */
         int (*read_status)(struct phy_device *phydev);
 
@@ -612,10 +666,12 @@ static inline int phy_read_status(struct phy_device *phydev)
 int genphy_setup_forced(struct phy_device *phydev);
 int genphy_restart_aneg(struct phy_device *phydev);
 int genphy_config_aneg(struct phy_device *phydev);
+int genphy_aneg_done(struct phy_device *phydev);
 int genphy_update_link(struct phy_device *phydev);
 int genphy_read_status(struct phy_device *phydev);
 int genphy_suspend(struct phy_device *phydev);
 int genphy_resume(struct phy_device *phydev);
+int genphy_soft_reset(struct phy_device *phydev);
 void phy_driver_unregister(struct phy_driver *drv);
 void phy_drivers_unregister(struct phy_driver *drv, int n);
 int phy_driver_register(struct phy_driver *new_driver);
diff --git a/include/linux/ptp_classify.h b/include/linux/ptp_classify.h
index 1dc420ba213a..7dfed71d76a6 100644
--- a/include/linux/ptp_classify.h
+++ b/include/linux/ptp_classify.h
@@ -23,15 +23,8 @@
 #ifndef _PTP_CLASSIFY_H_
 #define _PTP_CLASSIFY_H_
 
-#include <linux/if_ether.h>
-#include <linux/if_vlan.h>
 #include <linux/ip.h>
-#include <linux/filter.h>
-#ifdef __KERNEL__
-#include <linux/in.h>
-#else
-#include <netinet/in.h>
-#endif
+#include <linux/skbuff.h>
 
 #define PTP_CLASS_NONE  0x00 /* not a PTP event message */
 #define PTP_CLASS_V1    0x01 /* protocol version 1 */
@@ -44,7 +37,7 @@
 #define PTP_CLASS_PMASK 0xf0 /* mask for the packet type field */
 
 #define PTP_CLASS_V1_IPV4 (PTP_CLASS_V1 | PTP_CLASS_IPV4)
-#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /*probably DNE*/
+#define PTP_CLASS_V1_IPV6 (PTP_CLASS_V1 | PTP_CLASS_IPV6) /* probably DNE */
 #define PTP_CLASS_V2_IPV4 (PTP_CLASS_V2 | PTP_CLASS_IPV4)
 #define PTP_CLASS_V2_IPV6 (PTP_CLASS_V2 | PTP_CLASS_IPV6)
 #define PTP_CLASS_V2_L2   (PTP_CLASS_V2 | PTP_CLASS_L2)
@@ -53,88 +46,34 @@
 #define PTP_EV_PORT 319
 #define PTP_GEN_BIT 0x08 /* indicates general message, if set in message type */
 
-#define OFF_ETYPE       12
-#define OFF_IHL         14
-#define OFF_FRAG        20
-#define OFF_PROTO4      23
-#define OFF_NEXT        6
-#define OFF_UDP_DST     2
-
 #define OFF_PTP_SOURCE_UUID     22 /* PTPv1 only */
 #define OFF_PTP_SEQUENCE_ID     30
 #define OFF_PTP_CONTROL         32 /* PTPv1 only */
 
-#define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)
-
+/* Below defines should actually be removed at some point in time. */
 #define IP6_HLEN        40
 #define UDP_HLEN        8
-
-#define RELOFF_DST4     (ETH_HLEN + OFF_UDP_DST)
-#define OFF_DST6        (ETH_HLEN + IP6_HLEN + OFF_UDP_DST)
+#define OFF_IHL         14
 #define OFF_PTP6        (ETH_HLEN + IP6_HLEN + UDP_HLEN)
+#define IPV4_HLEN(data) (((struct iphdr *)(data + OFF_IHL))->ihl << 2)
 
-#define OP_AND  (BPF_ALU | BPF_AND  | BPF_K)
-#define OP_JEQ  (BPF_JMP | BPF_JEQ  | BPF_K)
-#define OP_JSET (BPF_JMP | BPF_JSET | BPF_K)
-#define OP_LDB  (BPF_LD  | BPF_B    | BPF_ABS)
-#define OP_LDH  (BPF_LD  | BPF_H    | BPF_ABS)
-#define OP_LDHI (BPF_LD  | BPF_H    | BPF_IND)
-#define OP_LDX  (BPF_LDX | BPF_B    | BPF_MSH)
-#define OP_OR   (BPF_ALU | BPF_OR   | BPF_K)
-#define OP_RETA (BPF_RET | BPF_A)
-#define OP_RETK (BPF_RET | BPF_K)
+#if defined(CONFIG_NET_PTP_CLASSIFY)
+/**
+ * ptp_classify_raw - classify a PTP packet
+ * @skb: buffer
+ *
+ * Runs a minimal BPF dissector to classify a network packet to
+ * determine the PTP class. In case the skb does not contain any
+ * PTP protocol data, PTP_CLASS_NONE will be returned, otherwise
+ * PTP_CLASS_V1_IPV{4,6}, PTP_CLASS_V2_IPV{4,6} or
+ * PTP_CLASS_V2_{L2,VLAN}, depending on the packet content.
+ */
+unsigned int ptp_classify_raw(const struct sk_buff *skb);
 
-static inline int ptp_filter_init(struct sock_filter *f, int len)
+void __init ptp_classifier_init(void);
+#else
+static inline void ptp_classifier_init(void)
 {
-        if (OP_LDH == f[0].code)
-                return sk_chk_filter(f, len);
-        else
-                return 0;
 }
-
-#define PTP_FILTER \
-        {OP_LDH,        0,   0, OFF_ETYPE               }, /*              */ \
-        {OP_JEQ,        0,  12, ETH_P_IP                }, /* f goto L20   */ \
-        {OP_LDB,        0,   0, OFF_PROTO4              }, /*              */ \
-        {OP_JEQ,        0,   9, IPPROTO_UDP             }, /* f goto L10   */ \
-        {OP_LDH,        0,   0, OFF_FRAG                }, /*              */ \
-        {OP_JSET,       7,   0, 0x1fff                  }, /* t goto L11   */ \
-        {OP_LDX,        0,   0, OFF_IHL                 }, /*              */ \
-        {OP_LDHI,       0,   0, RELOFF_DST4             }, /*              */ \
-        {OP_JEQ,        0,   4, PTP_EV_PORT             }, /* f goto L12   */ \
-        {OP_LDHI,       0,   0, ETH_HLEN + UDP_HLEN     }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_IPV4          }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L1x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          }, /*              */ \
-/*L20*/ {OP_JEQ,        0,   9, ETH_P_IPV6              }, /* f goto L40   */ \
-        {OP_LDB,        0,   0, ETH_HLEN + OFF_NEXT     }, /*              */ \
-        {OP_JEQ,        0,   6, IPPROTO_UDP             }, /* f goto L30   */ \
-        {OP_LDH,        0,   0, OFF_DST6                }, /*              */ \
-        {OP_JEQ,        0,   4, PTP_EV_PORT             }, /* f goto L31   */ \
-        {OP_LDH,        0,   0, OFF_PTP6                }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_IPV6          }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L3x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          }, /*              */ \
-/*L40*/ {OP_JEQ,        0,   9, ETH_P_8021Q             }, /* f goto L50   */ \
-        {OP_LDH,        0,   0, OFF_ETYPE + 4           }, /*              */ \
-        {OP_JEQ,        0,  15, ETH_P_1588              }, /* f goto L60   */ \
-        {OP_LDB,        0,   0, ETH_HLEN + VLAN_HLEN    }, /*              */ \
-        {OP_AND,        0,   0, PTP_GEN_BIT             }, /*              */ \
-        {OP_JEQ,        0,  12, 0                       }, /* f goto L6x   */ \
-        {OP_LDH,        0,   0, ETH_HLEN + VLAN_HLEN    }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_VLAN          }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L50*/ {OP_JEQ,        0,   7, ETH_P_1588              }, /* f goto L61   */ \
-        {OP_LDB,        0,   0, ETH_HLEN                }, /*              */ \
-        {OP_AND,        0,   0, PTP_GEN_BIT             }, /*              */ \
-        {OP_JEQ,        0,   4, 0                       }, /* f goto L6x   */ \
-        {OP_LDH,        0,   0, ETH_HLEN                }, /*              */ \
-        {OP_AND,        0,   0, PTP_CLASS_VMASK         }, /*              */ \
-        {OP_OR,         0,   0, PTP_CLASS_L2            }, /*              */ \
-        {OP_RETA,       0,   0, 0                       }, /*              */ \
-/*L6x*/ {OP_RETK,       0,   0, PTP_CLASS_NONE          },
-
 #endif
+#endif /* _PTP_CLASSIFY_H_ */
diff --git a/include/linux/ptp_clock_kernel.h b/include/linux/ptp_clock_kernel.h
index 38a993508327..0d8ff3fb84ba 100644
--- a/include/linux/ptp_clock_kernel.h
+++ b/include/linux/ptp_clock_kernel.h
@@ -49,7 +49,11 @@ struct ptp_clock_request {
  * @n_alarm:   The number of programmable alarms.
  * @n_ext_ts:  The number of external time stamp channels.
  * @n_per_out: The number of programmable periodic signals.
+ * @n_pins:    The number of programmable pins.
  * @pps:       Indicates whether the clock supports a PPS callback.
+ * @pin_config: Array of length 'n_pins'. If the number of
+ *              programmable pins is nonzero, then drivers must
+ *              allocate and initialize this array.
  *
  * clock operations
  *
@@ -70,6 +74,18 @@ struct ptp_clock_request {
  *            parameter request: Desired resource to enable or disable.
  *            parameter on: Caller passes one to enable or zero to disable.
  *
+ * @verify:   Confirm that a pin can perform a given function. The PTP
+ *            Hardware Clock subsystem maintains the 'pin_config'
+ *            array on behalf of the drivers, but the PHC subsystem
+ *            assumes that every pin can perform every function. This
+ *            hook gives drivers a way of telling the core about
+ *            limitations on specific pins. This function must return
+ *            zero if the function can be assigned to this pin, and
+ *            nonzero otherwise.
+ *            parameter pin: index of the pin in question.
+ *            parameter func: the desired function to use.
+ *            parameter chan: the function channel index to use.
+ *
  * Drivers should embed their ptp_clock_info within a private
  * structure, obtaining a reference to it using container_of().
  *
@@ -83,13 +99,17 @@ struct ptp_clock_info {
         int n_alarm;
         int n_ext_ts;
         int n_per_out;
+        int n_pins;
         int pps;
+        struct ptp_pin_desc *pin_config;
         int (*adjfreq)(struct ptp_clock_info *ptp, s32 delta);
         int (*adjtime)(struct ptp_clock_info *ptp, s64 delta);
         int (*gettime)(struct ptp_clock_info *ptp, struct timespec *ts);
         int (*settime)(struct ptp_clock_info *ptp, const struct timespec *ts);
         int (*enable)(struct ptp_clock_info *ptp,
                       struct ptp_clock_request *request, int on);
+        int (*verify)(struct ptp_clock_info *ptp, unsigned int pin,
+                      enum ptp_pin_function func, unsigned int chan);
 };
 
 struct ptp_clock;
@@ -156,4 +176,17 @@ extern void ptp_clock_event(struct ptp_clock *ptp,
 
 extern int ptp_clock_index(struct ptp_clock *ptp);
 
+/**
+ * ptp_find_pin() - obtain the pin index of a given auxiliary function
+ *
+ * @ptp:    The clock obtained from ptp_clock_register().
+ * @func:   One of the ptp_pin_function enumerated values.
+ * @chan:   The particular functional channel to find.
+ * Return:  Pin index in the range of zero to ptp_clock_caps.n_pins - 1,
+ *          or -1 if the auxiliary function cannot be found.
+ */
+
+int ptp_find_pin(struct ptp_clock *ptp,
+                 enum ptp_pin_function func, unsigned int chan);
+
 #endif
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h
index 6f19cfd1840e..4054b0994071 100644
--- a/include/linux/seccomp.h
+++ b/include/linux/seccomp.h
@@ -76,7 +76,6 @@ static inline int seccomp_mode(struct seccomp *s)
 #ifdef CONFIG_SECCOMP_FILTER
 extern void put_seccomp_filter(struct task_struct *tsk);
 extern void get_seccomp_filter(struct task_struct *tsk);
-extern u32 seccomp_bpf_load(int off);
 #else  /* CONFIG_SECCOMP_FILTER */
 static inline void put_seccomp_filter(struct task_struct *tsk)
 {
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 6b8466365fbd..08074a810164 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -32,6 +32,7 @@
 #include <linux/hrtimer.h>
 #include <linux/dma-mapping.h>
 #include <linux/netdev_features.h>
+#include <linux/sched.h>
 #include <net/flow_keys.h>
 
 /* A. Checksumming of received packets by device.
@@ -356,11 +357,62 @@ typedef unsigned int sk_buff_data_t;
 typedef unsigned char *sk_buff_data_t;
 #endif
 
+/**
+ * struct skb_mstamp - multi resolution time stamps
+ * @stamp_us: timestamp in us resolution
+ * @stamp_jiffies: timestamp in jiffies
+ */
+struct skb_mstamp {
+        union {
+                u64             v64;
+                struct {
+                        u32     stamp_us;
+                        u32     stamp_jiffies;
+                };
+        };
+};
+
+/**
+ * skb_mstamp_get - get current timestamp
+ * @cl: place to store timestamps
+ */
+static inline void skb_mstamp_get(struct skb_mstamp *cl)
+{
+        u64 val = local_clock();
+
+        do_div(val, NSEC_PER_USEC);
+        cl->stamp_us = (u32)val;
+        cl->stamp_jiffies = (u32)jiffies;
+}
+
+/**
+ * skb_mstamp_delta - compute the difference in usec between two skb_mstamp
+ * @t1: pointer to newest sample
+ * @t0: pointer to oldest sample
+ */
+static inline u32 skb_mstamp_us_delta(const struct skb_mstamp *t1,
+                                      const struct skb_mstamp *t0)
+{
+        s32 delta_us = t1->stamp_us - t0->stamp_us;
+        u32 delta_jiffies = t1->stamp_jiffies - t0->stamp_jiffies;
+
+        /* If delta_us is negative, this might be because interval is too big,
+         * or local_clock() drift is too big : fallback using jiffies.
+         */
+        if (delta_us <= 0 ||
+            delta_jiffies >= (INT_MAX / (USEC_PER_SEC / HZ)))
+
+                delta_us = jiffies_to_usecs(delta_jiffies);
+
+        return delta_us;
+}
+
+
 /** 
  *      struct sk_buff - socket buffer
  *      @next: Next buffer in list
  *      @prev: Previous buffer in list
- *      @tstamp: Time we arrived
+ *      @tstamp: Time we arrived/left
  *      @sk: Socket we are owned by
  *      @dev: Device we arrived on/are leaving by
  *      @cb: Control buffer. Free for use by every layer. Put private vars here
@@ -392,11 +444,11 @@ typedef unsigned char *sk_buff_data_t;
  *      @skb_iif: ifindex of device we arrived on
  *      @tc_index: Traffic control index
  *      @tc_verd: traffic control verdict
- *      @rxhash: the packet hash computed on receive
+ *      @hash: the packet hash
  *      @queue_mapping: Queue mapping for multiqueue devices
  *      @ndisc_nodetype: router type (from link layer)
  *      @ooo_okay: allow the mapping of a socket to a queue to be changed
- *      @l4_rxhash: indicate rxhash is a canonical 4-tuple hash over transport
+ *      @l4_hash: indicate hash is a canonical 4-tuple hash over transport
  *              ports.
  *      @wifi_acked_valid: wifi_acked was set
  *      @wifi_acked: whether frame was acked on wifi or not
@@ -429,7 +481,10 @@ struct sk_buff {
         struct sk_buff          *next;
         struct sk_buff          *prev;
 
-        ktime_t                 tstamp;
+        union {
+                ktime_t         tstamp;
+                struct skb_mstamp skb_mstamp;
+        };
 
         struct sock             *sk;
         struct net_device       *dev;
@@ -482,7 +537,7 @@ struct sk_buff {
 
         int                     skb_iif;
 
-        __u32                   rxhash;
+        __u32                   hash;
 
         __be16                  vlan_proto;
         __u16                   vlan_tci;
@@ -501,7 +556,7 @@ struct sk_buff {
 #endif
         __u8                    pfmemalloc:1;
         __u8                    ooo_okay:1;
-        __u8                    l4_rxhash:1;
+        __u8                    l4_hash:1;
         __u8                    wifi_acked_valid:1;
         __u8                    wifi_acked:1;
         __u8                    no_fcs:1;
@@ -691,6 +746,8 @@ struct sk_buff *skb_realloc_headroom(struct sk_buff *skb,
                                      unsigned int headroom);
 struct sk_buff *skb_copy_expand(const struct sk_buff *skb, int newheadroom,
                                 int newtailroom, gfp_t priority);
+int skb_to_sgvec_nomark(struct sk_buff *skb, struct scatterlist *sg,
+                        int offset, int len);
 int skb_to_sgvec(struct sk_buff *skb, struct scatterlist *sg, int offset,
                  int len);
 int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer);
@@ -758,40 +815,40 @@ enum pkt_hash_types {
 static inline void
 skb_set_hash(struct sk_buff *skb, __u32 hash, enum pkt_hash_types type)
 {
-        skb->l4_rxhash = (type == PKT_HASH_TYPE_L4);
-        skb->rxhash = hash;
+        skb->l4_hash = (type == PKT_HASH_TYPE_L4);
+        skb->hash = hash;
 }
 
 void __skb_get_hash(struct sk_buff *skb);
 static inline __u32 skb_get_hash(struct sk_buff *skb)
 {
-        if (!skb->l4_rxhash)
+        if (!skb->l4_hash)
                 __skb_get_hash(skb);
 
-        return skb->rxhash;
+        return skb->hash;
 }
 
 static inline __u32 skb_get_hash_raw(const struct sk_buff *skb)
 {
-        return skb->rxhash;
+        return skb->hash;
 }
 
 static inline void skb_clear_hash(struct sk_buff *skb)
 {
-        skb->rxhash = 0;
-        skb->l4_rxhash = 0;
+        skb->hash = 0;
+        skb->l4_hash = 0;
 }
 
 static inline void skb_clear_hash_if_not_l4(struct sk_buff *skb)
 {
-        if (!skb->l4_rxhash)
+        if (!skb->l4_hash)
                 skb_clear_hash(skb);
 }
 
 static inline void skb_copy_hash(struct sk_buff *to, const struct sk_buff *from)
 {
-        to->rxhash = from->rxhash;
-        to->l4_rxhash = from->l4_rxhash;
+        to->hash = from->hash;
+        to->l4_hash = from->l4_hash;
 };
 
 #ifdef NET_SKBUFF_DATA_USES_OFFSET
@@ -2573,8 +2630,6 @@ static inline ktime_t net_invalid_timestamp(void)
         return ktime_set(0, 0);
 }
 
-void skb_timestamping_init(void);
-
 #ifdef CONFIG_NETWORK_PHY_TIMESTAMPING
 
 void skb_clone_tx_timestamp(struct sk_buff *skb);
@@ -2776,6 +2831,19 @@ static inline void skb_init_secmark(struct sk_buff *skb)
 { }
 #endif
 
+static inline bool skb_irq_freeable(const struct sk_buff *skb)
+{
+        return !skb->destructor &&
+#if IS_ENABLED(CONFIG_XFRM)
+                !skb->sp &&
+#endif
+#if IS_ENABLED(CONFIG_NF_CONNTRACK)
+                !skb->nfct &&
+#endif
+                !skb->_skb_refdst &&
+                !skb_has_frag_list(skb);
+}
+
 static inline void skb_set_queue_mapping(struct sk_buff *skb, u16 queue_mapping)
 {
         skb->queue_mapping = queue_mapping;
diff --git a/include/linux/sxgbe_platform.h b/include/linux/sxgbe_platform.h
new file mode 100644
index 000000000000..a62442cf0037
--- /dev/null
+++ b/include/linux/sxgbe_platform.h
@@ -0,0 +1,54 @@
+/*
+ * 10G controller driver for Samsung EXYNOS SoCs
+ *
+ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Author: Siva Reddy Kallam <siva.kallam@samsung.com>
+ *
+ * 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.
+ */
+#ifndef __SXGBE_PLATFORM_H__
+#define __SXGBE_PLATFORM_H__
+
+/* MDC Clock Selection define*/
+#define SXGBE_CSR_100_150M      0x0     /* MDC = clk_scr_i/62 */
+#define SXGBE_CSR_150_250M      0x1     /* MDC = clk_scr_i/102 */
+#define SXGBE_CSR_250_300M      0x2     /* MDC = clk_scr_i/122 */
+#define SXGBE_CSR_300_350M      0x3     /* MDC = clk_scr_i/142 */
+#define SXGBE_CSR_350_400M      0x4     /* MDC = clk_scr_i/162 */
+#define SXGBE_CSR_400_500M      0x5     /* MDC = clk_scr_i/202 */
+
+/* Platfrom data for platform device structure's
+ * platform_data field
+ */
+struct sxgbe_mdio_bus_data {
+        unsigned int phy_mask;
+        int *irqs;
+        int probed_phy_irq;
+};
+
+struct sxgbe_dma_cfg {
+        int pbl;
+        int fixed_burst;
+        int burst_map;
+        int adv_addr_mode;
+};
+
+struct sxgbe_plat_data {
+        char *phy_bus_name;
+        int bus_id;
+        int phy_addr;
+        int interface;
+        struct sxgbe_mdio_bus_data *mdio_bus_data;
+        struct sxgbe_dma_cfg *dma_cfg;
+        int clk_csr;
+        int pmt;
+        int force_sf_dma_mode;
+        int force_thresh_dma_mode;
+        int riwt_off;
+};
+
+#endif /* __SXGBE_PLATFORM_H__ */
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 4ad0706d40eb..239946868142 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -201,10 +201,10 @@ struct tcp_sock {
         u32     tlp_high_seq;   /* snd_nxt at the time of TLP retransmit. */
 
 /* RTT measurement */
-        u32     srtt;           /* smoothed round trip time << 3        */
-        u32     mdev;           /* medium deviation                     */
-        u32     mdev_max;       /* maximal mdev for the last rtt period */
-        u32     rttvar;         /* smoothed mdev_max                    */
+        u32     srtt_us;        /* smoothed round trip time << 3 in usecs */
+        u32     mdev_us;        /* medium deviation                     */
+        u32     mdev_max_us;    /* maximal mdev for the last rtt period */
+        u32     rttvar_us;      /* smoothed mdev_max                    */
         u32     rtt_seq;        /* sequence number to update rttvar     */
 
         u32     packets_out;    /* Packets which are "in flight"        */
diff --git a/include/linux/tty.h b/include/linux/tty.h
index b90b5c221ff0..1c3316a47d7e 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -518,9 +518,9 @@ extern void tty_port_put(struct tty_port *port);
 
 static inline struct tty_port *tty_port_get(struct tty_port *port)
 {
-        if (port)
-                kref_get(&port->kref);
-        return port;
+        if (port && kref_get_unless_zero(&port->kref))
+                return port;
+        return NULL;
 }
 
 /* If the cts flow control is enabled, return true. */
diff --git a/include/linux/u64_stats_sync.h b/include/linux/u64_stats_sync.h
index 7bfabd20204c..4b4439e75f45 100644
--- a/include/linux/u64_stats_sync.h
+++ b/include/linux/u64_stats_sync.h
@@ -27,8 +27,8 @@
  *    (On UP, there is no seqcount_t protection, a reader allowing interrupts could
  *     read partial values)
  *
- * 7) For softirq uses, readers can use u64_stats_fetch_begin_bh() and
- *    u64_stats_fetch_retry_bh() helpers
+ * 7) For irq and softirq uses, readers can use u64_stats_fetch_begin_irq() and
+ *    u64_stats_fetch_retry_irq() helpers
  *
  * Usage :
  *
@@ -114,31 +114,31 @@ static inline bool u64_stats_fetch_retry(const struct u64_stats_sync *syncp,
 }
 
 /*
- * In case softirq handlers can update u64 counters, readers can use following helpers
+ * In case irq handlers can update u64 counters, readers can use following helpers
  * - SMP 32bit arches use seqcount protection, irq safe.
- * - UP 32bit must disable BH.
+ * - UP 32bit must disable irqs.
  * - 64bit have no problem atomically reading u64 values, irq safe.
  */
-static inline unsigned int u64_stats_fetch_begin_bh(const struct u64_stats_sync *syncp)
+static inline unsigned int u64_stats_fetch_begin_irq(const struct u64_stats_sync *syncp)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
         return read_seqcount_begin(&syncp->seq);
 #else
 #if BITS_PER_LONG==32
-        local_bh_disable();
+        local_irq_disable();
 #endif
         return 0;
 #endif
 }
 
-static inline bool u64_stats_fetch_retry_bh(const struct u64_stats_sync *syncp,
+static inline bool u64_stats_fetch_retry_irq(const struct u64_stats_sync *syncp,
                                          unsigned int start)
 {
 #if BITS_PER_LONG==32 && defined(CONFIG_SMP)
         return read_seqcount_retry(&syncp->seq, start);
 #else
 #if BITS_PER_LONG==32
-        local_bh_enable();
+        local_irq_enable();
 #endif
         return false;
 #endif
diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h
index 2c14d9cdd57a..44b38b92236a 100644
--- a/include/linux/usb/cdc_ncm.h
+++ b/include/linux/usb/cdc_ncm.h
@@ -94,6 +94,7 @@ struct cdc_ncm_ctx {
 
         const struct usb_cdc_ncm_desc *func_desc;
         const struct usb_cdc_mbim_desc *mbim_desc;
+        const struct usb_cdc_mbim_extended_desc *mbim_extended_desc;
         const struct usb_cdc_ether_desc *ether_desc;
 
         struct usb_interface *control;
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index a54fe82e704b..a9c723be1acf 100644
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -48,11 +48,15 @@ enum {
         WL12XX_TCXOCLOCK_33_6   = 7, /* 33.6 MHz */
 };
 
-struct wl12xx_platform_data {
-        void (*set_power)(bool enable);
+struct wl1251_platform_data {
+        int power_gpio;
         /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
         int irq;
         bool use_eeprom;
+};
+
+struct wl12xx_platform_data {
+        int irq;
         int board_ref_clock;
         int board_tcxo_clock;
         unsigned long platform_quirks;
@@ -68,6 +72,10 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
 
 struct wl12xx_platform_data *wl12xx_get_platform_data(void);
 
+int wl1251_set_platform_data(const struct wl1251_platform_data *data);
+
+struct wl1251_platform_data *wl1251_get_platform_data(void);
+
 #else
 
 static inline
@@ -82,6 +90,18 @@ struct wl12xx_platform_data *wl12xx_get_platform_data(void)
         return ERR_PTR(-ENODATA);
 }
 
+static inline
+int wl1251_set_platform_data(const struct wl1251_platform_data *data)
+{
+        return -ENOSYS;
+}
+
+static inline
+struct wl1251_platform_data *wl1251_get_platform_data(void)
+{
+        return ERR_PTR(-ENODATA);
+}
+
 #endif
 
 #endif