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

Pull networking updates from David Miller:
 "Highlights (1721 non-merge commits, this has to be a record of some
  sort):

   1) Add 'random' mode to team driver, from Jiri Pirko and Eric
      Dumazet.

   2) Make it so that any driver that supports configuration of multiple
      MAC addresses can provide the forwarding database add and del
      calls by providing a default implementation and hooking that up if
      the driver doesn't have an explicit set of handlers.  From Vlad
      Yasevich.

   3) Support GSO segmentation over tunnels and other encapsulating
      devices such as VXLAN, from Pravin B Shelar.

   4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.

   5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita
      Dukkipati.

   6) In the PHY layer, allow supporting wake-on-lan in situations where
      the PHY registers have to be written for it to be configured.

      Use it to support wake-on-lan in mv643xx_eth.

      From Michael Stapelberg.

   7) Significantly improve firewire IPV6 support, from YOSHIFUJI
      Hideaki.

   8) Allow multiple packets to be sent in a single transmission using
      network coding in batman-adv, from Martin Hundebøll.

   9) Add support for T5 cxgb4 chips, from Santosh Rastapur.

  10) Generalize the VXLAN forwarding tables so that there is more
      flexibility in configurating various aspects of the endpoints.
      From David Stevens.

  11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,
      from Dmitry Kravkov.

  12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo
      Neira Ayuso.

  13) Start adding networking selftests.

  14) In situations of overload on the same AF_PACKET fanout socket, or
      per-cpu packet receive queue, minimize drop by distributing the
      load to other cpus/fanouts.  From Willem de Bruijn and Eric
      Dumazet.

  15) Add support for new payload offset BPF instruction, from Daniel
      Borkmann.

  16) Convert several drivers over to mdoule_platform_driver(), from
      Sachin Kamat.

  17) Provide a minimal BPF JIT image disassembler userspace tool, from
      Daniel Borkmann.

  18) Rewrite F-RTO implementation in TCP to match the final
      specification of it in RFC4138 and RFC5682.  From Yuchung Cheng.

  19) Provide netlink socket diag of netlink sockets ("Yo dawg, I hear
      you like netlink, so I implemented netlink dumping of netlink
      sockets.") From Andrey Vagin.

  20) Remove ugly passing of rtnetlink attributes into rtnl_doit
      functions, from Thomas Graf.

  21) Allow userspace to be able to see if a configuration change occurs
      in the middle of an address or device list dump, from Nicolas
      Dichtel.

  22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes
      Frederic Sowa.

  23) Increase accuracy of packet length used by packet scheduler, from
      Jason Wang.

  24) Beginning set of changes to make ipv4/ipv6 fragment handling more
      scalable and less susceptible to overload and locking contention,
      from Jesper Dangaard Brouer.

  25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()
      instead.  From Hong Zhiguo.

  26) Optimize route usage in IPVS by avoiding reference counting where
      possible, from Julian Anastasov.

  27) Convert IPVS schedulers to RCU, also from Julian Anastasov.

  28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger
      Eitzenberger.

  29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,
      nfnetlink_log, and nfnetlink_queue.  From Gao feng.

  30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.

  31) Support several new r8169 chips, from Hayes Wang.

  32) Support tokenized interface identifiers in ipv6, from Daniel
      Borkmann.

  33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.

  34) Add 802.1ad vlan offload support, from Patrick McHardy.

  35) Support mmap() based netlink communication, also from Patrick
      McHardy.

  36) Support HW timestamping in mlx4 driver, from Amir Vadai.

  37) Rationalize AF_PACKET packet timestamping when transmitting, from
      Willem de Bruijn and Daniel Borkmann.

  38) Bring parity to what's provided by /proc/net/packet socket dumping
      and the info provided by netlink socket dumping of AF_PACKET
      sockets.  From Nicolas Dichtel.

  39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin
      Poirier"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
  filter: fix va_list build error
  af_unix: fix a fatal race with bit fields
  bnx2x: Prevent memory leak when cnic is absent
  bnx2x: correct reading of speed capabilities
  net: sctp: attribute printl with __printf for gcc fmt checks
  netlink: kconfig: move mmap i/o into netlink kconfig
  netpoll: convert mutex into a semaphore
  netlink: Fix skb ref counting.
  net_sched: act_ipt forward compat with xtables
  mlx4_en: fix a build error on 32bit arches
  Revert "bnx2x: allow nvram test to run when device is down"
  bridge: avoid OOPS if root port not found
  drivers: net: cpsw: fix kernel warn on cpsw irq enable
  sh_eth: use random MAC address if no valid one supplied
  3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
  tg3: fix to append hardware time stamping flags
  unix/stream: fix peeking with an offset larger than data in queue
  unix/dgram: fix peeking with an offset larger than data in queue
  unix/dgram: peek beyond 0-sized skbs
  openvswitch: Remove unneeded ovs_netdev_get_ifindex()
  ...

46 files changed, 933 insertions, 1891 deletions

diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index e0ce311011c0..f14a98a79c9d 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -134,6 +134,7 @@ struct bcma_host_ops {
 #define BCMA_CORE_I2S                   0x834
 #define BCMA_CORE_SDR_DDR1_MEM_CTL      0x835   /* SDR/DDR1 memory controller core */
 #define BCMA_CORE_SHIM                  0x837   /* SHIM component in ubus/6362 */
+#define BCMA_CORE_ARM_CR4               0x83e
 #define BCMA_CORE_DEFAULT               0xFFF
 
 #define BCMA_MAX_NR_CORES               16
@@ -173,6 +174,60 @@ struct bcma_host_ops {
 #define BCMA_CHIP_ID_BCM53572   53572
 #define  BCMA_PKG_ID_BCM47188   9
 
+/* Board types (on PCI usually equals to the subsystem dev id) */
+/* BCM4313 */
+#define BCMA_BOARD_TYPE_BCM94313BU      0X050F
+#define BCMA_BOARD_TYPE_BCM94313HM      0X0510
+#define BCMA_BOARD_TYPE_BCM94313EPA     0X0511
+#define BCMA_BOARD_TYPE_BCM94313HMG     0X051C
+/* BCM4716 */
+#define BCMA_BOARD_TYPE_BCM94716NR2     0X04CD
+/* BCM43224 */
+#define BCMA_BOARD_TYPE_BCM943224X21    0X056E
+#define BCMA_BOARD_TYPE_BCM943224X21_FCC        0X00D1
+#define BCMA_BOARD_TYPE_BCM943224X21B   0X00E9
+#define BCMA_BOARD_TYPE_BCM943224M93    0X008B
+#define BCMA_BOARD_TYPE_BCM943224M93A   0X0090
+#define BCMA_BOARD_TYPE_BCM943224X16    0X0093
+#define BCMA_BOARD_TYPE_BCM94322X9      0X008D
+#define BCMA_BOARD_TYPE_BCM94322M35E    0X008E
+/* BCM43228 */
+#define BCMA_BOARD_TYPE_BCM943228BU8    0X0540
+#define BCMA_BOARD_TYPE_BCM943228BU9    0X0541
+#define BCMA_BOARD_TYPE_BCM943228BU     0X0542
+#define BCMA_BOARD_TYPE_BCM943227HM4L   0X0543
+#define BCMA_BOARD_TYPE_BCM943227HMB    0X0544
+#define BCMA_BOARD_TYPE_BCM943228HM4L   0X0545
+#define BCMA_BOARD_TYPE_BCM943228SD     0X0573
+/* BCM4331 */
+#define BCMA_BOARD_TYPE_BCM94331X19     0X00D6
+#define BCMA_BOARD_TYPE_BCM94331X28     0X00E4
+#define BCMA_BOARD_TYPE_BCM94331X28B    0X010E
+#define BCMA_BOARD_TYPE_BCM94331PCIEBT3AX       0X00E4
+#define BCMA_BOARD_TYPE_BCM94331X12_2G  0X00EC
+#define BCMA_BOARD_TYPE_BCM94331X12_5G  0X00ED
+#define BCMA_BOARD_TYPE_BCM94331X29B    0X00EF
+#define BCMA_BOARD_TYPE_BCM94331CSAX    0X00EF
+#define BCMA_BOARD_TYPE_BCM94331X19C    0X00F5
+#define BCMA_BOARD_TYPE_BCM94331X33     0X00F4
+#define BCMA_BOARD_TYPE_BCM94331BU      0X0523
+#define BCMA_BOARD_TYPE_BCM94331S9BU    0X0524
+#define BCMA_BOARD_TYPE_BCM94331MC      0X0525
+#define BCMA_BOARD_TYPE_BCM94331MCI     0X0526
+#define BCMA_BOARD_TYPE_BCM94331PCIEBT4 0X0527
+#define BCMA_BOARD_TYPE_BCM94331HM      0X0574
+#define BCMA_BOARD_TYPE_BCM94331PCIEDUAL        0X059B
+#define BCMA_BOARD_TYPE_BCM94331MCH5    0X05A9
+#define BCMA_BOARD_TYPE_BCM94331CS      0X05C6
+#define BCMA_BOARD_TYPE_BCM94331CD      0X05DA
+/* BCM53572 */
+#define BCMA_BOARD_TYPE_BCM953572BU     0X058D
+#define BCMA_BOARD_TYPE_BCM953572NR2    0X058E
+#define BCMA_BOARD_TYPE_BCM947188NR2    0X058F
+#define BCMA_BOARD_TYPE_BCM953572SDRNR2 0X0590
+/* BCM43142 */
+#define BCMA_BOARD_TYPE_BCM943142HM     0X05E0
+
 struct bcma_device {
         struct bcma_bus *bus;
         struct bcma_device_id id;
diff --git a/include/linux/bcma/bcma_driver_chipcommon.h b/include/linux/bcma/bcma_driver_chipcommon.h
index 8390c474f69a..b8b09eac60a4 100644
--- a/include/linux/bcma/bcma_driver_chipcommon.h
+++ b/include/linux/bcma/bcma_driver_chipcommon.h
@@ -104,6 +104,7 @@
 #define  BCMA_CC_CHIPST_4706_MIPS_BENDIAN       BIT(3) /* 0: little, 1: big endian */
 #define  BCMA_CC_CHIPST_4706_PCIE1_DISABLE      BIT(5) /* PCIE1 enable strap pin */
 #define  BCMA_CC_CHIPST_5357_NAND_BOOT          BIT(4) /* NAND boot, valid for CC rev 38 and/or BCM5357 */
+#define  BCMA_CC_CHIPST_4360_XTAL_40MZ          0x00000001
 #define BCMA_CC_JCMD                    0x0030          /* Rev >= 10 only */
 #define  BCMA_CC_JCMD_START             0x80000000
 #define  BCMA_CC_JCMD_BUSY              0x80000000
@@ -315,6 +316,9 @@
 #define BCMA_CC_PMU_CTL                 0x0600 /* PMU control */
 #define  BCMA_CC_PMU_CTL_ILP_DIV        0xFFFF0000 /* ILP div mask */
 #define  BCMA_CC_PMU_CTL_ILP_DIV_SHIFT  16
+#define  BCMA_CC_PMU_CTL_RES            0x00006000 /* reset control mask */
+#define  BCMA_CC_PMU_CTL_RES_SHIFT      13
+#define  BCMA_CC_PMU_CTL_RES_RELOAD     0x2     /* reload POR values */
 #define  BCMA_CC_PMU_CTL_PLL_UPD        0x00000400
 #define  BCMA_CC_PMU_CTL_NOILPONW       0x00000200 /* No ILP on wait */
 #define  BCMA_CC_PMU_CTL_HTREQEN        0x00000100 /* HT req enable */
@@ -607,6 +611,8 @@ void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
 
 extern u32 bcma_chipco_watchdog_timer_set(struct bcma_drv_cc *cc, u32 ticks);
 
+extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc);
+
 void bcma_chipco_irq_mask(struct bcma_drv_cc *cc, u32 mask, u32 value);
 
 u32 bcma_chipco_irq_status(struct bcma_drv_cc *cc, u32 mask);
diff --git a/include/linux/bcma/bcma_regs.h b/include/linux/bcma/bcma_regs.h
index 7e8104bb7a7e..917dcd7965e7 100644
--- a/include/linux/bcma/bcma_regs.h
+++ b/include/linux/bcma/bcma_regs.h
@@ -37,6 +37,7 @@
 #define  BCMA_IOST_BIST_DONE            0x8000
 #define BCMA_RESET_CTL                  0x0800
 #define  BCMA_RESET_CTL_RESET           0x0001
+#define BCMA_RESET_ST                   0x0804
 
 /* BCMA PCI config space registers. */
 #define BCMA_PCI_PMCSR                  0x44
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h
index 2c1bc1ea04ee..1d5b02a96c46 100644
--- a/include/linux/cn_proc.h
+++ b/include/linux/cn_proc.h
@@ -26,6 +26,7 @@ void proc_id_connector(struct task_struct *task, int which_id);
 void proc_sid_connector(struct task_struct *task);
 void proc_ptrace_connector(struct task_struct *task, int which_id);
 void proc_comm_connector(struct task_struct *task);
+void proc_coredump_connector(struct task_struct *task);
 void proc_exit_connector(struct task_struct *task);
 #else
 static inline void proc_fork_connector(struct task_struct *task)
@@ -48,6 +49,9 @@ static inline void proc_ptrace_connector(struct task_struct *task,
                                          int ptrace_id)
 {}
 
+static inline void proc_coredump_connector(struct task_struct *task)
+{}
+
 static inline void proc_exit_connector(struct task_struct *task)
 {}
 #endif  /* CONFIG_PROC_EVENTS */
diff --git a/include/linux/filter.h b/include/linux/filter.h
index c45eabc135e1..c050dcc322a4 100644
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
@@ -48,8 +48,22 @@ 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);
 
 #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);
+
+static inline void bpf_jit_dump(unsigned int flen, unsigned int proglen,
+                                u32 pass, void *image)
+{
+        pr_err("flen=%u proglen=%u pass=%u image=%p\n",
+               flen, proglen, pass, image);
+        if (image)
+                print_hex_dump(KERN_ERR, "JIT code: ", DUMP_PREFIX_ADDRESS,
+                               16, 1, image, proglen, false);
+}
 #define SK_RUN_FILTER(FILTER, SKB) (*FILTER->bpf_func)(SKB, FILTER->insns)
 #else
 static inline void bpf_jit_compile(struct sk_filter *fp)
@@ -126,6 +140,7 @@ enum {
         BPF_S_ANC_SECCOMP_LD_W,
         BPF_S_ANC_VLAN_TAG,
         BPF_S_ANC_VLAN_TAG_PRESENT,
+        BPF_S_ANC_PAY_OFFSET,
 };
 
 #endif /* __LINUX_FILTER_H__ */
diff --git a/include/linux/icmpv6.h b/include/linux/icmpv6.h
index b4f6c29caced..630f45335c73 100644
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
@@ -11,9 +11,21 @@ static inline struct icmp6hdr *icmp6_hdr(const struct sk_buff *skb)
 
 #include <linux/netdevice.h>
 
-extern void                             icmpv6_send(struct sk_buff *skb,
-                                                    u8 type, u8 code,
-                                                    __u32 info);
+#if IS_ENABLED(CONFIG_IPV6)
+extern void icmpv6_send(struct sk_buff *skb, u8 type, u8 code, __u32 info);
+
+typedef void ip6_icmp_send_t(struct sk_buff *skb, u8 type, u8 code, __u32 info);
+extern int inet6_register_icmp_sender(ip6_icmp_send_t *fn);
+extern int inet6_unregister_icmp_sender(ip6_icmp_send_t *fn);
+
+#else
+
+static inline void icmpv6_send(struct sk_buff *skb,
+                               u8 type, u8 code, __u32 info)
+{
+
+}
+#endif
 
 extern int                              icmpv6_init(void);
 extern int                              icmpv6_err_convert(u8 type, u8 code,
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index 7e24fe0cfbcd..06b0ed0154a4 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -113,6 +113,34 @@
 #define IEEE80211_CTL_EXT_SSW_FBACK     0x9000
 #define IEEE80211_CTL_EXT_SSW_ACK       0xa000
 
+
+#define IEEE80211_SN_MASK               ((IEEE80211_SCTL_SEQ) >> 4)
+#define IEEE80211_MAX_SN                IEEE80211_SN_MASK
+#define IEEE80211_SN_MODULO             (IEEE80211_MAX_SN + 1)
+
+static inline int ieee80211_sn_less(u16 sn1, u16 sn2)
+{
+        return ((sn1 - sn2) & IEEE80211_SN_MASK) > (IEEE80211_SN_MODULO >> 1);
+}
+
+static inline u16 ieee80211_sn_add(u16 sn1, u16 sn2)
+{
+        return (sn1 + sn2) & IEEE80211_SN_MASK;
+}
+
+static inline u16 ieee80211_sn_inc(u16 sn)
+{
+        return ieee80211_sn_add(sn, 1);
+}
+
+static inline u16 ieee80211_sn_sub(u16 sn1, u16 sn2)
+{
+        return (sn1 - sn2) & IEEE80211_SN_MASK;
+}
+
+#define IEEE80211_SEQ_TO_SN(seq)        (((seq) & IEEE80211_SCTL_SEQ) >> 4)
+#define IEEE80211_SN_TO_SEQ(ssn)        (((ssn) << 4) & IEEE80211_SCTL_SEQ)
+
 /* miscellaneous IEEE 802.11 constants */
 #define IEEE80211_MAX_FRAG_THRESHOLD    2352
 #define IEEE80211_MAX_RTS_THRESHOLD     2353
@@ -185,7 +213,7 @@ struct ieee80211_hdr {
         u8 addr3[6];
         __le16 seq_ctrl;
         u8 addr4[6];
-} __packed;
+} __packed __aligned(2);
 
 struct ieee80211_hdr_3addr {
         __le16 frame_control;
@@ -194,7 +222,7 @@ struct ieee80211_hdr_3addr {
         u8 addr2[6];
         u8 addr3[6];
         __le16 seq_ctrl;
-} __packed;
+} __packed __aligned(2);
 
 struct ieee80211_qos_hdr {
         __le16 frame_control;
@@ -204,7 +232,7 @@ struct ieee80211_qos_hdr {
         u8 addr3[6];
         __le16 seq_ctrl;
         __le16 qos_ctrl;
-} __packed;
+} __packed __aligned(2);
 
 /**
  * ieee80211_has_tods - check if IEEE80211_FCTL_TODS is set
@@ -581,7 +609,7 @@ struct ieee80211s_hdr {
         __le32 seqnum;
         u8 eaddr1[6];
         u8 eaddr2[6];
-} __packed;
+} __packed __aligned(2);
 
 /* Mesh flags */
 #define MESH_FLAGS_AE_A4        0x1
@@ -645,6 +673,36 @@ struct ieee80211_channel_sw_ie {
 } __packed;
 
 /**
+ * struct ieee80211_ext_chansw_ie
+ *
+ * This structure represents the "Extended Channel Switch Announcement element"
+ */
+struct ieee80211_ext_chansw_ie {
+        u8 mode;
+        u8 new_operating_class;
+        u8 new_ch_num;
+        u8 count;
+} __packed;
+
+/**
+ * struct ieee80211_sec_chan_offs_ie - secondary channel offset IE
+ * @sec_chan_offs: secondary channel offset, uses IEEE80211_HT_PARAM_CHA_SEC_*
+ *      values here
+ * This structure represents the "Secondary Channel Offset element"
+ */
+struct ieee80211_sec_chan_offs_ie {
+        u8 sec_chan_offs;
+} __packed;
+
+/**
+ * struct ieee80211_wide_bw_chansw_ie - wide bandwidth channel switch IE
+ */
+struct ieee80211_wide_bw_chansw_ie {
+        u8 new_channel_width;
+        u8 new_center_freq_seg0, new_center_freq_seg1;
+} __packed;
+
+/**
  * struct ieee80211_tim
  *
  * This structure refers to "Traffic Indication Map information element"
@@ -812,12 +870,15 @@ struct ieee80211_mgmt {
                                 } __packed wme_action;
                                 struct{
                                         u8 action_code;
-                                        u8 element_id;
-                                        u8 length;
-                                        struct ieee80211_channel_sw_ie sw_elem;
+                                        u8 variable[0];
                                 } __packed chan_switch;
                                 struct{
                                         u8 action_code;
+                                        struct ieee80211_ext_chansw_ie data;
+                                        u8 variable[0];
+                                } __packed ext_chan_switch;
+                                struct{
+                                        u8 action_code;
                                         u8 dialog_token;
                                         u8 element_id;
                                         u8 length;
@@ -875,7 +936,7 @@ struct ieee80211_mgmt {
                         } u;
                 } __packed action;
         } u;
-} __packed;
+} __packed __aligned(2);
 
 /* Supported Rates value encodings in 802.11n-2009 7.3.2.2 */
 #define BSS_MEMBERSHIP_SELECTOR_HT_PHY  127
@@ -906,20 +967,20 @@ struct ieee80211_rts {
         __le16 duration;
         u8 ra[6];
         u8 ta[6];
-} __packed;
+} __packed __aligned(2);
 
 struct ieee80211_cts {
         __le16 frame_control;
         __le16 duration;
         u8 ra[6];
-} __packed;
+} __packed __aligned(2);
 
 struct ieee80211_pspoll {
         __le16 frame_control;
         __le16 aid;
         u8 bssid[6];
         u8 ta[6];
-} __packed;
+} __packed __aligned(2);
 
 /* TDLS */
 
@@ -999,6 +1060,26 @@ enum ieee80211_p2p_attr_id {
         IEEE80211_P2P_ATTR_MAX
 };
 
+/* Notice of Absence attribute - described in P2P spec 4.1.14 */
+/* Typical max value used here */
+#define IEEE80211_P2P_NOA_DESC_MAX      4
+
+struct ieee80211_p2p_noa_desc {
+        u8 count;
+        __le32 duration;
+        __le32 interval;
+        __le32 start_time;
+} __packed;
+
+struct ieee80211_p2p_noa_attr {
+        u8 index;
+        u8 oppps_ctwindow;
+        struct ieee80211_p2p_noa_desc desc[IEEE80211_P2P_NOA_DESC_MAX];
+} __packed;
+
+#define IEEE80211_P2P_OPPPS_ENABLE_BIT          BIT(7)
+#define IEEE80211_P2P_OPPPS_CTWINDOW_MASK       0x7F
+
 /**
  * struct ieee80211_bar - HT Block Ack Request
  *
@@ -1290,11 +1371,6 @@ struct ieee80211_vht_operation {
 } __packed;
 
 
-#define IEEE80211_VHT_MCS_ZERO_TO_SEVEN_SUPPORT 0
-#define IEEE80211_VHT_MCS_ZERO_TO_EIGHT_SUPPORT 1
-#define IEEE80211_VHT_MCS_ZERO_TO_NINE_SUPPORT  2
-#define IEEE80211_VHT_MCS_NOT_SUPPORTED 3
-
 /* 802.11ac VHT Capabilities */
 #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_3895                  0x00000000
 #define IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991                  0x00000001
@@ -1310,10 +1386,11 @@ struct ieee80211_vht_operation {
 #define IEEE80211_VHT_CAP_RXSTBC_2                              0x00000200
 #define IEEE80211_VHT_CAP_RXSTBC_3                              0x00000300
 #define IEEE80211_VHT_CAP_RXSTBC_4                              0x00000400
+#define IEEE80211_VHT_CAP_RXSTBC_MASK                           0x00000700
 #define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE                 0x00000800
 #define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE                 0x00001000
 #define IEEE80211_VHT_CAP_BEAMFORMER_ANTENNAS_MAX               0x00006000
-#define IEEE80211_VHT_CAP_SOUNDING_DIMENTION_MAX                0x00030000
+#define IEEE80211_VHT_CAP_SOUNDING_DIMENSIONS_MAX               0x00030000
 #define IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE                 0x00080000
 #define IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE                 0x00100000
 #define IEEE80211_VHT_CAP_VHT_TXOP_PS                           0x00200000
@@ -1594,6 +1671,7 @@ enum ieee80211_eid {
 
         WLAN_EID_HT_CAPABILITY = 45,
         WLAN_EID_HT_OPERATION = 61,
+        WLAN_EID_SECONDARY_CHANNEL_OFFSET = 62,
 
         WLAN_EID_RSN = 48,
         WLAN_EID_MMIE = 76,
@@ -1628,6 +1706,8 @@ enum ieee80211_eid {
         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,
 
         /* 802.11ad */
         WLAN_EID_NON_TX_BSSID_CAP =  83,
@@ -1751,6 +1831,7 @@ enum ieee80211_key_len {
 
 /* Public action codes */
 enum ieee80211_pub_actioncode {
+        WLAN_PUB_ACTION_EXT_CHANSW_ANN = 4,
         WLAN_PUB_ACTION_TDLS_DISCOVER_RES = 14,
 };
 
@@ -1911,6 +1992,16 @@ enum ieee80211_timeout_interval_type {
         WLAN_TIMEOUT_ASSOC_COMEBACK = 3 /* 802.11w */,
 };
 
+/**
+ * struct ieee80211_timeout_interval_ie - Timeout Interval element
+ * @type: type, see &enum ieee80211_timeout_interval_type
+ * @value: timeout interval value
+ */
+struct ieee80211_timeout_interval_ie {
+        u8 type;
+        __le32 value;
+} __packed;
+
 /* BACK action code */
 enum ieee80211_back_actioncode {
         WLAN_ACTION_ADDBA_REQ = 0,
diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 89b4614a4722..f563907ed776 100644
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -33,7 +33,15 @@ static inline struct arphdr *arp_hdr(const struct sk_buff *skb)
 
 static inline int arp_hdr_len(struct net_device *dev)
 {
-        /* ARP header, plus 2 device addresses, plus 2 IP addresses. */
-        return sizeof(struct arphdr) + (dev->addr_len + sizeof(u32)) * 2;
+        switch (dev->type) {
+#if IS_ENABLED(CONFIG_FIREWIRE_NET)
+        case ARPHRD_IEEE1394:
+                /* ARP header, device address and 2 IP addresses */
+                return sizeof(struct arphdr) + dev->addr_len + sizeof(u32) * 2;
+#endif
+        default:
+                /* ARP header, plus 2 device addresses, plus 2 IP addresses. */
+                return sizeof(struct arphdr) + (dev->addr_len + sizeof(u32)) * 2;
+        }
 }
 #endif  /* _LINUX_IF_ARP_H */
diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index cfd21e3d5506..4474557904f6 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -112,6 +112,10 @@ struct team_mode_ops {
         void (*port_disabled)(struct team *team, struct team_port *port);
 };
 
+extern int team_modeop_port_enter(struct team *team, struct team_port *port);
+extern void team_modeop_port_change_dev_addr(struct team *team,
+                                             struct team_port *port);
+
 enum team_option_type {
         TEAM_OPTION_TYPE_U32,
         TEAM_OPTION_TYPE_STRING,
@@ -236,7 +240,26 @@ static inline struct team_port *team_get_port_by_index_rcu(struct team *team,
         return NULL;
 }
 
-extern int team_port_set_team_dev_addr(struct team_port *port);
+static inline struct team_port *
+team_get_first_port_txable_rcu(struct team *team, struct team_port *port)
+{
+        struct team_port *cur;
+
+        if (likely(team_port_txable(port)))
+                return port;
+        cur = port;
+        list_for_each_entry_continue_rcu(cur, &team->port_list, list)
+                if (team_port_txable(port))
+                        return cur;
+        list_for_each_entry_rcu(cur, &team->port_list, list) {
+                if (cur == port)
+                        break;
+                if (team_port_txable(port))
+                        return cur;
+        }
+        return NULL;
+}
+
 extern int team_options_register(struct team *team,
                                  const struct team_option *option,
                                  size_t option_count);
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 218a3b686d90..52bd03b38962 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -86,15 +86,15 @@ static inline int is_vlan_dev(struct net_device *dev)
 #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE)
 
 extern struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
-                                               u16 vlan_id);
+                                               __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 bool vlan_do_receive(struct sk_buff **skb);
 extern struct sk_buff *vlan_untag(struct sk_buff *skb);
 
-extern int vlan_vid_add(struct net_device *dev, unsigned short vid);
-extern void vlan_vid_del(struct net_device *dev, unsigned short vid);
+extern int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid);
+extern void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid);
 
 extern int vlan_vids_add_by_dev(struct net_device *dev,
                                 const struct net_device *by_dev);
@@ -104,7 +104,8 @@ extern void vlan_vids_del_by_dev(struct net_device *dev,
 extern bool vlan_uses_dev(const struct net_device *dev);
 #else
 static inline struct net_device *
-__vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id)
+__vlan_find_dev_deep(struct net_device *real_dev,
+                     __be16 vlan_proto, u16 vlan_id)
 {
         return NULL;
 }
@@ -131,12 +132,12 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
         return skb;
 }
 
-static inline int vlan_vid_add(struct net_device *dev, unsigned short vid)
+static inline int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid)
 {
         return 0;
 }
 
-static inline void vlan_vid_del(struct net_device *dev, unsigned short vid)
+static inline void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid)
 {
 }
 
@@ -157,9 +158,20 @@ static inline bool vlan_uses_dev(const struct net_device *dev)
 }
 #endif
 
+static inline bool vlan_hw_offload_capable(netdev_features_t features,
+                                           __be16 proto)
+{
+        if (proto == htons(ETH_P_8021Q) && features & NETIF_F_HW_VLAN_CTAG_TX)
+                return true;
+        if (proto == htons(ETH_P_8021AD) && features & NETIF_F_HW_VLAN_STAG_TX)
+                return true;
+        return false;
+}
+
 /**
  * vlan_insert_tag - regular VLAN tag inserting
  * @skb: skbuff to tag
+ * @vlan_proto: VLAN encapsulation protocol
  * @vlan_tci: VLAN TCI to insert
  *
  * Inserts the VLAN tag into @skb as part of the payload
@@ -170,7 +182,8 @@ static inline bool vlan_uses_dev(const struct net_device *dev)
  *
  * Does not change skb->protocol so this function can be used during receive.
  */
-static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb, u16 vlan_tci)
+static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb,
+                                              __be16 vlan_proto, u16 vlan_tci)
 {
         struct vlan_ethhdr *veth;
 
@@ -185,7 +198,7 @@ static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb, u16 vlan_tci)
         skb->mac_header -= VLAN_HLEN;
 
         /* first, the ethernet type */
-        veth->h_vlan_proto = htons(ETH_P_8021Q);
+        veth->h_vlan_proto = vlan_proto;
 
         /* now, the TCI */
         veth->h_vlan_TCI = htons(vlan_tci);
@@ -204,24 +217,28 @@ static inline struct sk_buff *vlan_insert_tag(struct sk_buff *skb, u16 vlan_tci)
  * Following the skb_unshare() example, in case of error, the calling function
  * doesn't have to worry about freeing the original skb.
  */
-static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
+static inline struct sk_buff *__vlan_put_tag(struct sk_buff *skb,
+                                             __be16 vlan_proto, u16 vlan_tci)
 {
-        skb = vlan_insert_tag(skb, vlan_tci);
+        skb = vlan_insert_tag(skb, vlan_proto, vlan_tci);
         if (skb)
-                skb->protocol = htons(ETH_P_8021Q);
+                skb->protocol = vlan_proto;
         return skb;
 }
 
 /**
  * __vlan_hwaccel_put_tag - hardware accelerated VLAN inserting
  * @skb: skbuff to tag
+ * @vlan_proto: VLAN encapsulation protocol
  * @vlan_tci: VLAN TCI to insert
  *
  * Puts the VLAN TCI in @skb->vlan_tci and lets the device do the rest
  */
 static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
+                                                     __be16 vlan_proto,
                                                      u16 vlan_tci)
 {
+        skb->vlan_proto = vlan_proto;
         skb->vlan_tci = VLAN_TAG_PRESENT | vlan_tci;
         return skb;
 }
@@ -236,12 +253,13 @@ static inline struct sk_buff *__vlan_hwaccel_put_tag(struct sk_buff *skb,
  * Assumes skb->dev is the target that will xmit this frame.
  * Returns a VLAN tagged skb.
  */
-static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb, u16 vlan_tci)
+static inline struct sk_buff *vlan_put_tag(struct sk_buff *skb,
+                                           __be16 vlan_proto, u16 vlan_tci)
 {
-        if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
-                return __vlan_hwaccel_put_tag(skb, vlan_tci);
+        if (vlan_hw_offload_capable(skb->dev->features, vlan_proto)) {
+                return __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci);
         } else {
-                return __vlan_put_tag(skb, vlan_tci);
+                return __vlan_put_tag(skb, vlan_proto, vlan_tci);
         }
 }
 
@@ -256,9 +274,9 @@ static inline int __vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)
 {
         struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data;
 
-        if (veth->h_vlan_proto != htons(ETH_P_8021Q)) {
+        if (veth->h_vlan_proto != htons(ETH_P_8021Q) &&
+            veth->h_vlan_proto != htons(ETH_P_8021AD))
                 return -EINVAL;
-        }
 
         *vlan_tci = ntohs(veth->h_vlan_TCI);
         return 0;
@@ -294,7 +312,7 @@ static inline int __vlan_hwaccel_get_tag(const struct sk_buff *skb,
  */
 static inline int vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)
 {
-        if (skb->dev->features & NETIF_F_HW_VLAN_TX) {
+        if (skb->dev->features & NETIF_F_HW_VLAN_CTAG_TX) {
                 return __vlan_hwaccel_get_tag(skb, vlan_tci);
         } else {
                 return __vlan_get_tag(skb, vlan_tci);
@@ -339,7 +357,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
          */
 
         proto = vhdr->h_vlan_encapsulated_proto;
-        if (ntohs(proto) >= 1536) {
+        if (ntohs(proto) >= ETH_P_802_3_MIN) {
                 skb->protocol = proto;
                 return;
         }
diff --git a/include/linux/ktime.h b/include/linux/ktime.h
index e83512f63df5..bbca12804d12 100644
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@ -330,6 +330,24 @@ static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
 
 extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);
 
+/**
+ * ktime_to_timespec_cond - convert a ktime_t variable to timespec
+ *                          format only if the variable contains data
+ * @kt:         the ktime_t variable to convert
+ * @ts:         the timespec variable to store the result in
+ *
+ * Returns true if there was a successful conversion, false if kt was 0.
+ */
+static inline bool ktime_to_timespec_cond(const ktime_t kt, struct timespec *ts)
+{
+        if (kt.tv64) {
+                *ts = ktime_to_timespec(kt);
+                return true;
+        } else {
+                return false;
+        }
+}
+
 /*
  * The resolution of the clocks. The resolution value is returned in
  * the clock_getres() system call to give application programmers an
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index 9dbb41a4e250..8752dbbc6135 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -19,6 +19,7 @@
 #define PHY_ID_KSZ9021          0x00221610
 #define PHY_ID_KS8737           0x00221720
 #define PHY_ID_KSZ8021          0x00221555
+#define PHY_ID_KSZ8031          0x00221556
 #define PHY_ID_KSZ8041          0x00221510
 #define PHY_ID_KSZ8051          0x00221550
 /* same id: ks8001 Rev. A/B, and ks8721 Rev 3. */
diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h
index 260695186256..adf6e0648f20 100644
--- a/include/linux/mlx4/cmd.h
+++ b/include/linux/mlx4/cmd.h
@@ -34,6 +34,7 @@
 #define MLX4_CMD_H
 
 #include <linux/dma-mapping.h>
+#include <linux/if_link.h>
 
 enum {
         /* initialization and general commands */
@@ -232,6 +233,11 @@ struct mlx4_cmd_mailbox *mlx4_alloc_cmd_mailbox(struct mlx4_dev *dev);
 void mlx4_free_cmd_mailbox(struct mlx4_dev *dev, struct mlx4_cmd_mailbox *mailbox);
 
 u32 mlx4_comm_get_version(void);
+int mlx4_set_vf_mac(struct mlx4_dev *dev, int port, int vf, u64 mac);
+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);
+
 
 #define MLX4_COMM_GET_IF_REV(cmd_chan_ver) (u8)((cmd_chan_ver) >> 8)
 
diff --git a/include/linux/mlx4/cq.h b/include/linux/mlx4/cq.h
index 6f65b2c8bb89..98fa492cf406 100644
--- a/include/linux/mlx4/cq.h
+++ b/include/linux/mlx4/cq.h
@@ -64,6 +64,22 @@ struct mlx4_err_cqe {
         u8                      owner_sr_opcode;
 };
 
+struct mlx4_ts_cqe {
+        __be32                  vlan_my_qpn;
+        __be32                  immed_rss_invalid;
+        __be32                  g_mlpath_rqpn;
+        __be32                  timestamp_hi;
+        __be16                  status;
+        u8                      ipv6_ext_mask;
+        u8                      badfcs_enc;
+        __be32                  byte_cnt;
+        __be16                  wqe_index;
+        __be16                  checksum;
+        u8                      reserved;
+        __be16                  timestamp_lo;
+        u8                      owner_sr_opcode;
+} __packed;
+
 enum {
         MLX4_CQE_VLAN_PRESENT_MASK      = 1 << 29,
         MLX4_CQE_QPN_MASK               = 0xffffff,
diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h
index 811f91cf5e8c..53acaf64189f 100644
--- a/include/linux/mlx4/device.h
+++ b/include/linux/mlx4/device.h
@@ -40,6 +40,8 @@
 
 #include <linux/atomic.h>
 
+#include <linux/clocksource.h>
+
 #define MAX_MSIX_P_PORT         17
 #define MAX_MSIX                64
 #define MSIX_LEGACY_SZ          4
@@ -140,6 +142,7 @@ enum {
         MLX4_DEV_CAP_FLAG_VEP_UC_STEER  = 1LL << 41,
         MLX4_DEV_CAP_FLAG_VEP_MC_STEER  = 1LL << 42,
         MLX4_DEV_CAP_FLAG_COUNTERS      = 1LL << 48,
+        MLX4_DEV_CAP_FLAG_SET_ETH_SCHED = 1LL << 53,
         MLX4_DEV_CAP_FLAG_SENSE_SUPPORT = 1LL << 55,
         MLX4_DEV_CAP_FLAG_PORT_MNG_CHG_EV = 1LL << 59,
         MLX4_DEV_CAP_FLAG_64B_EQE       = 1LL << 61,
@@ -151,7 +154,10 @@ enum {
         MLX4_DEV_CAP_FLAG2_RSS_TOP              = 1LL <<  1,
         MLX4_DEV_CAP_FLAG2_RSS_XOR              = 1LL <<  2,
         MLX4_DEV_CAP_FLAG2_FS_EN                = 1LL <<  3,
-        MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN     = 1LL <<  4
+        MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN     = 1LL <<  4,
+        MLX4_DEV_CAP_FLAG2_TS                   = 1LL <<  5,
+        MLX4_DEV_CAP_FLAG2_VLAN_CONTROL         = 1LL <<  6,
+        MLX4_DEV_CAP_FLAG2_FSM                  = 1LL <<  7
 };
 
 enum {
@@ -443,6 +449,7 @@ struct mlx4_caps {
         u8                      eqe_factor;
         u32                     userspace_caps; /* userspace must be aware of these */
         u32                     function_caps;  /* VFs must be aware of these */
+        u16                     hca_core_clock;
 };
 
 struct mlx4_buf_list {
@@ -837,7 +844,7 @@ void mlx4_free_hwq_res(struct mlx4_dev *mdev, struct mlx4_hwq_resources *wqres,
 
 int mlx4_cq_alloc(struct mlx4_dev *dev, int nent, struct mlx4_mtt *mtt,
                   struct mlx4_uar *uar, u64 db_rec, struct mlx4_cq *cq,
-                  unsigned vector, int collapsed);
+                  unsigned vector, int collapsed, int timestamp_en);
 void mlx4_cq_free(struct mlx4_dev *dev, struct mlx4_cq *cq);
 
 int mlx4_qp_reserve_range(struct mlx4_dev *dev, int cnt, int align, int *base);
@@ -1028,4 +1035,6 @@ 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);
 
+cycle_t mlx4_read_clock(struct mlx4_dev *dev);
+
 #endif /* MLX4_DEVICE_H */
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h
index 49258e0ed1c6..141d395bbb5f 100644
--- a/include/linux/mv643xx_eth.h
+++ b/include/linux/mv643xx_eth.h
@@ -19,7 +19,6 @@
 
 struct mv643xx_eth_shared_platform_data {
         struct mbus_dram_target_info    *dram;
-        struct platform_device  *shared_smi;
         /*
          * Max packet size for Tx IP/Layer 4 checksum, when set to 0, default
          * limit of 9KiB will be used.
diff --git a/include/linux/netdev_features.h b/include/linux/netdev_features.h
index 3dd39340430e..cbaa027ef5a7 100644
--- a/include/linux/netdev_features.h
+++ b/include/linux/netdev_features.h
@@ -22,9 +22,12 @@ enum {
         NETIF_F_IPV6_CSUM_BIT,          /* Can checksum TCP/UDP over IPV6 */
         NETIF_F_HIGHDMA_BIT,            /* Can DMA to high memory. */
         NETIF_F_FRAGLIST_BIT,           /* Scatter/gather IO. */
-        NETIF_F_HW_VLAN_TX_BIT,         /* Transmit VLAN hw acceleration */
-        NETIF_F_HW_VLAN_RX_BIT,         /* Receive VLAN hw acceleration */
-        NETIF_F_HW_VLAN_FILTER_BIT,     /* Receive filtering on VLAN */
+        NETIF_F_HW_VLAN_CTAG_TX_BIT,    /* Transmit VLAN CTAG HW acceleration */
+        NETIF_F_HW_VLAN_CTAG_RX_BIT,    /* Receive VLAN CTAG HW acceleration */
+        NETIF_F_HW_VLAN_CTAG_FILTER_BIT,/* Receive filtering on VLAN CTAGs */
+        NETIF_F_HW_VLAN_STAG_TX_BIT,    /* Transmit VLAN STAG HW acceleration */
+        NETIF_F_HW_VLAN_STAG_RX_BIT,    /* Receive VLAN STAG HW acceleration */
+        NETIF_F_HW_VLAN_STAG_FILTER_BIT,/* Receive filtering on VLAN STAGs */
         NETIF_F_VLAN_CHALLENGED_BIT,    /* Device cannot handle VLAN packets */
         NETIF_F_GSO_BIT,                /* Enable software GSO. */
         NETIF_F_LLTX_BIT,               /* LockLess TX - deprecated. Please */
@@ -42,9 +45,9 @@ enum {
         NETIF_F_TSO6_BIT,               /* ... TCPv6 segmentation */
         NETIF_F_FSO_BIT,                /* ... FCoE segmentation */
         NETIF_F_GSO_GRE_BIT,            /* ... GRE with TSO */
-        /**/NETIF_F_GSO_LAST,           /* [can't be last bit, see GSO_MASK] */
-        NETIF_F_GSO_RESERVED2           /* ... free (fill GSO_MASK to 8 bits) */
-                = NETIF_F_GSO_LAST,
+        NETIF_F_GSO_UDP_TUNNEL_BIT,     /* ... UDP TUNNEL with TSO */
+        /**/NETIF_F_GSO_LAST =          /* last bit, see GSO_MASK */
+                NETIF_F_GSO_UDP_TUNNEL_BIT,
 
         NETIF_F_FCOE_CRC_BIT,           /* FCoE CRC32 */
         NETIF_F_SCTP_CSUM_BIT,          /* SCTP checksum offload */
@@ -80,9 +83,12 @@ enum {
 #define NETIF_F_GSO_ROBUST      __NETIF_F(GSO_ROBUST)
 #define NETIF_F_HIGHDMA         __NETIF_F(HIGHDMA)
 #define NETIF_F_HW_CSUM         __NETIF_F(HW_CSUM)
-#define NETIF_F_HW_VLAN_FILTER  __NETIF_F(HW_VLAN_FILTER)
-#define NETIF_F_HW_VLAN_RX      __NETIF_F(HW_VLAN_RX)
-#define NETIF_F_HW_VLAN_TX      __NETIF_F(HW_VLAN_TX)
+#define NETIF_F_HW_VLAN_CTAG_FILTER __NETIF_F(HW_VLAN_CTAG_FILTER)
+#define NETIF_F_HW_VLAN_CTAG_RX __NETIF_F(HW_VLAN_CTAG_RX)
+#define NETIF_F_HW_VLAN_CTAG_TX __NETIF_F(HW_VLAN_CTAG_TX)
+#define NETIF_F_HW_VLAN_STAG_FILTER __NETIF_F(HW_VLAN_STAG_FILTER)
+#define NETIF_F_HW_VLAN_STAG_RX __NETIF_F(HW_VLAN_STAG_RX)
+#define NETIF_F_HW_VLAN_STAG_TX __NETIF_F(HW_VLAN_STAG_TX)
 #define NETIF_F_IP_CSUM         __NETIF_F(IP_CSUM)
 #define NETIF_F_IPV6_CSUM       __NETIF_F(IPV6_CSUM)
 #define NETIF_F_LLTX            __NETIF_F(LLTX)
@@ -102,7 +108,8 @@ enum {
 #define NETIF_F_VLAN_CHALLENGED __NETIF_F(VLAN_CHALLENGED)
 #define NETIF_F_RXFCS           __NETIF_F(RXFCS)
 #define NETIF_F_RXALL           __NETIF_F(RXALL)
-#define NETIF_F_GRE_GSO         __NETIF_F(GSO_GRE)
+#define NETIF_F_GSO_GRE         __NETIF_F(GSO_GRE)
+#define NETIF_F_GSO_UDP_TUNNEL  __NETIF_F(GSO_UDP_TUNNEL)
 
 /* Features valid for ethtool to change */
 /* = all defined minus driver/device-class-related */
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 6151e903eef0..f8898a435dc5 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -144,8 +144,6 @@ static inline bool dev_xmit_complete(int rc)
 # else
 #  define LL_MAX_HEADER 96
 # endif
-#elif IS_ENABLED(CONFIG_TR)
-# define LL_MAX_HEADER 48
 #else
 # define LL_MAX_HEADER 32
 #endif
@@ -211,6 +209,7 @@ struct netdev_hw_addr {
 #define NETDEV_HW_ADDR_T_UNICAST        4
 #define NETDEV_HW_ADDR_T_MULTICAST      5
         bool                    global_use;
+        int                     sync_cnt;
         int                     refcount;
         int                     synced;
         struct rcu_head         rcu_head;
@@ -785,13 +784,13 @@ struct netdev_fcoe_hbainfo {
  *      3. Update dev->stats asynchronously and atomically, and define
  *         neither operation.
  *
- * int (*ndo_vlan_rx_add_vid)(struct net_device *dev, unsigned short vid);
- *      If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
- *      this function is called when a VLAN id is registered.
+ * int (*ndo_vlan_rx_add_vid)(struct net_device *dev, __be16 proto, u16t vid);
+ *      If device support VLAN filtering this function is called when a
+ *      VLAN id is registered.
  *
  * int (*ndo_vlan_rx_kill_vid)(struct net_device *dev, unsigned short vid);
- *      If device support VLAN filtering (dev->features & NETIF_F_HW_VLAN_FILTER)
- *      this function is called when a VLAN id is unregistered.
+ *      If device support VLAN filtering this function is called when a
+ *      VLAN id is unregistered.
  *
  * void (*ndo_poll_controller)(struct net_device *dev);
  *
@@ -935,9 +934,9 @@ struct net_device_ops {
         struct net_device_stats* (*ndo_get_stats)(struct net_device *dev);
 
         int                     (*ndo_vlan_rx_add_vid)(struct net_device *dev,
-                                                       unsigned short vid);
+                                                       __be16 proto, u16 vid);
         int                     (*ndo_vlan_rx_kill_vid)(struct net_device *dev,
-                                                        unsigned short vid);
+                                                        __be16 proto, u16 vid);
 #ifdef CONFIG_NET_POLL_CONTROLLER
         void                    (*ndo_poll_controller)(struct net_device *dev);
         int                     (*ndo_netpoll_setup)(struct net_device *dev,
@@ -1073,6 +1072,8 @@ struct net_device {
         struct list_head        dev_list;
         struct list_head        napi_list;
         struct list_head        unreg_list;
+        struct list_head        upper_dev_list; /* List of upper devices */
+
 
         /* currently active device features */
         netdev_features_t       features;
@@ -1145,6 +1146,13 @@ struct net_device {
         spinlock_t              addr_list_lock;
         struct netdev_hw_addr_list      uc;     /* Unicast mac addresses */
         struct netdev_hw_addr_list      mc;     /* Multicast mac addresses */
+        struct netdev_hw_addr_list      dev_addrs; /* list of device
+                                                    * hw addresses
+                                                    */
+#ifdef CONFIG_SYSFS
+        struct kset             *queues_kset;
+#endif
+
         bool                    uc_promisc;
         unsigned int            promiscuity;
         unsigned int            allmulti;
@@ -1177,21 +1185,11 @@ struct net_device {
                                                  * avoid dirtying this cache line.
                                                  */
 
-        struct list_head        upper_dev_list; /* List of upper devices */
-
         /* Interface address info used in eth_type_trans() */
         unsigned char           *dev_addr;      /* hw address, (before bcast
                                                    because most packets are
                                                    unicast) */
 
-        struct netdev_hw_addr_list      dev_addrs; /* list of device
-                                                      hw addresses */
-
-        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
-
-#ifdef CONFIG_SYSFS
-        struct kset             *queues_kset;
-#endif
 
 #ifdef CONFIG_RPS
         struct netdev_rx_queue  *_rx;
@@ -1202,18 +1200,14 @@ struct net_device {
         /* Number of RX queues currently active in device */
         unsigned int            real_num_rx_queues;
 
-#ifdef CONFIG_RFS_ACCEL
-        /* CPU reverse-mapping for RX completion interrupts, indexed
-         * by RX queue number.  Assigned by driver.  This must only be
-         * set if the ndo_rx_flow_steer operation is defined. */
-        struct cpu_rmap         *rx_cpu_rmap;
-#endif
 #endif
 
         rx_handler_func_t __rcu *rx_handler;
         void __rcu              *rx_handler_data;
 
         struct netdev_queue __rcu *ingress_queue;
+        unsigned char           broadcast[MAX_ADDR_LEN];        /* hw bcast add */
+
 
 /*
  * Cache lines mostly used on transmit path
@@ -1235,6 +1229,12 @@ struct net_device {
 #ifdef CONFIG_XPS
         struct xps_dev_maps __rcu *xps_maps;
 #endif
+#ifdef CONFIG_RFS_ACCEL
+        /* CPU reverse-mapping for RX completion interrupts, indexed
+         * by RX queue number.  Assigned by driver.  This must only be
+         * set if the ndo_rx_flow_steer operation is defined. */
+        struct cpu_rmap         *rx_cpu_rmap;
+#endif
 
         /* These may be needed for future network-power-down code. */
 
@@ -1475,6 +1475,11 @@ static inline void *netdev_priv(const struct net_device *dev)
  */
 #define SET_NETDEV_DEVTYPE(net, devtype)        ((net)->dev.type = (devtype))
 
+/* Default NAPI poll() weight
+ * Device drivers are strongly advised to not use bigger value
+ */
+#define NAPI_POLL_WEIGHT 64
+
 /**
  *      netif_napi_add - initialize a napi context
  *      @dev:  network device
@@ -1612,6 +1617,9 @@ extern seqcount_t	devnet_rename_seq;	/* Device rename seq */
                 list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list)
 #define for_each_netdev_continue_rcu(net, d)            \
         list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list)
+#define for_each_netdev_in_bond_rcu(bond, slave)        \
+                for_each_netdev_rcu(&init_net, slave)   \
+                        if (netdev_master_upper_dev_get_rcu(slave) == bond)
 #define net_device_entry(lh)    list_entry(lh, struct net_device, dev_list)
 
 static inline struct net_device *next_net_device(struct net_device *dev)
@@ -1684,7 +1692,6 @@ extern int 		netdev_refcnt_read(const struct net_device *dev);
 extern void             free_netdev(struct net_device *dev);
 extern void             synchronize_net(void);
 extern int              init_dummy_netdev(struct net_device *dev);
-extern void             netdev_resync_ops(struct net_device *dev);
 
 extern struct net_device        *dev_get_by_index(struct net *net, int ifindex);
 extern struct net_device        *__dev_get_by_index(struct net *net, int ifindex);
@@ -2621,6 +2628,7 @@ extern int dev_uc_add(struct net_device *dev, const unsigned char *addr);
 extern int dev_uc_add_excl(struct net_device *dev, const unsigned char *addr);
 extern int dev_uc_del(struct net_device *dev, const unsigned char *addr);
 extern int dev_uc_sync(struct net_device *to, struct net_device *from);
+extern int dev_uc_sync_multiple(struct net_device *to, struct net_device *from);
 extern void dev_uc_unsync(struct net_device *to, struct net_device *from);
 extern void dev_uc_flush(struct net_device *dev);
 extern void dev_uc_init(struct net_device *dev);
@@ -2632,6 +2640,7 @@ extern int dev_mc_add_excl(struct net_device *dev, const unsigned char *addr);
 extern int dev_mc_del(struct net_device *dev, const unsigned char *addr);
 extern int dev_mc_del_global(struct net_device *dev, const unsigned char *addr);
 extern int dev_mc_sync(struct net_device *to, struct net_device *from);
+extern int dev_mc_sync_multiple(struct net_device *to, struct net_device *from);
 extern void dev_mc_unsync(struct net_device *to, struct net_device *from);
 extern void dev_mc_flush(struct net_device *dev);
 extern void dev_mc_init(struct net_device *dev);
@@ -2678,6 +2687,19 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, netdev_features_t features)
 {
         return __skb_gso_segment(skb, features, true);
 }
+__be16 skb_network_protocol(struct sk_buff *skb);
+
+static inline bool can_checksum_protocol(netdev_features_t features,
+                                         __be16 protocol)
+{
+        return ((features & NETIF_F_GEN_CSUM) ||
+                ((features & NETIF_F_V4_CSUM) &&
+                 protocol == htons(ETH_P_IP)) ||
+                ((features & NETIF_F_V6_CSUM) &&
+                 protocol == htons(ETH_P_IPV6)) ||
+                ((features & NETIF_F_FCOE_CRC) &&
+                 protocol == htons(ETH_P_FCOE)));
+}
 
 #ifdef CONFIG_BUG
 extern void netdev_rx_csum_fault(struct net_device *dev);
@@ -2756,6 +2778,11 @@ static inline void netif_set_gso_max_size(struct net_device *dev,
         dev->gso_max_size = size;
 }
 
+static inline bool netif_is_bond_master(struct net_device *dev)
+{
+        return dev->flags & IFF_MASTER && dev->priv_flags & IFF_BONDING;
+}
+
 static inline bool netif_is_bond_slave(struct net_device *dev)
 {
         return dev->flags & IFF_SLAVE && dev->priv_flags & IFF_BONDING;
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index ee142846f56a..0060fde3160e 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -289,11 +289,6 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)
 #endif
 }
 
-#ifdef CONFIG_PROC_FS
-#include <linux/proc_fs.h>
-extern struct proc_dir_entry *proc_net_netfilter;
-#endif
-
 #else /* !CONFIG_NETFILTER */
 #define NF_HOOK(pf, hook, skb, indev, outdev, okfn) (okfn)(skb)
 #define NF_HOOK_COND(pf, hook, skb, indev, outdev, okfn, cond) (okfn)(skb)
diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 7958e84a65af..d80e2753847c 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -1,7 +1,7 @@
 /* Copyright (C) 2000-2002 Joakim Axelsson <gozem@linux.nu>
  *                         Patrick Schaaf <bof@bof.de>
  *                         Martin Josefsson <gandalf@wlug.westbo.se>
- * Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+ * Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  *
  * 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
@@ -47,10 +47,36 @@ enum ip_set_feature {
         IPSET_DUMP_LAST = (1 << IPSET_DUMP_LAST_FLAG),
 };
 
+/* Set extensions */
+enum ip_set_extension {
+        IPSET_EXT_NONE = 0,
+        IPSET_EXT_BIT_TIMEOUT = 1,
+        IPSET_EXT_TIMEOUT = (1 << IPSET_EXT_BIT_TIMEOUT),
+        IPSET_EXT_BIT_COUNTER = 2,
+        IPSET_EXT_COUNTER = (1 << IPSET_EXT_BIT_COUNTER),
+};
+
+/* Extension offsets */
+enum ip_set_offset {
+        IPSET_OFFSET_TIMEOUT = 0,
+        IPSET_OFFSET_COUNTER,
+        IPSET_OFFSET_MAX,
+};
+
+#define SET_WITH_TIMEOUT(s)     ((s)->extensions & IPSET_EXT_TIMEOUT)
+#define SET_WITH_COUNTER(s)     ((s)->extensions & IPSET_EXT_COUNTER)
+
+struct ip_set_ext {
+        unsigned long timeout;
+        u64 packets;
+        u64 bytes;
+};
+
 struct ip_set;
 
 typedef int (*ipset_adtfn)(struct ip_set *set, void *value,
-                           u32 timeout, u32 flags);
+                           const struct ip_set_ext *ext,
+                           struct ip_set_ext *mext, u32 cmdflags);
 
 /* Kernel API function options */
 struct ip_set_adt_opt {
@@ -58,7 +84,7 @@ struct ip_set_adt_opt {
         u8 dim;                 /* Dimension of match/target */
         u8 flags;               /* Direction and negation flags */
         u32 cmdflags;           /* Command-like flags */
-        u32 timeout;            /* Timeout value */
+        struct ip_set_ext ext;  /* Extensions */
 };
 
 /* Set type, variant-specific part */
@@ -69,7 +95,7 @@ struct ip_set_type_variant {
          *                      positive for matching element */
         int (*kadt)(struct ip_set *set, const struct sk_buff *skb,
                     const struct xt_action_param *par,
-                    enum ipset_adt adt, const struct ip_set_adt_opt *opt);
+                    enum ipset_adt adt, struct ip_set_adt_opt *opt);
 
         /* Userspace: test/add/del entries
          *              returns negative error code,
@@ -151,10 +177,76 @@ struct ip_set {
         u8 family;
         /* The type revision */
         u8 revision;
+        /* Extensions */
+        u8 extensions;
         /* The type specific data */
         void *data;
 };
 
+struct ip_set_counter {
+        atomic64_t bytes;
+        atomic64_t packets;
+};
+
+static inline void
+ip_set_add_bytes(u64 bytes, struct ip_set_counter *counter)
+{
+        atomic64_add((long long)bytes, &(counter)->bytes);
+}
+
+static inline void
+ip_set_add_packets(u64 packets, struct ip_set_counter *counter)
+{
+        atomic64_add((long long)packets, &(counter)->packets);
+}
+
+static inline u64
+ip_set_get_bytes(const struct ip_set_counter *counter)
+{
+        return (u64)atomic64_read(&(counter)->bytes);
+}
+
+static inline u64
+ip_set_get_packets(const struct ip_set_counter *counter)
+{
+        return (u64)atomic64_read(&(counter)->packets);
+}
+
+static inline void
+ip_set_update_counter(struct ip_set_counter *counter,
+                      const struct ip_set_ext *ext,
+                      struct ip_set_ext *mext, u32 flags)
+{
+        if (ext->packets != ULLONG_MAX &&
+            !(flags & IPSET_FLAG_SKIP_COUNTER_UPDATE)) {
+                ip_set_add_bytes(ext->bytes, counter);
+                ip_set_add_packets(ext->packets, counter);
+        }
+        if (flags & IPSET_FLAG_MATCH_COUNTERS) {
+                mext->packets = ip_set_get_packets(counter);
+                mext->bytes = ip_set_get_bytes(counter);
+        }
+}
+
+static inline bool
+ip_set_put_counter(struct sk_buff *skb, struct ip_set_counter *counter)
+{
+        return nla_put_net64(skb, IPSET_ATTR_BYTES,
+                             cpu_to_be64(ip_set_get_bytes(counter))) ||
+               nla_put_net64(skb, IPSET_ATTR_PACKETS,
+                             cpu_to_be64(ip_set_get_packets(counter)));
+}
+
+static inline void
+ip_set_init_counter(struct ip_set_counter *counter,
+                    const struct ip_set_ext *ext)
+{
+        if (ext->bytes != ULLONG_MAX)
+                atomic64_set(&(counter)->bytes, (long long)(ext->bytes));
+        if (ext->packets != ULLONG_MAX)
+                atomic64_set(&(counter)->packets, (long long)(ext->packets));
+}
+
 /* register and unregister set references */
 extern ip_set_id_t ip_set_get_byname(const char *name, struct ip_set **set);
 extern void ip_set_put_byindex(ip_set_id_t index);
@@ -167,19 +259,21 @@ extern void ip_set_nfnl_put(ip_set_id_t index);
 
 extern int ip_set_add(ip_set_id_t id, const struct sk_buff *skb,
                       const struct xt_action_param *par,
-                      const struct ip_set_adt_opt *opt);
+                      struct ip_set_adt_opt *opt);
 extern int ip_set_del(ip_set_id_t id, const struct sk_buff *skb,
                       const struct xt_action_param *par,
-                      const struct ip_set_adt_opt *opt);
+                      struct ip_set_adt_opt *opt);
 extern int ip_set_test(ip_set_id_t id, const struct sk_buff *skb,
                        const struct xt_action_param *par,
-                       const struct ip_set_adt_opt *opt);
+                       struct ip_set_adt_opt *opt);
 
 /* Utility functions */
 extern void *ip_set_alloc(size_t size);
 extern void ip_set_free(void *members);
 extern int ip_set_get_ipaddr4(struct nlattr *nla,  __be32 *ipaddr);
 extern int ip_set_get_ipaddr6(struct nlattr *nla, union nf_inet_addr *ipaddr);
+extern int ip_set_get_extensions(struct ip_set *set, struct nlattr *tb[],
+                                 struct ip_set_ext *ext);
 
 static inline int
 ip_set_get_hostipaddr4(struct nlattr *nla, u32 *ipaddr)
@@ -200,6 +294,14 @@ ip_set_eexist(int ret, u32 flags)
         return ret == -IPSET_ERR_EXIST && (flags & IPSET_FLAG_EXIST);
 }
 
+/* Match elements marked with nomatch */
+static inline bool
+ip_set_enomatch(int ret, u32 flags, enum ipset_adt adt)
+{
+        return adt == IPSET_TEST &&
+               ret == -ENOTEMPTY && ((flags >> 16) & IPSET_FLAG_NOMATCH);
+}
+
 /* Check the NLA_F_NET_BYTEORDER flag */
 static inline bool
 ip_set_attr_netorder(struct nlattr *tb[], int type)
@@ -284,4 +386,14 @@ bitmap_bytes(u32 a, u32 b)
         return 4 * ((((b - a + 8) / 8) + 3) / 4);
 }
 
+#include <linux/netfilter/ipset/ip_set_timeout.h>
+
+#define IP_SET_INIT_KEXT(skb, opt, map)                 \
+        { .bytes = (skb)->len, .packets = 1,            \
+          .timeout = ip_set_adt_opt_timeout(opt, map) }
+
+#define IP_SET_INIT_UEXT(map)                           \
+        { .bytes = ULLONG_MAX, .packets = ULLONG_MAX,   \
+          .timeout = (map)->timeout }
+
 #endif /*_IP_SET_H */
diff --git a/include/linux/netfilter/ipset/ip_set_ahash.h b/include/linux/netfilter/ipset/ip_set_ahash.h
deleted file mode 100644
index 0214c4c146fa..000000000000
--- a/include/linux/netfilter/ipset/ip_set_ahash.h
+++ /dev/null
@@ -1,1241 +0,0 @@
-#ifndef _IP_SET_AHASH_H
-#define _IP_SET_AHASH_H
-
-#include <linux/rcupdate.h>
-#include <linux/jhash.h>
-#include <linux/netfilter/ipset/ip_set_timeout.h>
-
-#define CONCAT(a, b, c)         a##b##c
-#define TOKEN(a, b, c)          CONCAT(a, b, c)
-
-#define type_pf_next            TOKEN(TYPE, PF, _elem)
-
-/* Hashing which uses arrays to resolve clashing. The hash table is resized
- * (doubled) when searching becomes too long.
- * Internally jhash is used with the assumption that the size of the
- * stored data is a multiple of sizeof(u32). If storage supports timeout,
- * the timeout field must be the last one in the data structure - that field
- * is ignored when computing the hash key.
- *
- * Readers and resizing
- *
- * Resizing can be triggered by userspace command only, and those
- * are serialized by the nfnl mutex. During resizing the set is
- * read-locked, so the only possible concurrent operations are
- * the kernel side readers. Those must be protected by proper RCU locking.
- */
-
-/* Number of elements to store in an initial array block */
-#define AHASH_INIT_SIZE                 4
-/* Max number of elements to store in an array block */
-#define AHASH_MAX_SIZE                  (3*AHASH_INIT_SIZE)
-
-/* Max number of elements can be tuned */
-#ifdef IP_SET_HASH_WITH_MULTI
-#define AHASH_MAX(h)                    ((h)->ahash_max)
-
-static inline u8
-tune_ahash_max(u8 curr, u32 multi)
-{
-        u32 n;
-
-        if (multi < curr)
-                return curr;
-
-        n = curr + AHASH_INIT_SIZE;
-        /* Currently, at listing one hash bucket must fit into a message.
-         * Therefore we have a hard limit here.
-         */
-        return n > curr && n <= 64 ? n : curr;
-}
-#define TUNE_AHASH_MAX(h, multi)        \
-        ((h)->ahash_max = tune_ahash_max((h)->ahash_max, multi))
-#else
-#define AHASH_MAX(h)                    AHASH_MAX_SIZE
-#define TUNE_AHASH_MAX(h, multi)
-#endif
-
-/* A hash bucket */
-struct hbucket {
-        void *value;            /* the array of the values */
-        u8 size;                /* size of the array */
-        u8 pos;                 /* position of the first free entry */
-};
-
-/* The hash table: the table size stored here in order to make resizing easy */
-struct htable {
-        u8 htable_bits;         /* size of hash table == 2^htable_bits */
-        struct hbucket bucket[0]; /* hashtable buckets */
-};
-
-#define hbucket(h, i)           (&((h)->bucket[i]))
-
-/* Book-keeping of the prefixes added to the set */
-struct ip_set_hash_nets {
-        u8 cidr;                /* the different cidr values in the set */
-        u32 nets;               /* number of elements per cidr */
-};
-
-/* The generic ip_set hash structure */
-struct ip_set_hash {
-        struct htable *table;   /* the hash table */
-        u32 maxelem;            /* max elements in the hash */
-        u32 elements;           /* current element (vs timeout) */
-        u32 initval;            /* random jhash init value */
-        u32 timeout;            /* timeout value, if enabled */
-        struct timer_list gc;   /* garbage collection when timeout enabled */
-        struct type_pf_next next; /* temporary storage for uadd */
-#ifdef IP_SET_HASH_WITH_MULTI
-        u8 ahash_max;           /* max elements in an array block */
-#endif
-#ifdef IP_SET_HASH_WITH_NETMASK
-        u8 netmask;             /* netmask value for subnets to store */
-#endif
-#ifdef IP_SET_HASH_WITH_RBTREE
-        struct rb_root rbtree;
-#endif
-#ifdef IP_SET_HASH_WITH_NETS
-        struct ip_set_hash_nets nets[0]; /* book-keeping of prefixes */
-#endif
-};
-
-static size_t
-htable_size(u8 hbits)
-{
-        size_t hsize;
-
-        /* We must fit both into u32 in jhash and size_t */
-        if (hbits > 31)
-                return 0;
-        hsize = jhash_size(hbits);
-        if ((((size_t)-1) - sizeof(struct htable))/sizeof(struct hbucket)
-            < hsize)
-                return 0;
-
-        return hsize * sizeof(struct hbucket) + sizeof(struct htable);
-}
-
-/* Compute htable_bits from the user input parameter hashsize */
-static u8
-htable_bits(u32 hashsize)
-{
-        /* Assume that hashsize == 2^htable_bits */
-        u8 bits = fls(hashsize - 1);
-        if (jhash_size(bits) != hashsize)
-                /* Round up to the first 2^n value */
-                bits = fls(hashsize);
-
-        return bits;
-}
-
-#ifdef IP_SET_HASH_WITH_NETS
-#ifdef IP_SET_HASH_WITH_NETS_PACKED
-/* When cidr is packed with nomatch, cidr - 1 is stored in the entry */
-#define CIDR(cidr)      (cidr + 1)
-#else
-#define CIDR(cidr)      (cidr)
-#endif
-
-#define SET_HOST_MASK(family)   (family == AF_INET ? 32 : 128)
-#ifdef IP_SET_HASH_WITH_MULTI
-#define NETS_LENGTH(family)     (SET_HOST_MASK(family) + 1)
-#else
-#define NETS_LENGTH(family)     SET_HOST_MASK(family)
-#endif
-
-/* Network cidr size book keeping when the hash stores different
- * sized networks */
-static void
-add_cidr(struct ip_set_hash *h, u8 cidr, u8 nets_length)
-{
-        int i, j;
-
-        /* Add in increasing prefix order, so larger cidr first */
-        for (i = 0, j = -1; i < nets_length && h->nets[i].nets; i++) {
-                if (j != -1)
-                        continue;
-                else if (h->nets[i].cidr < cidr)
-                        j = i;
-                else if (h->nets[i].cidr == cidr) {
-                        h->nets[i].nets++;
-                        return;
-                }
-        }
-        if (j != -1) {
-                for (; i > j; i--) {
-                        h->nets[i].cidr = h->nets[i - 1].cidr;
-                        h->nets[i].nets = h->nets[i - 1].nets;
-                }
-        }
-        h->nets[i].cidr = cidr;
-        h->nets[i].nets = 1;
-}
-
-static void
-del_cidr(struct ip_set_hash *h, u8 cidr, u8 nets_length)
-{
-        u8 i, j;
-
-        for (i = 0; i < nets_length - 1 && h->nets[i].cidr != cidr; i++)
-                ;
-        h->nets[i].nets--;
-
-        if (h->nets[i].nets != 0)
-                return;
-
-        for (j = i; j < nets_length - 1 && h->nets[j].nets; j++) {
-                h->nets[j].cidr = h->nets[j + 1].cidr;
-                h->nets[j].nets = h->nets[j + 1].nets;
-        }
-}
-#else
-#define NETS_LENGTH(family)             0
-#endif
-
-/* Destroy the hashtable part of the set */
-static void
-ahash_destroy(struct htable *t)
-{
-        struct hbucket *n;
-        u32 i;
-
-        for (i = 0; i < jhash_size(t->htable_bits); i++) {
-                n = hbucket(t, i);
-                if (n->size)
-                        /* FIXME: use slab cache */
-                        kfree(n->value);
-        }
-
-        ip_set_free(t);
-}
-
-/* Calculate the actual memory size of the set data */
-static size_t
-ahash_memsize(const struct ip_set_hash *h, size_t dsize, u8 nets_length)
-{
-        u32 i;
-        struct htable *t = h->table;
-        size_t memsize = sizeof(*h)
-                         + sizeof(*t)
-#ifdef IP_SET_HASH_WITH_NETS
-                         + sizeof(struct ip_set_hash_nets) * nets_length
-#endif
-                         + jhash_size(t->htable_bits) * sizeof(struct hbucket);
-
-        for (i = 0; i < jhash_size(t->htable_bits); i++)
-                        memsize += t->bucket[i].size * dsize;
-
-        return memsize;
-}
-
-/* Flush a hash type of set: destroy all elements */
-static void
-ip_set_hash_flush(struct ip_set *set)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        struct hbucket *n;
-        u32 i;
-
-        for (i = 0; i < jhash_size(t->htable_bits); i++) {
-                n = hbucket(t, i);
-                if (n->size) {
-                        n->size = n->pos = 0;
-                        /* FIXME: use slab cache */
-                        kfree(n->value);
-                }
-        }
-#ifdef IP_SET_HASH_WITH_NETS
-        memset(h->nets, 0, sizeof(struct ip_set_hash_nets)
-                           * NETS_LENGTH(set->family));
-#endif
-        h->elements = 0;
-}
-
-/* Destroy a hash type of set */
-static void
-ip_set_hash_destroy(struct ip_set *set)
-{
-        struct ip_set_hash *h = set->data;
-
-        if (with_timeout(h->timeout))
-                del_timer_sync(&h->gc);
-
-        ahash_destroy(h->table);
-#ifdef IP_SET_HASH_WITH_RBTREE
-        rbtree_destroy(&h->rbtree);
-#endif
-        kfree(h);
-
-        set->data = NULL;
-}
-
-#endif /* _IP_SET_AHASH_H */
-
-#ifndef HKEY_DATALEN
-#define HKEY_DATALEN    sizeof(struct type_pf_elem)
-#endif
-
-#define HKEY(data, initval, htable_bits)                        \
-(jhash2((u32 *)(data), HKEY_DATALEN/sizeof(u32), initval)       \
-        & jhash_mask(htable_bits))
-
-/* Type/family dependent function prototypes */
-
-#define type_pf_data_equal      TOKEN(TYPE, PF, _data_equal)
-#define type_pf_data_isnull     TOKEN(TYPE, PF, _data_isnull)
-#define type_pf_data_copy       TOKEN(TYPE, PF, _data_copy)
-#define type_pf_data_zero_out   TOKEN(TYPE, PF, _data_zero_out)
-#define type_pf_data_netmask    TOKEN(TYPE, PF, _data_netmask)
-#define type_pf_data_list       TOKEN(TYPE, PF, _data_list)
-#define type_pf_data_tlist      TOKEN(TYPE, PF, _data_tlist)
-#define type_pf_data_next       TOKEN(TYPE, PF, _data_next)
-#define type_pf_data_flags      TOKEN(TYPE, PF, _data_flags)
-#define type_pf_data_reset_flags TOKEN(TYPE, PF, _data_reset_flags)
-#ifdef IP_SET_HASH_WITH_NETS
-#define type_pf_data_match      TOKEN(TYPE, PF, _data_match)
-#else
-#define type_pf_data_match(d)   1
-#endif
-
-#define type_pf_elem            TOKEN(TYPE, PF, _elem)
-#define type_pf_telem           TOKEN(TYPE, PF, _telem)
-#define type_pf_data_timeout    TOKEN(TYPE, PF, _data_timeout)
-#define type_pf_data_expired    TOKEN(TYPE, PF, _data_expired)
-#define type_pf_data_timeout_set TOKEN(TYPE, PF, _data_timeout_set)
-
-#define type_pf_elem_add        TOKEN(TYPE, PF, _elem_add)
-#define type_pf_add             TOKEN(TYPE, PF, _add)
-#define type_pf_del             TOKEN(TYPE, PF, _del)
-#define type_pf_test_cidrs      TOKEN(TYPE, PF, _test_cidrs)
-#define type_pf_test            TOKEN(TYPE, PF, _test)
-
-#define type_pf_elem_tadd       TOKEN(TYPE, PF, _elem_tadd)
-#define type_pf_del_telem       TOKEN(TYPE, PF, _ahash_del_telem)
-#define type_pf_expire          TOKEN(TYPE, PF, _expire)
-#define type_pf_tadd            TOKEN(TYPE, PF, _tadd)
-#define type_pf_tdel            TOKEN(TYPE, PF, _tdel)
-#define type_pf_ttest_cidrs     TOKEN(TYPE, PF, _ahash_ttest_cidrs)
-#define type_pf_ttest           TOKEN(TYPE, PF, _ahash_ttest)
-
-#define type_pf_resize          TOKEN(TYPE, PF, _resize)
-#define type_pf_tresize         TOKEN(TYPE, PF, _tresize)
-#define type_pf_flush           ip_set_hash_flush
-#define type_pf_destroy         ip_set_hash_destroy
-#define type_pf_head            TOKEN(TYPE, PF, _head)
-#define type_pf_list            TOKEN(TYPE, PF, _list)
-#define type_pf_tlist           TOKEN(TYPE, PF, _tlist)
-#define type_pf_same_set        TOKEN(TYPE, PF, _same_set)
-#define type_pf_kadt            TOKEN(TYPE, PF, _kadt)
-#define type_pf_uadt            TOKEN(TYPE, PF, _uadt)
-#define type_pf_gc              TOKEN(TYPE, PF, _gc)
-#define type_pf_gc_init         TOKEN(TYPE, PF, _gc_init)
-#define type_pf_variant         TOKEN(TYPE, PF, _variant)
-#define type_pf_tvariant        TOKEN(TYPE, PF, _tvariant)
-
-/* Flavour without timeout */
-
-/* Get the ith element from the array block n */
-#define ahash_data(n, i)        \
-        ((struct type_pf_elem *)((n)->value) + (i))
-
-/* Add an element to the hash table when resizing the set:
- * we spare the maintenance of the internal counters. */
-static int
-type_pf_elem_add(struct hbucket *n, const struct type_pf_elem *value,
-                 u8 ahash_max, u32 cadt_flags)
-{
-        struct type_pf_elem *data;
-
-        if (n->pos >= n->size) {
-                void *tmp;
-
-                if (n->size >= ahash_max)
-                        /* Trigger rehashing */
-                        return -EAGAIN;
-
-                tmp = kzalloc((n->size + AHASH_INIT_SIZE)
-                              * sizeof(struct type_pf_elem),
-                              GFP_ATOMIC);
-                if (!tmp)
-                        return -ENOMEM;
-                if (n->size) {
-                        memcpy(tmp, n->value,
-                               sizeof(struct type_pf_elem) * n->size);
-                        kfree(n->value);
-                }
-                n->value = tmp;
-                n->size += AHASH_INIT_SIZE;
-        }
-        data = ahash_data(n, n->pos++);
-        type_pf_data_copy(data, value);
-#ifdef IP_SET_HASH_WITH_NETS
-        /* Resizing won't overwrite stored flags */
-        if (cadt_flags)
-                type_pf_data_flags(data, cadt_flags);
-#endif
-        return 0;
-}
-
-/* Resize a hash: create a new hash table with doubling the hashsize
- * and inserting the elements to it. Repeat until we succeed or
- * fail due to memory pressures. */
-static int
-type_pf_resize(struct ip_set *set, bool retried)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t, *orig = h->table;
-        u8 htable_bits = orig->htable_bits;
-        struct type_pf_elem *data;
-        struct hbucket *n, *m;
-        u32 i, j, flags = 0;
-        int ret;
-
-retry:
-        ret = 0;
-        htable_bits++;
-        pr_debug("attempt to resize set %s from %u to %u, t %p\n",
-                 set->name, orig->htable_bits, htable_bits, orig);
-        if (!htable_bits) {
-                /* In case we have plenty of memory :-) */
-                pr_warning("Cannot increase the hashsize of set %s further\n",
-                           set->name);
-                return -IPSET_ERR_HASH_FULL;
-        }
-        t = ip_set_alloc(sizeof(*t)
-                         + jhash_size(htable_bits) * sizeof(struct hbucket));
-        if (!t)
-                return -ENOMEM;
-        t->htable_bits = htable_bits;
-
-        read_lock_bh(&set->lock);
-        for (i = 0; i < jhash_size(orig->htable_bits); i++) {
-                n = hbucket(orig, i);
-                for (j = 0; j < n->pos; j++) {
-                        data = ahash_data(n, j);
-#ifdef IP_SET_HASH_WITH_NETS
-                        flags = 0;
-                        type_pf_data_reset_flags(data, &flags);
-#endif
-                        m = hbucket(t, HKEY(data, h->initval, htable_bits));
-                        ret = type_pf_elem_add(m, data, AHASH_MAX(h), flags);
-                        if (ret < 0) {
-#ifdef IP_SET_HASH_WITH_NETS
-                                type_pf_data_flags(data, flags);
-#endif
-                                read_unlock_bh(&set->lock);
-                                ahash_destroy(t);
-                                if (ret == -EAGAIN)
-                                        goto retry;
-                                return ret;
-                        }
-                }
-        }
-
-        rcu_assign_pointer(h->table, t);
-        read_unlock_bh(&set->lock);
-
-        /* Give time to other readers of the set */
-        synchronize_rcu_bh();
-
-        pr_debug("set %s resized from %u (%p) to %u (%p)\n", set->name,
-                 orig->htable_bits, orig, t->htable_bits, t);
-        ahash_destroy(orig);
-
-        return 0;
-}
-
-static inline void
-type_pf_data_next(struct ip_set_hash *h, const struct type_pf_elem *d);
-
-/* Add an element to a hash and update the internal counters when succeeded,
- * otherwise report the proper error code. */
-static int
-type_pf_add(struct ip_set *set, void *value, u32 timeout, u32 flags)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t;
-        const struct type_pf_elem *d = value;
-        struct hbucket *n;
-        int i, ret = 0;
-        u32 key, multi = 0;
-        u32 cadt_flags = flags >> 16;
-
-        if (h->elements >= h->maxelem) {
-                if (net_ratelimit())
-                        pr_warning("Set %s is full, maxelem %u reached\n",
-                                   set->name, h->maxelem);
-                return -IPSET_ERR_HASH_FULL;
-        }
-
-        rcu_read_lock_bh();
-        t = rcu_dereference_bh(h->table);
-        key = HKEY(value, h->initval, t->htable_bits);
-        n = hbucket(t, key);
-        for (i = 0; i < n->pos; i++)
-                if (type_pf_data_equal(ahash_data(n, i), d, &multi)) {
-#ifdef IP_SET_HASH_WITH_NETS
-                        if (flags & IPSET_FLAG_EXIST)
-                                /* Support overwriting just the flags */
-                                type_pf_data_flags(ahash_data(n, i),
-                                                   cadt_flags);
-#endif
-                        ret = -IPSET_ERR_EXIST;
-                        goto out;
-                }
-        TUNE_AHASH_MAX(h, multi);
-        ret = type_pf_elem_add(n, value, AHASH_MAX(h), cadt_flags);
-        if (ret != 0) {
-                if (ret == -EAGAIN)
-                        type_pf_data_next(h, d);
-                goto out;
-        }
-
-#ifdef IP_SET_HASH_WITH_NETS
-        add_cidr(h, CIDR(d->cidr), NETS_LENGTH(set->family));
-#endif
-        h->elements++;
-out:
-        rcu_read_unlock_bh();
-        return ret;
-}
-
-/* Delete an element from the hash: swap it with the last element
- * and free up space if possible.
- */
-static int
-type_pf_del(struct ip_set *set, void *value, u32 timeout, u32 flags)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        const struct type_pf_elem *d = value;
-        struct hbucket *n;
-        int i;
-        struct type_pf_elem *data;
-        u32 key, multi = 0;
-
-        key = HKEY(value, h->initval, t->htable_bits);
-        n = hbucket(t, key);
-        for (i = 0; i < n->pos; i++) {
-                data = ahash_data(n, i);
-                if (!type_pf_data_equal(data, d, &multi))
-                        continue;
-                if (i != n->pos - 1)
-                        /* Not last one */
-                        type_pf_data_copy(data, ahash_data(n, n->pos - 1));
-
-                n->pos--;
-                h->elements--;
-#ifdef IP_SET_HASH_WITH_NETS
-                del_cidr(h, CIDR(d->cidr), NETS_LENGTH(set->family));
-#endif
-                if (n->pos + AHASH_INIT_SIZE < n->size) {
-                        void *tmp = kzalloc((n->size - AHASH_INIT_SIZE)
-                                            * sizeof(struct type_pf_elem),
-                                            GFP_ATOMIC);
-                        if (!tmp)
-                                return 0;
-                        n->size -= AHASH_INIT_SIZE;
-                        memcpy(tmp, n->value,
-                               n->size * sizeof(struct type_pf_elem));
-                        kfree(n->value);
-                        n->value = tmp;
-                }
-                return 0;
-        }
-
-        return -IPSET_ERR_EXIST;
-}
-
-#ifdef IP_SET_HASH_WITH_NETS
-
-/* Special test function which takes into account the different network
- * sizes added to the set */
-static int
-type_pf_test_cidrs(struct ip_set *set, struct type_pf_elem *d, u32 timeout)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        struct hbucket *n;
-        const struct type_pf_elem *data;
-        int i, j = 0;
-        u32 key, multi = 0;
-        u8 nets_length = NETS_LENGTH(set->family);
-
-        pr_debug("test by nets\n");
-        for (; j < nets_length && h->nets[j].nets && !multi; j++) {
-                type_pf_data_netmask(d, h->nets[j].cidr);
-                key = HKEY(d, h->initval, t->htable_bits);
-                n = hbucket(t, key);
-                for (i = 0; i < n->pos; i++) {
-                        data = ahash_data(n, i);
-                        if (type_pf_data_equal(data, d, &multi))
-                                return type_pf_data_match(data);
-                }
-        }
-        return 0;
-}
-#endif
-
-/* Test whether the element is added to the set */
-static int
-type_pf_test(struct ip_set *set, void *value, u32 timeout, u32 flags)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        struct type_pf_elem *d = value;
-        struct hbucket *n;
-        const struct type_pf_elem *data;
-        int i;
-        u32 key, multi = 0;
-
-#ifdef IP_SET_HASH_WITH_NETS
-        /* If we test an IP address and not a network address,
-         * try all possible network sizes */
-        if (CIDR(d->cidr) == SET_HOST_MASK(set->family))
-                return type_pf_test_cidrs(set, d, timeout);
-#endif
-
-        key = HKEY(d, h->initval, t->htable_bits);
-        n = hbucket(t, key);
-        for (i = 0; i < n->pos; i++) {
-                data = ahash_data(n, i);
-                if (type_pf_data_equal(data, d, &multi))
-                        return type_pf_data_match(data);
-        }
-        return 0;
-}
-
-/* Reply a HEADER request: fill out the header part of the set */
-static int
-type_pf_head(struct ip_set *set, struct sk_buff *skb)
-{
-        const struct ip_set_hash *h = set->data;
-        struct nlattr *nested;
-        size_t memsize;
-
-        read_lock_bh(&set->lock);
-        memsize = ahash_memsize(h, with_timeout(h->timeout)
-                                        ? sizeof(struct type_pf_telem)
-                                        : sizeof(struct type_pf_elem),
-                                NETS_LENGTH(set->family));
-        read_unlock_bh(&set->lock);
-
-        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
-        if (!nested)
-                goto nla_put_failure;
-        if (nla_put_net32(skb, IPSET_ATTR_HASHSIZE,
-                          htonl(jhash_size(h->table->htable_bits))) ||
-            nla_put_net32(skb, IPSET_ATTR_MAXELEM, htonl(h->maxelem)))
-                goto nla_put_failure;
-#ifdef IP_SET_HASH_WITH_NETMASK
-        if (h->netmask != HOST_MASK &&
-            nla_put_u8(skb, IPSET_ATTR_NETMASK, h->netmask))
-                goto nla_put_failure;
-#endif
-        if (nla_put_net32(skb, IPSET_ATTR_REFERENCES, htonl(set->ref - 1)) ||
-            nla_put_net32(skb, IPSET_ATTR_MEMSIZE, htonl(memsize)) ||
-            (with_timeout(h->timeout) &&
-             nla_put_net32(skb, IPSET_ATTR_TIMEOUT, htonl(h->timeout))))
-                goto nla_put_failure;
-        ipset_nest_end(skb, nested);
-
-        return 0;
-nla_put_failure:
-        return -EMSGSIZE;
-}
-
-/* Reply a LIST/SAVE request: dump the elements of the specified set */
-static int
-type_pf_list(const struct ip_set *set,
-             struct sk_buff *skb, struct netlink_callback *cb)
-{
-        const struct ip_set_hash *h = set->data;
-        const struct htable *t = h->table;
-        struct nlattr *atd, *nested;
-        const struct hbucket *n;
-        const struct type_pf_elem *data;
-        u32 first = cb->args[2];
-        /* We assume that one hash bucket fills into one page */
-        void *incomplete;
-        int i;
-
-        atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
-        if (!atd)
-                return -EMSGSIZE;
-        pr_debug("list hash set %s\n", set->name);
-        for (; cb->args[2] < jhash_size(t->htable_bits); cb->args[2]++) {
-                incomplete = skb_tail_pointer(skb);
-                n = hbucket(t, cb->args[2]);
-                pr_debug("cb->args[2]: %lu, t %p n %p\n", cb->args[2], t, n);
-                for (i = 0; i < n->pos; i++) {
-                        data = ahash_data(n, i);
-                        pr_debug("list hash %lu hbucket %p i %u, data %p\n",
-                                 cb->args[2], n, i, data);
-                        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
-                        if (!nested) {
-                                if (cb->args[2] == first) {
-                                        nla_nest_cancel(skb, atd);
-                                        return -EMSGSIZE;
-                                } else
-                                        goto nla_put_failure;
-                        }
-                        if (type_pf_data_list(skb, data))
-                                goto nla_put_failure;
-                        ipset_nest_end(skb, nested);
-                }
-        }
-        ipset_nest_end(skb, atd);
-        /* Set listing finished */
-        cb->args[2] = 0;
-
-        return 0;
-
-nla_put_failure:
-        nlmsg_trim(skb, incomplete);
-        ipset_nest_end(skb, atd);
-        if (unlikely(first == cb->args[2])) {
-                pr_warning("Can't list set %s: one bucket does not fit into "
-                           "a message. Please report it!\n", set->name);
-                cb->args[2] = 0;
-                return -EMSGSIZE;
-        }
-        return 0;
-}
-
-static int
-type_pf_kadt(struct ip_set *set, const struct sk_buff *skb,
-             const struct xt_action_param *par,
-             enum ipset_adt adt, const struct ip_set_adt_opt *opt);
-static int
-type_pf_uadt(struct ip_set *set, struct nlattr *tb[],
-             enum ipset_adt adt, u32 *lineno, u32 flags, bool retried);
-
-static const struct ip_set_type_variant type_pf_variant = {
-        .kadt   = type_pf_kadt,
-        .uadt   = type_pf_uadt,
-        .adt    = {
-                [IPSET_ADD] = type_pf_add,
-                [IPSET_DEL] = type_pf_del,
-                [IPSET_TEST] = type_pf_test,
-        },
-        .destroy = type_pf_destroy,
-        .flush  = type_pf_flush,
-        .head   = type_pf_head,
-        .list   = type_pf_list,
-        .resize = type_pf_resize,
-        .same_set = type_pf_same_set,
-};
-
-/* Flavour with timeout support */
-
-#define ahash_tdata(n, i) \
-        (struct type_pf_elem *)((struct type_pf_telem *)((n)->value) + (i))
-
-static inline u32
-type_pf_data_timeout(const struct type_pf_elem *data)
-{
-        const struct type_pf_telem *tdata =
-                (const struct type_pf_telem *) data;
-
-        return tdata->timeout;
-}
-
-static inline bool
-type_pf_data_expired(const struct type_pf_elem *data)
-{
-        const struct type_pf_telem *tdata =
-                (const struct type_pf_telem *) data;
-
-        return ip_set_timeout_expired(tdata->timeout);
-}
-
-static inline void
-type_pf_data_timeout_set(struct type_pf_elem *data, u32 timeout)
-{
-        struct type_pf_telem *tdata = (struct type_pf_telem *) data;
-
-        tdata->timeout = ip_set_timeout_set(timeout);
-}
-
-static int
-type_pf_elem_tadd(struct hbucket *n, const struct type_pf_elem *value,
-                  u8 ahash_max, u32 cadt_flags, u32 timeout)
-{
-        struct type_pf_elem *data;
-
-        if (n->pos >= n->size) {
-                void *tmp;
-
-                if (n->size >= ahash_max)
-                        /* Trigger rehashing */
-                        return -EAGAIN;
-
-                tmp = kzalloc((n->size + AHASH_INIT_SIZE)
-                              * sizeof(struct type_pf_telem),
-                              GFP_ATOMIC);
-                if (!tmp)
-                        return -ENOMEM;
-                if (n->size) {
-                        memcpy(tmp, n->value,
-                               sizeof(struct type_pf_telem) * n->size);
-                        kfree(n->value);
-                }
-                n->value = tmp;
-                n->size += AHASH_INIT_SIZE;
-        }
-        data = ahash_tdata(n, n->pos++);
-        type_pf_data_copy(data, value);
-        type_pf_data_timeout_set(data, timeout);
-#ifdef IP_SET_HASH_WITH_NETS
-        /* Resizing won't overwrite stored flags */
-        if (cadt_flags)
-                type_pf_data_flags(data, cadt_flags);
-#endif
-        return 0;
-}
-
-/* Delete expired elements from the hashtable */
-static void
-type_pf_expire(struct ip_set_hash *h, u8 nets_length)
-{
-        struct htable *t = h->table;
-        struct hbucket *n;
-        struct type_pf_elem *data;
-        u32 i;
-        int j;
-
-        for (i = 0; i < jhash_size(t->htable_bits); i++) {
-                n = hbucket(t, i);
-                for (j = 0; j < n->pos; j++) {
-                        data = ahash_tdata(n, j);
-                        if (type_pf_data_expired(data)) {
-                                pr_debug("expired %u/%u\n", i, j);
-#ifdef IP_SET_HASH_WITH_NETS
-                                del_cidr(h, CIDR(data->cidr), nets_length);
-#endif
-                                if (j != n->pos - 1)
-                                        /* Not last one */
-                                        type_pf_data_copy(data,
-                                                ahash_tdata(n, n->pos - 1));
-                                n->pos--;
-                                h->elements--;
-                        }
-                }
-                if (n->pos + AHASH_INIT_SIZE < n->size) {
-                        void *tmp = kzalloc((n->size - AHASH_INIT_SIZE)
-                                            * sizeof(struct type_pf_telem),
-                                            GFP_ATOMIC);
-                        if (!tmp)
-                                /* Still try to delete expired elements */
-                                continue;
-                        n->size -= AHASH_INIT_SIZE;
-                        memcpy(tmp, n->value,
-                               n->size * sizeof(struct type_pf_telem));
-                        kfree(n->value);
-                        n->value = tmp;
-                }
-        }
-}
-
-static int
-type_pf_tresize(struct ip_set *set, bool retried)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t, *orig = h->table;
-        u8 htable_bits = orig->htable_bits;
-        struct type_pf_elem *data;
-        struct hbucket *n, *m;
-        u32 i, j, flags = 0;
-        int ret;
-
-        /* Try to cleanup once */
-        if (!retried) {
-                i = h->elements;
-                write_lock_bh(&set->lock);
-                type_pf_expire(set->data, NETS_LENGTH(set->family));
-                write_unlock_bh(&set->lock);
-                if (h->elements <  i)
-                        return 0;
-        }
-
-retry:
-        ret = 0;
-        htable_bits++;
-        pr_debug("attempt to resize set %s from %u to %u, t %p\n",
-                 set->name, orig->htable_bits, htable_bits, orig);
-        if (!htable_bits) {
-                /* In case we have plenty of memory :-) */
-                pr_warning("Cannot increase the hashsize of set %s further\n",
-                           set->name);
-                return -IPSET_ERR_HASH_FULL;
-        }
-        t = ip_set_alloc(sizeof(*t)
-                         + jhash_size(htable_bits) * sizeof(struct hbucket));
-        if (!t)
-                return -ENOMEM;
-        t->htable_bits = htable_bits;
-
-        read_lock_bh(&set->lock);
-        for (i = 0; i < jhash_size(orig->htable_bits); i++) {
-                n = hbucket(orig, i);
-                for (j = 0; j < n->pos; j++) {
-                        data = ahash_tdata(n, j);
-#ifdef IP_SET_HASH_WITH_NETS
-                        flags = 0;
-                        type_pf_data_reset_flags(data, &flags);
-#endif
-                        m = hbucket(t, HKEY(data, h->initval, htable_bits));
-                        ret = type_pf_elem_tadd(m, data, AHASH_MAX(h), flags,
-                                ip_set_timeout_get(type_pf_data_timeout(data)));
-                        if (ret < 0) {
-#ifdef IP_SET_HASH_WITH_NETS
-                                type_pf_data_flags(data, flags);
-#endif
-                                read_unlock_bh(&set->lock);
-                                ahash_destroy(t);
-                                if (ret == -EAGAIN)
-                                        goto retry;
-                                return ret;
-                        }
-                }
-        }
-
-        rcu_assign_pointer(h->table, t);
-        read_unlock_bh(&set->lock);
-
-        /* Give time to other readers of the set */
-        synchronize_rcu_bh();
-
-        ahash_destroy(orig);
-
-        return 0;
-}
-
-static int
-type_pf_tadd(struct ip_set *set, void *value, u32 timeout, u32 flags)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        const struct type_pf_elem *d = value;
-        struct hbucket *n;
-        struct type_pf_elem *data;
-        int ret = 0, i, j = AHASH_MAX(h) + 1;
-        bool flag_exist = flags & IPSET_FLAG_EXIST;
-        u32 key, multi = 0;
-        u32 cadt_flags = flags >> 16;
-
-        if (h->elements >= h->maxelem)
-                /* FIXME: when set is full, we slow down here */
-                type_pf_expire(h, NETS_LENGTH(set->family));
-        if (h->elements >= h->maxelem) {
-                if (net_ratelimit())
-                        pr_warning("Set %s is full, maxelem %u reached\n",
-                                   set->name, h->maxelem);
-                return -IPSET_ERR_HASH_FULL;
-        }
-
-        rcu_read_lock_bh();
-        t = rcu_dereference_bh(h->table);
-        key = HKEY(d, h->initval, t->htable_bits);
-        n = hbucket(t, key);
-        for (i = 0; i < n->pos; i++) {
-                data = ahash_tdata(n, i);
-                if (type_pf_data_equal(data, d, &multi)) {
-                        if (type_pf_data_expired(data) || flag_exist)
-                                /* Just timeout value may be updated */
-                                j = i;
-                        else {
-                                ret = -IPSET_ERR_EXIST;
-                                goto out;
-                        }
-                } else if (j == AHASH_MAX(h) + 1 &&
-                           type_pf_data_expired(data))
-                        j = i;
-        }
-        if (j != AHASH_MAX(h) + 1) {
-                data = ahash_tdata(n, j);
-#ifdef IP_SET_HASH_WITH_NETS
-                del_cidr(h, CIDR(data->cidr), NETS_LENGTH(set->family));
-                add_cidr(h, CIDR(d->cidr), NETS_LENGTH(set->family));
-#endif
-                type_pf_data_copy(data, d);
-                type_pf_data_timeout_set(data, timeout);
-#ifdef IP_SET_HASH_WITH_NETS
-                type_pf_data_flags(data, cadt_flags);
-#endif
-                goto out;
-        }
-        TUNE_AHASH_MAX(h, multi);
-        ret = type_pf_elem_tadd(n, d, AHASH_MAX(h), cadt_flags, timeout);
-        if (ret != 0) {
-                if (ret == -EAGAIN)
-                        type_pf_data_next(h, d);
-                goto out;
-        }
-
-#ifdef IP_SET_HASH_WITH_NETS
-        add_cidr(h, CIDR(d->cidr), NETS_LENGTH(set->family));
-#endif
-        h->elements++;
-out:
-        rcu_read_unlock_bh();
-        return ret;
-}
-
-static int
-type_pf_tdel(struct ip_set *set, void *value, u32 timeout, u32 flags)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        const struct type_pf_elem *d = value;
-        struct hbucket *n;
-        int i;
-        struct type_pf_elem *data;
-        u32 key, multi = 0;
-
-        key = HKEY(value, h->initval, t->htable_bits);
-        n = hbucket(t, key);
-        for (i = 0; i < n->pos; i++) {
-                data = ahash_tdata(n, i);
-                if (!type_pf_data_equal(data, d, &multi))
-                        continue;
-                if (type_pf_data_expired(data))
-                        return -IPSET_ERR_EXIST;
-                if (i != n->pos - 1)
-                        /* Not last one */
-                        type_pf_data_copy(data, ahash_tdata(n, n->pos - 1));
-
-                n->pos--;
-                h->elements--;
-#ifdef IP_SET_HASH_WITH_NETS
-                del_cidr(h, CIDR(d->cidr), NETS_LENGTH(set->family));
-#endif
-                if (n->pos + AHASH_INIT_SIZE < n->size) {
-                        void *tmp = kzalloc((n->size - AHASH_INIT_SIZE)
-                                            * sizeof(struct type_pf_telem),
-                                            GFP_ATOMIC);
-                        if (!tmp)
-                                return 0;
-                        n->size -= AHASH_INIT_SIZE;
-                        memcpy(tmp, n->value,
-                               n->size * sizeof(struct type_pf_telem));
-                        kfree(n->value);
-                        n->value = tmp;
-                }
-                return 0;
-        }
-
-        return -IPSET_ERR_EXIST;
-}
-
-#ifdef IP_SET_HASH_WITH_NETS
-static int
-type_pf_ttest_cidrs(struct ip_set *set, struct type_pf_elem *d, u32 timeout)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        struct type_pf_elem *data;
-        struct hbucket *n;
-        int i, j = 0;
-        u32 key, multi = 0;
-        u8 nets_length = NETS_LENGTH(set->family);
-
-        for (; j < nets_length && h->nets[j].nets && !multi; j++) {
-                type_pf_data_netmask(d, h->nets[j].cidr);
-                key = HKEY(d, h->initval, t->htable_bits);
-                n = hbucket(t, key);
-                for (i = 0; i < n->pos; i++) {
-                        data = ahash_tdata(n, i);
-#ifdef IP_SET_HASH_WITH_MULTI
-                        if (type_pf_data_equal(data, d, &multi)) {
-                                if (!type_pf_data_expired(data))
-                                        return type_pf_data_match(data);
-                                multi = 0;
-                        }
-#else
-                        if (type_pf_data_equal(data, d, &multi) &&
-                            !type_pf_data_expired(data))
-                                return type_pf_data_match(data);
-#endif
-                }
-        }
-        return 0;
-}
-#endif
-
-static int
-type_pf_ttest(struct ip_set *set, void *value, u32 timeout, u32 flags)
-{
-        struct ip_set_hash *h = set->data;
-        struct htable *t = h->table;
-        struct type_pf_elem *data, *d = value;
-        struct hbucket *n;
-        int i;
-        u32 key, multi = 0;
-
-#ifdef IP_SET_HASH_WITH_NETS
-        if (CIDR(d->cidr) == SET_HOST_MASK(set->family))
-                return type_pf_ttest_cidrs(set, d, timeout);
-#endif
-        key = HKEY(d, h->initval, t->htable_bits);
-        n = hbucket(t, key);
-        for (i = 0; i < n->pos; i++) {
-                data = ahash_tdata(n, i);
-                if (type_pf_data_equal(data, d, &multi) &&
-                    !type_pf_data_expired(data))
-                        return type_pf_data_match(data);
-        }
-        return 0;
-}
-
-static int
-type_pf_tlist(const struct ip_set *set,
-              struct sk_buff *skb, struct netlink_callback *cb)
-{
-        const struct ip_set_hash *h = set->data;
-        const struct htable *t = h->table;
-        struct nlattr *atd, *nested;
-        const struct hbucket *n;
-        const struct type_pf_elem *data;
-        u32 first = cb->args[2];
-        /* We assume that one hash bucket fills into one page */
-        void *incomplete;
-        int i;
-
-        atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
-        if (!atd)
-                return -EMSGSIZE;
-        for (; cb->args[2] < jhash_size(t->htable_bits); cb->args[2]++) {
-                incomplete = skb_tail_pointer(skb);
-                n = hbucket(t, cb->args[2]);
-                for (i = 0; i < n->pos; i++) {
-                        data = ahash_tdata(n, i);
-                        pr_debug("list %p %u\n", n, i);
-                        if (type_pf_data_expired(data))
-                                continue;
-                        pr_debug("do list %p %u\n", n, i);
-                        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
-                        if (!nested) {
-                                if (cb->args[2] == first) {
-                                        nla_nest_cancel(skb, atd);
-                                        return -EMSGSIZE;
-                                } else
-                                        goto nla_put_failure;
-                        }
-                        if (type_pf_data_tlist(skb, data))
-                                goto nla_put_failure;
-                        ipset_nest_end(skb, nested);
-                }
-        }
-        ipset_nest_end(skb, atd);
-        /* Set listing finished */
-        cb->args[2] = 0;
-
-        return 0;
-
-nla_put_failure:
-        nlmsg_trim(skb, incomplete);
-        ipset_nest_end(skb, atd);
-        if (unlikely(first == cb->args[2])) {
-                pr_warning("Can't list set %s: one bucket does not fit into "
-                           "a message. Please report it!\n", set->name);
-                cb->args[2] = 0;
-                return -EMSGSIZE;
-        }
-        return 0;
-}
-
-static const struct ip_set_type_variant type_pf_tvariant = {
-        .kadt   = type_pf_kadt,
-        .uadt   = type_pf_uadt,
-        .adt    = {
-                [IPSET_ADD] = type_pf_tadd,
-                [IPSET_DEL] = type_pf_tdel,
-                [IPSET_TEST] = type_pf_ttest,
-        },
-        .destroy = type_pf_destroy,
-        .flush  = type_pf_flush,
-        .head   = type_pf_head,
-        .list   = type_pf_tlist,
-        .resize = type_pf_tresize,
-        .same_set = type_pf_same_set,
-};
-
-static void
-type_pf_gc(unsigned long ul_set)
-{
-        struct ip_set *set = (struct ip_set *) ul_set;
-        struct ip_set_hash *h = set->data;
-
-        pr_debug("called\n");
-        write_lock_bh(&set->lock);
-        type_pf_expire(h, NETS_LENGTH(set->family));
-        write_unlock_bh(&set->lock);
-
-        h->gc.expires = jiffies + IPSET_GC_PERIOD(h->timeout) * HZ;
-        add_timer(&h->gc);
-}
-
-static void
-type_pf_gc_init(struct ip_set *set)
-{
-        struct ip_set_hash *h = set->data;
-
-        init_timer(&h->gc);
-        h->gc.data = (unsigned long) set;
-        h->gc.function = type_pf_gc;
-        h->gc.expires = jiffies + IPSET_GC_PERIOD(h->timeout) * HZ;
-        add_timer(&h->gc);
-        pr_debug("gc initialized, run in every %u\n",
-                 IPSET_GC_PERIOD(h->timeout));
-}
-
-#undef HKEY_DATALEN
-#undef HKEY
-#undef type_pf_data_equal
-#undef type_pf_data_isnull
-#undef type_pf_data_copy
-#undef type_pf_data_zero_out
-#undef type_pf_data_netmask
-#undef type_pf_data_list
-#undef type_pf_data_tlist
-#undef type_pf_data_next
-#undef type_pf_data_flags
-#undef type_pf_data_reset_flags
-#undef type_pf_data_match
-
-#undef type_pf_elem
-#undef type_pf_telem
-#undef type_pf_data_timeout
-#undef type_pf_data_expired
-#undef type_pf_data_timeout_set
-
-#undef type_pf_elem_add
-#undef type_pf_add
-#undef type_pf_del
-#undef type_pf_test_cidrs
-#undef type_pf_test
-
-#undef type_pf_elem_tadd
-#undef type_pf_del_telem
-#undef type_pf_expire
-#undef type_pf_tadd
-#undef type_pf_tdel
-#undef type_pf_ttest_cidrs
-#undef type_pf_ttest
-
-#undef type_pf_resize
-#undef type_pf_tresize
-#undef type_pf_flush
-#undef type_pf_destroy
-#undef type_pf_head
-#undef type_pf_list
-#undef type_pf_tlist
-#undef type_pf_same_set
-#undef type_pf_kadt
-#undef type_pf_uadt
-#undef type_pf_gc
-#undef type_pf_gc_init
-#undef type_pf_variant
-#undef type_pf_tvariant
diff --git a/include/linux/netfilter/ipset/ip_set_bitmap.h b/include/linux/netfilter/ipset/ip_set_bitmap.h
index 1a30646d5be8..5e4662a71e01 100644
--- a/include/linux/netfilter/ipset/ip_set_bitmap.h
+++ b/include/linux/netfilter/ipset/ip_set_bitmap.h
@@ -5,6 +5,12 @@
 
 #define IPSET_BITMAP_MAX_RANGE  0x0000FFFF
 
+enum {
+        IPSET_ADD_FAILED = 1,
+        IPSET_ADD_STORE_PLAIN_TIMEOUT,
+        IPSET_ADD_START_STORED_TIMEOUT,
+};
+
 /* Common functions */
 
 static inline u32
diff --git a/include/linux/netfilter/ipset/ip_set_timeout.h b/include/linux/netfilter/ipset/ip_set_timeout.h
index 41d9cfa08167..3aac04167ca7 100644
--- a/include/linux/netfilter/ipset/ip_set_timeout.h
+++ b/include/linux/netfilter/ipset/ip_set_timeout.h
@@ -1,7 +1,7 @@
 #ifndef _IP_SET_TIMEOUT_H
 #define _IP_SET_TIMEOUT_H
 
-/* Copyright (C) 2003-2011 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
+/* Copyright (C) 2003-2013 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
  *
  * 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
@@ -17,13 +17,14 @@
 #define IPSET_GC_PERIOD(timeout) \
         ((timeout/3) ? min_t(u32, (timeout)/3, IPSET_GC_TIME) : 1)
 
-/* Set is defined without timeout support: timeout value may be 0 */
-#define IPSET_NO_TIMEOUT        UINT_MAX
+/* Entry is set with no timeout value */
+#define IPSET_ELEM_PERMANENT    0
 
-#define with_timeout(timeout)   ((timeout) != IPSET_NO_TIMEOUT)
+/* Set is defined with timeout support: timeout value may be 0 */
+#define IPSET_NO_TIMEOUT        UINT_MAX
 
-#define opt_timeout(opt, map)   \
-        (with_timeout((opt)->timeout) ? (opt)->timeout : (map)->timeout)
+#define ip_set_adt_opt_timeout(opt, map)        \
+((opt)->ext.timeout != IPSET_NO_TIMEOUT ? (opt)->ext.timeout : (map)->timeout)
 
 static inline unsigned int
 ip_set_timeout_uget(struct nlattr *tb)
@@ -38,61 +39,6 @@ ip_set_timeout_uget(struct nlattr *tb)
         return timeout == IPSET_NO_TIMEOUT ? IPSET_NO_TIMEOUT - 1 : timeout;
 }
 
-#ifdef IP_SET_BITMAP_TIMEOUT
-
-/* Bitmap specific timeout constants and macros for the entries */
-
-/* Bitmap entry is unset */
-#define IPSET_ELEM_UNSET        0
-/* Bitmap entry is set with no timeout value */
-#define IPSET_ELEM_PERMANENT    (UINT_MAX/2)
-
-static inline bool
-ip_set_timeout_test(unsigned long timeout)
-{
-        return timeout != IPSET_ELEM_UNSET &&
-               (timeout == IPSET_ELEM_PERMANENT ||
-                time_is_after_jiffies(timeout));
-}
-
-static inline bool
-ip_set_timeout_expired(unsigned long timeout)
-{
-        return timeout != IPSET_ELEM_UNSET &&
-               timeout != IPSET_ELEM_PERMANENT &&
-               time_is_before_jiffies(timeout);
-}
-
-static inline unsigned long
-ip_set_timeout_set(u32 timeout)
-{
-        unsigned long t;
-
-        if (!timeout)
-                return IPSET_ELEM_PERMANENT;
-
-        t = msecs_to_jiffies(timeout * 1000) + jiffies;
-        if (t == IPSET_ELEM_UNSET || t == IPSET_ELEM_PERMANENT)
-                /* Bingo! */
-                t++;
-
-        return t;
-}
-
-static inline u32
-ip_set_timeout_get(unsigned long timeout)
-{
-        return timeout == IPSET_ELEM_PERMANENT ? 0 :
-                jiffies_to_msecs(timeout - jiffies)/1000;
-}
-
-#else
-
-/* Hash specific timeout constants and macros for the entries */
-
-/* Hash entry is set with no timeout value */
-#define IPSET_ELEM_PERMANENT    0
-
 static inline bool
 ip_set_timeout_test(unsigned long timeout)
 {
@@ -101,36 +47,32 @@ ip_set_timeout_test(unsigned long timeout)
 }
 
 static inline bool
-ip_set_timeout_expired(unsigned long timeout)
+ip_set_timeout_expired(unsigned long *timeout)
 {
-        return timeout != IPSET_ELEM_PERMANENT &&
-               time_is_before_jiffies(timeout);
+        return *timeout != IPSET_ELEM_PERMANENT &&
+               time_is_before_jiffies(*timeout);
 }
 
-static inline unsigned long
-ip_set_timeout_set(u32 timeout)
+static inline void
+ip_set_timeout_set(unsigned long *timeout, u32 t)
 {
-        unsigned long t;
-
-        if (!timeout)
-                return IPSET_ELEM_PERMANENT;
+        if (!t) {
+                *timeout = IPSET_ELEM_PERMANENT;
+                return;
+        }
 
-        t = msecs_to_jiffies(timeout * 1000) + jiffies;
-        if (t == IPSET_ELEM_PERMANENT)
+        *timeout = msecs_to_jiffies(t * 1000) + jiffies;
+        if (*timeout == IPSET_ELEM_PERMANENT)
                 /* Bingo! :-) */
-                t++;
-
-        return t;
+                (*timeout)--;
 }
 
 static inline u32
-ip_set_timeout_get(unsigned long timeout)
+ip_set_timeout_get(unsigned long *timeout)
 {
-        return timeout == IPSET_ELEM_PERMANENT ? 0 :
-                jiffies_to_msecs(timeout - jiffies)/1000;
+        return *timeout == IPSET_ELEM_PERMANENT ? 0 :
+                jiffies_to_msecs(*timeout - jiffies)/1000;
 }
-#endif /* ! IP_SET_BITMAP_TIMEOUT */
 
 #endif  /* __KERNEL__ */
-
 #endif /* _IP_SET_TIMEOUT_H */
diff --git a/include/linux/netfilter/ipset/pfxlen.h b/include/linux/netfilter/ipset/pfxlen.h
index 199fd11fedc0..1afbb94b4b65 100644
--- a/include/linux/netfilter/ipset/pfxlen.h
+++ b/include/linux/netfilter/ipset/pfxlen.h
@@ -41,4 +41,13 @@ do {						\
         to = from | ~ip_set_hostmask(cidr);     \
 } while (0)
 
+static inline void
+ip6_netmask(union nf_inet_addr *ip, u8 prefix)
+{
+        ip->ip6[0] &= ip_set_netmask6(prefix)[0];
+        ip->ip6[1] &= ip_set_netmask6(prefix)[1];
+        ip->ip6[2] &= ip_set_netmask6(prefix)[2];
+        ip->ip6[3] &= ip_set_netmask6(prefix)[3];
+}
+
 #endif /*_PFXLEN_H */
diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
index ecbb8e495912..cadb7402d7a7 100644
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
@@ -29,10 +29,13 @@ extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
 extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
 
 extern int nfnetlink_has_listeners(struct net *net, unsigned int group);
-extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 pid, unsigned int group,
-                          int echo, gfp_t flags);
-extern int nfnetlink_set_err(struct net *net, u32 pid, u32 group, int error);
-extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net, u_int32_t pid, int flags);
+extern struct sk_buff *nfnetlink_alloc_skb(struct net *net, unsigned int size,
+                                           u32 dst_portid, gfp_t gfp_mask);
+extern int nfnetlink_send(struct sk_buff *skb, struct net *net, u32 portid,
+                          unsigned int group, int echo, gfp_t flags);
+extern int nfnetlink_set_err(struct net *net, u32 portid, u32 group, int error);
+extern int nfnetlink_unicast(struct sk_buff *skb, struct net *net,
+                             u32 portid, int flags);
 
 extern void nfnl_lock(__u8 subsys_id);
 extern void nfnl_unlock(__u8 subsys_id);
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index e0f746b7b95c..6358da5eeee8 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -15,11 +15,18 @@ static inline struct nlmsghdr *nlmsg_hdr(const struct sk_buff *skb)
         return (struct nlmsghdr *)skb->data;
 }
 
+enum netlink_skb_flags {
+        NETLINK_SKB_MMAPED      = 0x1,          /* Packet data is mmaped */
+        NETLINK_SKB_TX          = 0x2,          /* Packet was sent by userspace */
+        NETLINK_SKB_DELIVERED   = 0x4,          /* Packet was delivered */
+};
+
 struct netlink_skb_parms {
         struct scm_creds        creds;          /* Skb credentials      */
         __u32                   portid;
         __u32                   dst_group;
-        struct sock             *ssk;
+        __u32                   flags;
+        struct sock             *sk;
 };
 
 #define NETLINK_CB(skb)         (*(struct netlink_skb_parms*)&((skb)->cb))
@@ -57,6 +64,8 @@ extern void __netlink_clear_multicast_users(struct sock *sk, unsigned int group)
 extern void netlink_clear_multicast_users(struct sock *sk, unsigned int group);
 extern void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err);
 extern int netlink_has_listeners(struct sock *sk, unsigned int group);
+extern struct sk_buff *netlink_alloc_skb(struct sock *ssk, unsigned int size,
+                                         u32 dst_portid, gfp_t gfp_mask);
 extern int netlink_unicast(struct sock *ssk, struct sk_buff *skb, __u32 portid, int nonblock);
 extern int netlink_broadcast(struct sock *ssk, struct sk_buff *skb, __u32 portid,
                              __u32 group, gfp_t allocation);
diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h
index 9d7d8c64f7c8..fa2cb76a7029 100644
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
@@ -40,7 +40,7 @@ struct netpoll_info {
 
         unsigned long rx_flags;
         spinlock_t rx_lock;
-        struct mutex dev_lock;
+        struct semaphore dev_lock;
         struct list_head rx_np; /* netpolls that registered an rx_hook */
 
         struct sk_buff_head neigh_tx; /* list of neigh requests to reply to */
diff --git a/include/linux/of_net.h b/include/linux/of_net.h
index f47464188710..61bf53b02779 100644
--- a/include/linux/of_net.h
+++ b/include/linux/of_net.h
@@ -11,6 +11,16 @@
 #include <linux/of.h>
 extern const int of_get_phy_mode(struct device_node *np);
 extern const void *of_get_mac_address(struct device_node *np);
+#else
+static inline const int of_get_phy_mode(struct device_node *np)
+{
+        return -ENODEV;
+}
+
+static inline const void *of_get_mac_address(struct device_node *np)
+{
+        return NULL;
+}
 #endif
 
 #endif /* __LINUX_OF_NET_H */
diff --git a/include/linux/openvswitch.h b/include/linux/openvswitch.h
index d42e174bd0c8..e6b240b6196c 100644
--- a/include/linux/openvswitch.h
+++ b/include/linux/openvswitch.h
@@ -19,435 +19,6 @@
 #ifndef _LINUX_OPENVSWITCH_H
 #define _LINUX_OPENVSWITCH_H 1
 
-#include <linux/types.h>
-
-/**
- * struct ovs_header - header for OVS Generic Netlink messages.
- * @dp_ifindex: ifindex of local port for datapath (0 to make a request not
- * specific to a datapath).
- *
- * Attributes following the header are specific to a particular OVS Generic
- * Netlink family, but all of the OVS families use this header.
- */
-
-struct ovs_header {
-        int dp_ifindex;
-};
-
-/* Datapaths. */
-
-#define OVS_DATAPATH_FAMILY  "ovs_datapath"
-#define OVS_DATAPATH_MCGROUP "ovs_datapath"
-#define OVS_DATAPATH_VERSION 0x1
-
-enum ovs_datapath_cmd {
-        OVS_DP_CMD_UNSPEC,
-        OVS_DP_CMD_NEW,
-        OVS_DP_CMD_DEL,
-        OVS_DP_CMD_GET,
-        OVS_DP_CMD_SET
-};
-
-/**
- * enum ovs_datapath_attr - attributes for %OVS_DP_* commands.
- * @OVS_DP_ATTR_NAME: Name of the network device that serves as the "local
- * port".  This is the name of the network device whose dp_ifindex is given in
- * the &struct ovs_header.  Always present in notifications.  Required in
- * %OVS_DP_NEW requests.  May be used as an alternative to specifying
- * dp_ifindex in other requests (with a dp_ifindex of 0).
- * @OVS_DP_ATTR_UPCALL_PID: The Netlink socket in userspace that is initially
- * set on the datapath port (for OVS_ACTION_ATTR_MISS).  Only valid on
- * %OVS_DP_CMD_NEW requests. A value of zero indicates that upcalls should
- * not be sent.
- * @OVS_DP_ATTR_STATS: Statistics about packets that have passed through the
- * datapath.  Always present in notifications.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_DP_* commands.
- */
-enum ovs_datapath_attr {
-        OVS_DP_ATTR_UNSPEC,
-        OVS_DP_ATTR_NAME,       /* name of dp_ifindex netdev */
-        OVS_DP_ATTR_UPCALL_PID, /* Netlink PID to receive upcalls */
-        OVS_DP_ATTR_STATS,      /* struct ovs_dp_stats */
-        __OVS_DP_ATTR_MAX
-};
-
-#define OVS_DP_ATTR_MAX (__OVS_DP_ATTR_MAX - 1)
-
-struct ovs_dp_stats {
-        __u64 n_hit;             /* Number of flow table matches. */
-        __u64 n_missed;          /* Number of flow table misses. */
-        __u64 n_lost;            /* Number of misses not sent to userspace. */
-        __u64 n_flows;           /* Number of flows present */
-};
-
-struct ovs_vport_stats {
-        __u64   rx_packets;             /* total packets received       */
-        __u64   tx_packets;             /* total packets transmitted    */
-        __u64   rx_bytes;               /* total bytes received         */
-        __u64   tx_bytes;               /* total bytes transmitted      */
-        __u64   rx_errors;              /* bad packets received         */
-        __u64   tx_errors;              /* packet transmit problems     */
-        __u64   rx_dropped;             /* no space in linux buffers    */
-        __u64   tx_dropped;             /* no space available in linux  */
-};
-
-/* Fixed logical ports. */
-#define OVSP_LOCAL      ((__u16)0)
-
-/* Packet transfer. */
-
-#define OVS_PACKET_FAMILY "ovs_packet"
-#define OVS_PACKET_VERSION 0x1
-
-enum ovs_packet_cmd {
-        OVS_PACKET_CMD_UNSPEC,
-
-        /* Kernel-to-user notifications. */
-        OVS_PACKET_CMD_MISS,    /* Flow table miss. */
-        OVS_PACKET_CMD_ACTION,  /* OVS_ACTION_ATTR_USERSPACE action. */
-
-        /* Userspace commands. */
-        OVS_PACKET_CMD_EXECUTE  /* Apply actions to a packet. */
-};
-
-/**
- * enum ovs_packet_attr - attributes for %OVS_PACKET_* commands.
- * @OVS_PACKET_ATTR_PACKET: Present for all notifications.  Contains the entire
- * packet as received, from the start of the Ethernet header onward.  For
- * %OVS_PACKET_CMD_ACTION, %OVS_PACKET_ATTR_PACKET reflects changes made by
- * actions preceding %OVS_ACTION_ATTR_USERSPACE, but %OVS_PACKET_ATTR_KEY is
- * the flow key extracted from the packet as originally received.
- * @OVS_PACKET_ATTR_KEY: Present for all notifications.  Contains the flow key
- * extracted from the packet as nested %OVS_KEY_ATTR_* attributes.  This allows
- * userspace to adapt its flow setup strategy by comparing its notion of the
- * flow key against the kernel's.
- * @OVS_PACKET_ATTR_ACTIONS: Contains actions for the packet.  Used
- * for %OVS_PACKET_CMD_EXECUTE.  It has nested %OVS_ACTION_ATTR_* attributes.
- * @OVS_PACKET_ATTR_USERDATA: Present for an %OVS_PACKET_CMD_ACTION
- * notification if the %OVS_ACTION_ATTR_USERSPACE action specified an
- * %OVS_USERSPACE_ATTR_USERDATA attribute.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_PACKET_* commands.
- */
-enum ovs_packet_attr {
-        OVS_PACKET_ATTR_UNSPEC,
-        OVS_PACKET_ATTR_PACKET,      /* Packet data. */
-        OVS_PACKET_ATTR_KEY,         /* Nested OVS_KEY_ATTR_* attributes. */
-        OVS_PACKET_ATTR_ACTIONS,     /* Nested OVS_ACTION_ATTR_* attributes. */
-        OVS_PACKET_ATTR_USERDATA,    /* u64 OVS_ACTION_ATTR_USERSPACE arg. */
-        __OVS_PACKET_ATTR_MAX
-};
-
-#define OVS_PACKET_ATTR_MAX (__OVS_PACKET_ATTR_MAX - 1)
-
-/* Virtual ports. */
-
-#define OVS_VPORT_FAMILY  "ovs_vport"
-#define OVS_VPORT_MCGROUP "ovs_vport"
-#define OVS_VPORT_VERSION 0x1
-
-enum ovs_vport_cmd {
-        OVS_VPORT_CMD_UNSPEC,
-        OVS_VPORT_CMD_NEW,
-        OVS_VPORT_CMD_DEL,
-        OVS_VPORT_CMD_GET,
-        OVS_VPORT_CMD_SET
-};
-
-enum ovs_vport_type {
-        OVS_VPORT_TYPE_UNSPEC,
-        OVS_VPORT_TYPE_NETDEV,   /* network device */
-        OVS_VPORT_TYPE_INTERNAL, /* network device implemented by datapath */
-        __OVS_VPORT_TYPE_MAX
-};
-
-#define OVS_VPORT_TYPE_MAX (__OVS_VPORT_TYPE_MAX - 1)
-
-/**
- * enum ovs_vport_attr - attributes for %OVS_VPORT_* commands.
- * @OVS_VPORT_ATTR_PORT_NO: 32-bit port number within datapath.
- * @OVS_VPORT_ATTR_TYPE: 32-bit %OVS_VPORT_TYPE_* constant describing the type
- * of vport.
- * @OVS_VPORT_ATTR_NAME: Name of vport.  For a vport based on a network device
- * this is the name of the network device.  Maximum length %IFNAMSIZ-1 bytes
- * plus a null terminator.
- * @OVS_VPORT_ATTR_OPTIONS: Vport-specific configuration information.
- * @OVS_VPORT_ATTR_UPCALL_PID: The Netlink socket in userspace that
- * OVS_PACKET_CMD_MISS upcalls will be directed to for packets received on
- * this port.  A value of zero indicates that upcalls should not be sent.
- * @OVS_VPORT_ATTR_STATS: A &struct ovs_vport_stats giving statistics for
- * packets sent or received through the vport.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_VPORT_* commands.
- *
- * For %OVS_VPORT_CMD_NEW requests, the %OVS_VPORT_ATTR_TYPE and
- * %OVS_VPORT_ATTR_NAME attributes are required.  %OVS_VPORT_ATTR_PORT_NO is
- * optional; if not specified a free port number is automatically selected.
- * Whether %OVS_VPORT_ATTR_OPTIONS is required or optional depends on the type
- * of vport.
- * and other attributes are ignored.
- *
- * For other requests, if %OVS_VPORT_ATTR_NAME is specified then it is used to
- * look up the vport to operate on; otherwise dp_idx from the &struct
- * ovs_header plus %OVS_VPORT_ATTR_PORT_NO determine the vport.
- */
-enum ovs_vport_attr {
-        OVS_VPORT_ATTR_UNSPEC,
-        OVS_VPORT_ATTR_PORT_NO, /* u32 port number within datapath */
-        OVS_VPORT_ATTR_TYPE,    /* u32 OVS_VPORT_TYPE_* constant. */
-        OVS_VPORT_ATTR_NAME,    /* string name, up to IFNAMSIZ bytes long */
-        OVS_VPORT_ATTR_OPTIONS, /* nested attributes, varies by vport type */
-        OVS_VPORT_ATTR_UPCALL_PID, /* u32 Netlink PID to receive upcalls */
-        OVS_VPORT_ATTR_STATS,   /* struct ovs_vport_stats */
-        __OVS_VPORT_ATTR_MAX
-};
-
-#define OVS_VPORT_ATTR_MAX (__OVS_VPORT_ATTR_MAX - 1)
-
-/* Flows. */
-
-#define OVS_FLOW_FAMILY  "ovs_flow"
-#define OVS_FLOW_MCGROUP "ovs_flow"
-#define OVS_FLOW_VERSION 0x1
-
-enum ovs_flow_cmd {
-        OVS_FLOW_CMD_UNSPEC,
-        OVS_FLOW_CMD_NEW,
-        OVS_FLOW_CMD_DEL,
-        OVS_FLOW_CMD_GET,
-        OVS_FLOW_CMD_SET
-};
-
-struct ovs_flow_stats {
-        __u64 n_packets;         /* Number of matched packets. */
-        __u64 n_bytes;           /* Number of matched bytes. */
-};
-
-enum ovs_key_attr {
-        OVS_KEY_ATTR_UNSPEC,
-        OVS_KEY_ATTR_ENCAP,     /* Nested set of encapsulated attributes. */
-        OVS_KEY_ATTR_PRIORITY,  /* u32 skb->priority */
-        OVS_KEY_ATTR_IN_PORT,   /* u32 OVS dp port number */
-        OVS_KEY_ATTR_ETHERNET,  /* struct ovs_key_ethernet */
-        OVS_KEY_ATTR_VLAN,      /* be16 VLAN TCI */
-        OVS_KEY_ATTR_ETHERTYPE, /* be16 Ethernet type */
-        OVS_KEY_ATTR_IPV4,      /* struct ovs_key_ipv4 */
-        OVS_KEY_ATTR_IPV6,      /* struct ovs_key_ipv6 */
-        OVS_KEY_ATTR_TCP,       /* struct ovs_key_tcp */
-        OVS_KEY_ATTR_UDP,       /* struct ovs_key_udp */
-        OVS_KEY_ATTR_ICMP,      /* struct ovs_key_icmp */
-        OVS_KEY_ATTR_ICMPV6,    /* struct ovs_key_icmpv6 */
-        OVS_KEY_ATTR_ARP,       /* struct ovs_key_arp */
-        OVS_KEY_ATTR_ND,        /* struct ovs_key_nd */
-        OVS_KEY_ATTR_SKB_MARK,  /* u32 skb mark */
-        __OVS_KEY_ATTR_MAX
-};
-
-#define OVS_KEY_ATTR_MAX (__OVS_KEY_ATTR_MAX - 1)
-
-/**
- * enum ovs_frag_type - IPv4 and IPv6 fragment type
- * @OVS_FRAG_TYPE_NONE: Packet is not a fragment.
- * @OVS_FRAG_TYPE_FIRST: Packet is a fragment with offset 0.
- * @OVS_FRAG_TYPE_LATER: Packet is a fragment with nonzero offset.
- *
- * Used as the @ipv4_frag in &struct ovs_key_ipv4 and as @ipv6_frag &struct
- * ovs_key_ipv6.
- */
-enum ovs_frag_type {
-        OVS_FRAG_TYPE_NONE,
-        OVS_FRAG_TYPE_FIRST,
-        OVS_FRAG_TYPE_LATER,
-        __OVS_FRAG_TYPE_MAX
-};
-
-#define OVS_FRAG_TYPE_MAX (__OVS_FRAG_TYPE_MAX - 1)
-
-struct ovs_key_ethernet {
-        __u8     eth_src[6];
-        __u8     eth_dst[6];
-};
-
-struct ovs_key_ipv4 {
-        __be32 ipv4_src;
-        __be32 ipv4_dst;
-        __u8   ipv4_proto;
-        __u8   ipv4_tos;
-        __u8   ipv4_ttl;
-        __u8   ipv4_frag;       /* One of OVS_FRAG_TYPE_*. */
-};
-
-struct ovs_key_ipv6 {
-        __be32 ipv6_src[4];
-        __be32 ipv6_dst[4];
-        __be32 ipv6_label;      /* 20-bits in least-significant bits. */
-        __u8   ipv6_proto;
-        __u8   ipv6_tclass;
-        __u8   ipv6_hlimit;
-        __u8   ipv6_frag;       /* One of OVS_FRAG_TYPE_*. */
-};
-
-struct ovs_key_tcp {
-        __be16 tcp_src;
-        __be16 tcp_dst;
-};
-
-struct ovs_key_udp {
-        __be16 udp_src;
-        __be16 udp_dst;
-};
-
-struct ovs_key_icmp {
-        __u8 icmp_type;
-        __u8 icmp_code;
-};
-
-struct ovs_key_icmpv6 {
-        __u8 icmpv6_type;
-        __u8 icmpv6_code;
-};
-
-struct ovs_key_arp {
-        __be32 arp_sip;
-        __be32 arp_tip;
-        __be16 arp_op;
-        __u8   arp_sha[6];
-        __u8   arp_tha[6];
-};
-
-struct ovs_key_nd {
-        __u32 nd_target[4];
-        __u8  nd_sll[6];
-        __u8  nd_tll[6];
-};
-
-/**
- * enum ovs_flow_attr - attributes for %OVS_FLOW_* commands.
- * @OVS_FLOW_ATTR_KEY: Nested %OVS_KEY_ATTR_* attributes specifying the flow
- * key.  Always present in notifications.  Required for all requests (except
- * dumps).
- * @OVS_FLOW_ATTR_ACTIONS: Nested %OVS_ACTION_ATTR_* attributes specifying
- * the actions to take for packets that match the key.  Always present in
- * notifications.  Required for %OVS_FLOW_CMD_NEW requests, optional for
- * %OVS_FLOW_CMD_SET requests.
- * @OVS_FLOW_ATTR_STATS: &struct ovs_flow_stats giving statistics for this
- * flow.  Present in notifications if the stats would be nonzero.  Ignored in
- * requests.
- * @OVS_FLOW_ATTR_TCP_FLAGS: An 8-bit value giving the OR'd value of all of the
- * TCP flags seen on packets in this flow.  Only present in notifications for
- * TCP flows, and only if it would be nonzero.  Ignored in requests.
- * @OVS_FLOW_ATTR_USED: A 64-bit integer giving the time, in milliseconds on
- * the system monotonic clock, at which a packet was last processed for this
- * flow.  Only present in notifications if a packet has been processed for this
- * flow.  Ignored in requests.
- * @OVS_FLOW_ATTR_CLEAR: If present in a %OVS_FLOW_CMD_SET request, clears the
- * last-used time, accumulated TCP flags, and statistics for this flow.
- * Otherwise ignored in requests.  Never present in notifications.
- *
- * These attributes follow the &struct ovs_header within the Generic Netlink
- * payload for %OVS_FLOW_* commands.
- */
-enum ovs_flow_attr {
-        OVS_FLOW_ATTR_UNSPEC,
-        OVS_FLOW_ATTR_KEY,       /* Sequence of OVS_KEY_ATTR_* attributes. */
-        OVS_FLOW_ATTR_ACTIONS,   /* Nested OVS_ACTION_ATTR_* attributes. */
-        OVS_FLOW_ATTR_STATS,     /* struct ovs_flow_stats. */
-        OVS_FLOW_ATTR_TCP_FLAGS, /* 8-bit OR'd TCP flags. */
-        OVS_FLOW_ATTR_USED,      /* u64 msecs last used in monotonic time. */
-        OVS_FLOW_ATTR_CLEAR,     /* Flag to clear stats, tcp_flags, used. */
-        __OVS_FLOW_ATTR_MAX
-};
-
-#define OVS_FLOW_ATTR_MAX (__OVS_FLOW_ATTR_MAX - 1)
-
-/**
- * enum ovs_sample_attr - Attributes for %OVS_ACTION_ATTR_SAMPLE action.
- * @OVS_SAMPLE_ATTR_PROBABILITY: 32-bit fraction of packets to sample with
- * @OVS_ACTION_ATTR_SAMPLE.  A value of 0 samples no packets, a value of
- * %UINT32_MAX samples all packets and intermediate values sample intermediate
- * fractions of packets.
- * @OVS_SAMPLE_ATTR_ACTIONS: Set of actions to execute in sampling event.
- * Actions are passed as nested attributes.
- *
- * Executes the specified actions with the given probability on a per-packet
- * basis.
- */
-enum ovs_sample_attr {
-        OVS_SAMPLE_ATTR_UNSPEC,
-        OVS_SAMPLE_ATTR_PROBABILITY, /* u32 number */
-        OVS_SAMPLE_ATTR_ACTIONS,     /* Nested OVS_ACTION_ATTR_* attributes. */
-        __OVS_SAMPLE_ATTR_MAX,
-};
-
-#define OVS_SAMPLE_ATTR_MAX (__OVS_SAMPLE_ATTR_MAX - 1)
-
-/**
- * enum ovs_userspace_attr - Attributes for %OVS_ACTION_ATTR_USERSPACE action.
- * @OVS_USERSPACE_ATTR_PID: u32 Netlink PID to which the %OVS_PACKET_CMD_ACTION
- * message should be sent.  Required.
- * @OVS_USERSPACE_ATTR_USERDATA: If present, its u64 argument is copied to the
- * %OVS_PACKET_CMD_ACTION message as %OVS_PACKET_ATTR_USERDATA,
- */
-enum ovs_userspace_attr {
-        OVS_USERSPACE_ATTR_UNSPEC,
-        OVS_USERSPACE_ATTR_PID,       /* u32 Netlink PID to receive upcalls. */
-        OVS_USERSPACE_ATTR_USERDATA,  /* u64 optional user-specified cookie. */
-        __OVS_USERSPACE_ATTR_MAX
-};
-
-#define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1)
-
-/**
- * struct ovs_action_push_vlan - %OVS_ACTION_ATTR_PUSH_VLAN action argument.
- * @vlan_tpid: Tag protocol identifier (TPID) to push.
- * @vlan_tci: Tag control identifier (TCI) to push.  The CFI bit must be set
- * (but it will not be set in the 802.1Q header that is pushed).
- *
- * The @vlan_tpid value is typically %ETH_P_8021Q.  The only acceptable TPID
- * values are those that the kernel module also parses as 802.1Q headers, to
- * prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN
- * from having surprising results.
- */
-struct ovs_action_push_vlan {
-        __be16 vlan_tpid;       /* 802.1Q TPID. */
-        __be16 vlan_tci;        /* 802.1Q TCI (VLAN ID and priority). */
-};
-
-/**
- * enum ovs_action_attr - Action types.
- *
- * @OVS_ACTION_ATTR_OUTPUT: Output packet to port.
- * @OVS_ACTION_ATTR_USERSPACE: Send packet to userspace according to nested
- * %OVS_USERSPACE_ATTR_* attributes.
- * @OVS_ACTION_ATTR_SET: Replaces the contents of an existing header.  The
- * single nested %OVS_KEY_ATTR_* attribute specifies a header to modify and its
- * value.
- * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the
- * packet.
- * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet.
- * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in
- * the nested %OVS_SAMPLE_ATTR_* attributes.
- *
- * Only a single header can be set with a single %OVS_ACTION_ATTR_SET.  Not all
- * fields within a header are modifiable, e.g. the IPv4 protocol and fragment
- * type may not be changed.
- */
-
-enum ovs_action_attr {
-        OVS_ACTION_ATTR_UNSPEC,
-        OVS_ACTION_ATTR_OUTPUT,       /* u32 port number. */
-        OVS_ACTION_ATTR_USERSPACE,    /* Nested OVS_USERSPACE_ATTR_*. */
-        OVS_ACTION_ATTR_SET,          /* One nested OVS_KEY_ATTR_*. */
-        OVS_ACTION_ATTR_PUSH_VLAN,    /* struct ovs_action_push_vlan. */
-        OVS_ACTION_ATTR_POP_VLAN,     /* No argument. */
-        OVS_ACTION_ATTR_SAMPLE,       /* Nested OVS_SAMPLE_ATTR_*. */
-        __OVS_ACTION_ATTR_MAX
-};
-
-#define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1)
+#include <uapi/linux/openvswitch.h>
 
 #endif /* _LINUX_OPENVSWITCH_H */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index e73dfa308b87..3a24e4ff3248 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1661,6 +1661,7 @@ int pci_enable_sriov(struct pci_dev *dev, int nr_virtfn);
 void pci_disable_sriov(struct pci_dev *dev);
 irqreturn_t pci_sriov_migration(struct pci_dev *dev);
 int pci_num_vf(struct pci_dev *dev);
+int pci_vfs_assigned(struct pci_dev *dev);
 int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs);
 int pci_sriov_get_totalvfs(struct pci_dev *dev);
 #else
@@ -1679,6 +1680,10 @@ static inline int pci_num_vf(struct pci_dev *dev)
 {
         return 0;
 }
+static inline int pci_vfs_assigned(struct pci_dev *dev)
+{
+        return 0;
+}
 static inline int pci_sriov_set_totalvfs(struct pci_dev *dev, u16 numvfs)
 {
         return 0;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 33999adbf8c8..9e11039dd7a3 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -455,6 +455,14 @@ struct phy_driver {
          */
         void (*txtstamp)(struct phy_device *dev, struct sk_buff *skb, int type);
 
+        /* Some devices (e.g. qnap TS-119P II) require PHY register changes to
+         * enable Wake on LAN, so set_wol is provided to be called in the
+         * ethernet driver's set_wol function. */
+        int (*set_wol)(struct phy_device *dev, struct ethtool_wolinfo *wol);
+
+        /* See set_wol, but for checking whether Wake on LAN is enabled. */
+        void (*get_wol)(struct phy_device *dev, struct ethtool_wolinfo *wol);
+
         struct device_driver driver;
 };
 #define to_phy_driver(d) container_of(d, struct phy_driver, driver)
@@ -560,6 +568,8 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable);
 int phy_get_eee_err(struct phy_device *phydev);
 int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data);
 int phy_ethtool_get_eee(struct phy_device *phydev, struct ethtool_eee *data);
+int phy_ethtool_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol);
+void phy_ethtool_get_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol);
 
 int __init mdio_bus_init(void);
 void mdio_bus_exit(void);
diff --git a/include/linux/platform_data/brcmfmac-sdio.h b/include/linux/platform_data/brcmfmac-sdio.h
new file mode 100644
index 000000000000..1ade657d5fc1
--- /dev/null
+++ b/include/linux/platform_data/brcmfmac-sdio.h
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2013 Broadcom Corporation
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef _LINUX_BRCMFMAC_PLATFORM_H
+#define _LINUX_BRCMFMAC_PLATFORM_H
+
+/*
+ * Platform specific driver functions and data. Through the platform specific
+ * device data functions can be provided to help the brcmfmac driver to
+ * operate with the device in combination with the used platform.
+ *
+ * Use the platform data in the following (similar) way:
+ *
+ *
+#include <brcmfmac_platform.h>
+
+
+static void brcmfmac_power_on(void)
+{
+}
+
+static void brcmfmac_power_off(void)
+{
+}
+
+static void brcmfmac_reset(void)
+{
+}
+
+static struct brcmfmac_sdio_platform_data brcmfmac_sdio_pdata = {
+        .power_on               = brcmfmac_power_on,
+        .power_off              = brcmfmac_power_off,
+        .reset                  = brcmfmac_reset
+};
+
+static struct platform_device brcmfmac_device = {
+        .name                   = BRCMFMAC_SDIO_PDATA_NAME,
+        .id                     = PLATFORM_DEVID_NONE,
+        .dev.platform_data      = &brcmfmac_sdio_pdata
+};
+
+void __init brcmfmac_init_pdata(void)
+{
+        brcmfmac_sdio_pdata.oob_irq_supported = true;
+        brcmfmac_sdio_pdata.oob_irq_nr = gpio_to_irq(GPIO_BRCMF_SDIO_OOB);
+        brcmfmac_sdio_pdata.oob_irq_flags = IORESOURCE_IRQ |
+                                            IORESOURCE_IRQ_HIGHLEVEL;
+        platform_device_register(&brcmfmac_device);
+}
+ *
+ *
+ * Note: the brcmfmac can be loaded as module or be statically built-in into
+ * the kernel. If built-in then do note that it uses module_init (and
+ * module_exit) routines which equal device_initcall. So if you intend to
+ * create a module with the platform specific data for the brcmfmac and have
+ * it built-in to the kernel then use a higher initcall then device_initcall
+ * (see init.h). If this is not done then brcmfmac will load without problems
+ * but will not pickup the platform data.
+ *
+ * When the driver does not "detect" platform driver data then it will continue
+ * without reporting anything and just assume there is no data needed. Which is
+ * probably true for most platforms.
+ *
+ * Explanation of the platform_data fields:
+ *
+ * drive_strength: is the preferred drive_strength to be used for the SDIO
+ * pins. If 0 then a default value will be used. This is the target drive
+ * strength, the exact drive strength which will be used depends on the
+ * capabilities of the device.
+ *
+ * oob_irq_supported: does the board have support for OOB interrupts. SDIO
+ * in-band interrupts are relatively slow and for having less overhead on
+ * interrupt processing an out of band interrupt can be used. If the HW
+ * supports this then enable this by setting this field to true and configure
+ * the oob related fields.
+ *
+ * oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are
+ * used for registering the irq using request_irq function.
+ *
+ * power_on: This function is called by the brcmfmac when the module gets
+ * loaded. This can be particularly useful for low power devices. The platform
+ * spcific routine may for example decide to power up the complete device.
+ * If there is no use-case for this function then provide NULL.
+ *
+ * power_off: This function is called by the brcmfmac when the module gets
+ * unloaded. At this point the device can be powered down or otherwise be reset.
+ * So if an actual power_off is not supported but reset is then reset the device
+ * when this function gets called. This can be particularly useful for low power
+ * devices. If there is no use-case for this function (either power-down or
+ * reset) then provide NULL.
+ *
+ * reset: This function can get called if the device communication broke down.
+ * This functionality is particularly useful in case of SDIO type devices. It is
+ * possible to reset a dongle via sdio data interface, but it requires that
+ * this is fully functional. This function is chip/module specific and this
+ * function should return only after the complete reset has completed.
+ */
+
+#define BRCMFMAC_SDIO_PDATA_NAME        "brcmfmac_sdio"
+
+struct brcmfmac_sdio_platform_data {
+        unsigned int drive_strength;
+        bool oob_irq_supported;
+        unsigned int oob_irq_nr;
+        unsigned long oob_irq_flags;
+        void (*power_on)(void);
+        void (*power_off)(void);
+        void (*reset)(void);
+};
+
+#endif /* _LINUX_BRCMFMAC_PLATFORM_H */
diff --git a/include/linux/platform_data/cpsw.h b/include/linux/platform_data/cpsw.h
index 798fb80b024b..bb3cd58d71e3 100644
--- a/include/linux/platform_data/cpsw.h
+++ b/include/linux/platform_data/cpsw.h
@@ -30,7 +30,7 @@ struct cpsw_platform_data {
         u32     channels;       /* number of cpdma channels (symmetric) */
         u32     slaves;         /* number of slave cpgmac ports */
         struct cpsw_slave_data  *slave_data;
-        u32     cpts_active_slave; /* time stamping slave */
+        u32     active_slave; /* time stamping, ethtool and SIOCGMIIPHY slave */
         u32     cpts_clock_mult;  /* convert input clock ticks to nanoseconds */
         u32     cpts_clock_shift; /* convert input clock ticks to nanoseconds */
         u32     ale_entries;    /* ale table size */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 489dd7bb28ec..f28544b2f9af 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -69,6 +69,15 @@ extern int ndo_dflt_fdb_dump(struct sk_buff *skb,
                              struct netlink_callback *cb,
                              struct net_device *dev,
                              int idx);
+extern int ndo_dflt_fdb_add(struct ndmsg *ndm,
+                            struct nlattr *tb[],
+                            struct net_device *dev,
+                            const unsigned char *addr,
+                             u16 flags);
+extern int ndo_dflt_fdb_del(struct ndmsg *ndm,
+                            struct nlattr *tb[],
+                            struct net_device *dev,
+                            const unsigned char *addr);
 
 extern int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
                                    struct net_device *dev, u16 mode);
diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index c11a28706fa4..3bfe8d6ee248 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -53,7 +53,9 @@
 
 #include <linux/in.h>           /* We need in_addr.  */
 #include <linux/in6.h>          /* We need in6_addr.  */
+#include <linux/skbuff.h>
 
+#include <uapi/linux/sctp.h>
 
 /* Section 3.1.  SCTP Common Header Format */
 typedef struct sctphdr {
@@ -63,14 +65,10 @@ typedef struct sctphdr {
         __le32 checksum;
 } __packed sctp_sctphdr_t;
 
-#ifdef __KERNEL__
-#include <linux/skbuff.h>
-
 static inline struct sctphdr *sctp_hdr(const struct sk_buff *skb)
 {
         return (struct sctphdr *)skb_transport_header(skb);
 }
-#endif
 
 /* Section 3.2.  Chunk Field Descriptions. */
 typedef struct sctp_chunkhdr {
diff --git a/include/linux/sh_eth.h b/include/linux/sh_eth.h
index b17d765ded84..fc305713fc6d 100644
--- a/include/linux/sh_eth.h
+++ b/include/linux/sh_eth.h
@@ -6,6 +6,7 @@
 enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN};
 enum {
         SH_ETH_REG_GIGABIT,
+        SH_ETH_REG_FAST_RCAR,
         SH_ETH_REG_FAST_SH4,
         SH_ETH_REG_FAST_SH3_SH2
 };
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index b8292d8cc9fa..2e0ced1af3b1 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 <net/flow_keys.h>
 
 /* Don't change this without changing skb_csum_unnecessary! */
 #define CHECKSUM_NONE 0
@@ -316,6 +317,8 @@ enum {
         SKB_GSO_FCOE = 1 << 5,
 
         SKB_GSO_GRE = 1 << 6,
+
+        SKB_GSO_UDP_TUNNEL = 1 << 7,
 };
 
 #if BITS_PER_LONG > 32
@@ -384,9 +387,11 @@ typedef unsigned char *sk_buff_data_t;
  *      @secmark: security marking
  *      @mark: Generic packet mark
  *      @dropcount: total number of sk_receive_queue overflows
+ *      @vlan_proto: vlan encapsulation protocol
  *      @vlan_tci: vlan tag control information
  *      @inner_transport_header: Inner transport layer header (encapsulation)
  *      @inner_network_header: Network layer header (encapsulation)
+ *      @inner_mac_header: Link layer header (encapsulation)
  *      @transport_header: Transport layer header
  *      @network_header: Network layer header
  *      @mac_header: Link layer header
@@ -461,6 +466,7 @@ struct sk_buff {
 
         __u32                   rxhash;
 
+        __be16                  vlan_proto;
         __u16                   vlan_tci;
 
 #ifdef CONFIG_NET_SCHED
@@ -505,6 +511,7 @@ struct sk_buff {
 
         sk_buff_data_t          inner_transport_header;
         sk_buff_data_t          inner_network_header;
+        sk_buff_data_t          inner_mac_header;
         sk_buff_data_t          transport_header;
         sk_buff_data_t          network_header;
         sk_buff_data_t          mac_header;
@@ -570,7 +577,40 @@ static inline void skb_dst_set(struct sk_buff *skb, struct dst_entry *dst)
         skb->_skb_refdst = (unsigned long)dst;
 }
 
-extern void skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst);
+extern void __skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst,
+                                bool force);
+
+/**
+ * skb_dst_set_noref - sets skb dst, hopefully, without taking reference
+ * @skb: buffer
+ * @dst: dst entry
+ *
+ * Sets skb dst, assuming a reference was not taken on dst.
+ * If dst entry is cached, we do not take reference and dst_release
+ * will be avoided by refdst_drop. If dst entry is not cached, we take
+ * reference, so that last dst_release can destroy the dst immediately.
+ */
+static inline void skb_dst_set_noref(struct sk_buff *skb, struct dst_entry *dst)
+{
+        __skb_dst_set_noref(skb, dst, false);
+}
+
+/**
+ * skb_dst_set_noref_force - sets skb dst, without taking reference
+ * @skb: buffer
+ * @dst: dst entry
+ *
+ * Sets skb dst, assuming a reference was not taken on dst.
+ * No reference is taken and no dst_release will be called. While for
+ * cached dsts deferred reclaim is a basic feature, for entries that are
+ * not cached it is caller's job to guarantee that last dst_release for
+ * provided dst happens when nobody uses it, eg. after a RCU grace period.
+ */
+static inline void skb_dst_set_noref_force(struct sk_buff *skb,
+                                           struct dst_entry *dst)
+{
+        __skb_dst_set_noref(skb, dst, true);
+}
 
 /**
  * skb_dst_is_noref - Test if skb dst isn't refcounted
@@ -611,6 +651,12 @@ static inline struct sk_buff *alloc_skb_fclone(unsigned int size,
         return __alloc_skb(size, priority, SKB_ALLOC_FCLONE, NUMA_NO_NODE);
 }
 
+extern struct sk_buff *__alloc_skb_head(gfp_t priority, int node);
+static inline struct sk_buff *alloc_skb_head(gfp_t priority)
+{
+        return __alloc_skb_head(priority, -1);
+}
+
 extern struct sk_buff *skb_morph(struct sk_buff *dst, struct sk_buff *src);
 extern int skb_copy_ubufs(struct sk_buff *skb, gfp_t gfp_mask);
 extern struct sk_buff *skb_clone(struct sk_buff *skb,
@@ -1471,6 +1517,7 @@ static inline void skb_reserve(struct sk_buff *skb, int len)
 
 static inline void skb_reset_inner_headers(struct sk_buff *skb)
 {
+        skb->inner_mac_header = skb->mac_header;
         skb->inner_network_header = skb->network_header;
         skb->inner_transport_header = skb->transport_header;
 }
@@ -1516,6 +1563,22 @@ static inline void skb_set_inner_network_header(struct sk_buff *skb,
         skb->inner_network_header += offset;
 }
 
+static inline unsigned char *skb_inner_mac_header(const struct sk_buff *skb)
+{
+        return skb->head + skb->inner_mac_header;
+}
+
+static inline void skb_reset_inner_mac_header(struct sk_buff *skb)
+{
+        skb->inner_mac_header = skb->data - skb->head;
+}
+
+static inline void skb_set_inner_mac_header(struct sk_buff *skb,
+                                            const int offset)
+{
+        skb_reset_inner_mac_header(skb);
+        skb->inner_mac_header += offset;
+}
 static inline bool skb_transport_header_was_set(const struct sk_buff *skb)
 {
         return skb->transport_header != ~0U;
@@ -1609,6 +1672,21 @@ static inline void skb_set_inner_network_header(struct sk_buff *skb,
         skb->inner_network_header = skb->data + offset;
 }
 
+static inline unsigned char *skb_inner_mac_header(const struct sk_buff *skb)
+{
+        return skb->inner_mac_header;
+}
+
+static inline void skb_reset_inner_mac_header(struct sk_buff *skb)
+{
+        skb->inner_mac_header = skb->data;
+}
+
+static inline void skb_set_inner_mac_header(struct sk_buff *skb,
+                                                const int offset)
+{
+        skb->inner_mac_header = skb->data + offset;
+}
 static inline bool skb_transport_header_was_set(const struct sk_buff *skb)
 {
         return skb->transport_header != NULL;
@@ -1666,6 +1744,19 @@ static inline void skb_set_mac_header(struct sk_buff *skb, const int offset)
 }
 #endif /* NET_SKBUFF_DATA_USES_OFFSET */
 
+static inline void skb_probe_transport_header(struct sk_buff *skb,
+                                              const int offset_hint)
+{
+        struct flow_keys keys;
+
+        if (skb_transport_header_was_set(skb))
+                return;
+        else if (skb_flow_dissect(skb, &keys))
+                skb_set_transport_header(skb, keys.thoff);
+        else
+                skb_set_transport_header(skb, offset_hint);
+}
+
 static inline void skb_mac_header_rebuild(struct sk_buff *skb)
 {
         if (skb_mac_header_was_set(skb)) {
@@ -2811,6 +2902,8 @@ static inline void skb_checksum_none_assert(const struct sk_buff *skb)
 
 bool skb_partial_csum_set(struct sk_buff *skb, u16 start, u16 off);
 
+u32 __skb_get_poff(const struct sk_buff *skb);
+
 /**
  * skb_head_is_locked - Determine if the skb->head is locked down
  * @skb: skb to check
diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
index e8d702e0fd89..54f91d35e5fd 100644
--- a/include/linux/sock_diag.h
+++ b/include/linux/sock_diag.h
@@ -1,6 +1,7 @@
 #ifndef __SOCK_DIAG_H__
 #define __SOCK_DIAG_H__
 
+#include <linux/user_namespace.h>
 #include <uapi/linux/sock_diag.h>
 
 struct sk_buff;
@@ -22,5 +23,7 @@ int sock_diag_check_cookie(void *sk, __u32 *cookie);
 void sock_diag_save_cookie(void *sk, __u32 *cookie);
 
 int sock_diag_put_meminfo(struct sock *sk, struct sk_buff *skb, int attr);
+int sock_diag_put_filterinfo(struct user_namespace *user_ns, struct sock *sk,
+                             struct sk_buff *skb, int attrtype);
 
 #endif
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 2b9f74b0ffea..428c37a1f95c 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -298,6 +298,7 @@ struct ucred {
 #define SOL_IUCV        277
 #define SOL_CAIF        278
 #define SOL_ALG         279
+#define SOL_NFC         280
 
 /* IPX options */
 #define IPX_TYPE        1
diff --git a/include/linux/spi/at86rf230.h b/include/linux/spi/at86rf230.h
index b2b1afbb3202..aa327a8105ad 100644
--- a/include/linux/spi/at86rf230.h
+++ b/include/linux/spi/at86rf230.h
@@ -26,6 +26,20 @@ struct at86rf230_platform_data {
         int rstn;
         int slp_tr;
         int dig2;
+
+        /* Setting the irq_type will configure the driver to request
+         * the platform irq trigger type according to the given value
+         * and configure the interrupt polarity of the device to the
+         * corresponding polarity.
+         *
+         * Allowed values are: IRQF_TRIGGER_RISING, IRQF_TRIGGER_FALLING,
+         *                     IRQF_TRIGGER_HIGH and IRQF_TRIGGER_LOW
+         *
+         * Setting it to 0, the driver does not touch the trigger type
+         * configuration of the interrupt and sets the interrupt polarity
+         * of the device to high active (the default value).
+         */
+        int irq_type;
 };
 
 #endif
diff --git a/include/linux/ssb/ssb.h b/include/linux/ssb/ssb.h
index 22958d68ecfe..c64999fd1660 100644
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -26,9 +26,9 @@ struct ssb_sprom_core_pwr_info {
 
 struct ssb_sprom {
         u8 revision;
-        u8 il0mac[6];           /* MAC address for 802.11b/g */
-        u8 et0mac[6];           /* MAC address for Ethernet */
-        u8 et1mac[6];           /* MAC address for 802.11a */
+        u8 il0mac[6] __aligned(sizeof(u16));    /* MAC address for 802.11b/g */
+        u8 et0mac[6] __aligned(sizeof(u16));    /* MAC address for Ethernet */
+        u8 et1mac[6] __aligned(sizeof(u16));    /* MAC address for 802.11a */
         u8 et0phyaddr;          /* MII address for enet0 */
         u8 et1phyaddr;          /* MII address for enet1 */
         u8 et0mdcport;          /* MDIO for enet0 */
@@ -340,13 +340,61 @@ enum ssb_bustype {
 #define SSB_BOARDVENDOR_DELL    0x1028  /* Dell */
 #define SSB_BOARDVENDOR_HP      0x0E11  /* HP */
 /* board_type */
+#define SSB_BOARD_BCM94301CB    0x0406
+#define SSB_BOARD_BCM94301MP    0x0407
+#define SSB_BOARD_BU4309        0x040A
+#define SSB_BOARD_BCM94309CB    0x040B
+#define SSB_BOARD_BCM4309MP     0x040C
+#define SSB_BOARD_BU4306        0x0416
 #define SSB_BOARD_BCM94306MP    0x0418
 #define SSB_BOARD_BCM4309G      0x0421
 #define SSB_BOARD_BCM4306CB     0x0417
-#define SSB_BOARD_BCM4309MP     0x040C
+#define SSB_BOARD_BCM94306PC    0x0425  /* pcmcia 3.3v 4306 card */
+#define SSB_BOARD_BCM94306CBSG  0x042B  /* with SiGe PA */
+#define SSB_BOARD_PCSG94306     0x042D  /* with SiGe PA */
+#define SSB_BOARD_BU4704SD      0x042E  /* with sdram */
+#define SSB_BOARD_BCM94704AGR   0x042F  /* dual 11a/11g Router */
+#define SSB_BOARD_BCM94308MP    0x0430  /* 11a-only minipci */
+#define SSB_BOARD_BU4318        0x0447
+#define SSB_BOARD_CB4318        0x0448
+#define SSB_BOARD_MPG4318       0x0449
 #define SSB_BOARD_MP4318        0x044A
-#define SSB_BOARD_BU4306        0x0416
-#define SSB_BOARD_BU4309        0x040A
+#define SSB_BOARD_SD4318        0x044B
+#define SSB_BOARD_BCM94306P     0x044C  /* with SiGe */
+#define SSB_BOARD_BCM94303MP    0x044E
+#define SSB_BOARD_BCM94306MPM   0x0450
+#define SSB_BOARD_BCM94306MPL   0x0453
+#define SSB_BOARD_PC4303        0x0454  /* pcmcia */
+#define SSB_BOARD_BCM94306MPLNA 0x0457
+#define SSB_BOARD_BCM94306MPH   0x045B
+#define SSB_BOARD_BCM94306PCIV  0x045C
+#define SSB_BOARD_BCM94318MPGH  0x0463
+#define SSB_BOARD_BU4311        0x0464
+#define SSB_BOARD_BCM94311MC    0x0465
+#define SSB_BOARD_BCM94311MCAG  0x0466
+/* 4321 boards */
+#define SSB_BOARD_BU4321        0x046B
+#define SSB_BOARD_BU4321E       0x047C
+#define SSB_BOARD_MP4321        0x046C
+#define SSB_BOARD_CB2_4321      0x046D
+#define SSB_BOARD_CB2_4321_AG   0x0066
+#define SSB_BOARD_MC4321        0x046E
+/* 4325 boards */
+#define SSB_BOARD_BCM94325DEVBU 0x0490
+#define SSB_BOARD_BCM94325BGABU 0x0491
+#define SSB_BOARD_BCM94325SDGWB 0x0492
+#define SSB_BOARD_BCM94325SDGMDL        0x04AA
+#define SSB_BOARD_BCM94325SDGMDL2       0x04C6
+#define SSB_BOARD_BCM94325SDGMDL3       0x04C9
+#define SSB_BOARD_BCM94325SDABGWBA      0x04E1
+/* 4322 boards */
+#define SSB_BOARD_BCM94322MC    0x04A4
+#define SSB_BOARD_BCM94322USB   0x04A8  /* dualband */
+#define SSB_BOARD_BCM94322HM    0x04B0
+#define SSB_BOARD_BCM94322USB2D 0x04Bf  /* single band discrete front end */
+/* 4312 boards */
+#define SSB_BOARD_BU4312        0x048A
+#define SSB_BOARD_BCM4312MCGSG  0x04B5
 /* chip_package */
 #define SSB_CHIPPACK_BCM4712S   1       /* Small 200pin 4712 */
 #define SSB_CHIPPACK_BCM4712M   2       /* Medium 225pin 4712 */
diff --git a/include/linux/ssb/ssb_regs.h b/include/linux/ssb/ssb_regs.h
index 6ecfa02ddbac..3a7256955b10 100644
--- a/include/linux/ssb/ssb_regs.h
+++ b/include/linux/ssb/ssb_regs.h
@@ -289,11 +289,11 @@
 #define  SSB_SPROM4_ETHPHY_ET1A_SHIFT   5
 #define  SSB_SPROM4_ETHPHY_ET0M         (1<<14) /* MDIO for enet0 */
 #define  SSB_SPROM4_ETHPHY_ET1M         (1<<15) /* MDIO for enet1 */
-#define SSB_SPROM4_ANTAVAIL             0x005D  /* Antenna available bitfields */
-#define  SSB_SPROM4_ANTAVAIL_A          0x00FF  /* A-PHY bitfield */
-#define  SSB_SPROM4_ANTAVAIL_A_SHIFT    0
-#define  SSB_SPROM4_ANTAVAIL_BG         0xFF00  /* B-PHY and G-PHY bitfield */
-#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT   8
+#define SSB_SPROM4_ANTAVAIL             0x005C  /* Antenna available bitfields */
+#define  SSB_SPROM4_ANTAVAIL_BG         0x00FF  /* B-PHY and G-PHY bitfield */
+#define  SSB_SPROM4_ANTAVAIL_BG_SHIFT   0
+#define  SSB_SPROM4_ANTAVAIL_A          0xFF00  /* A-PHY bitfield */
+#define  SSB_SPROM4_ANTAVAIL_A_SHIFT    8
 #define SSB_SPROM4_AGAIN01              0x005E  /* Antenna Gain (in dBm Q5.2) */
 #define  SSB_SPROM4_AGAIN0              0x00FF  /* Antenna 0 */
 #define  SSB_SPROM4_AGAIN0_SHIFT        0
diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index f28408c07dc2..5adbc33d1ab3 100644
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -90,9 +90,6 @@ struct tcp_options_received {
                 sack_ok : 4,    /* SACK seen on SYN packet              */
                 snd_wscale : 4, /* Window scaling received from sender  */
                 rcv_wscale : 4; /* Window scaling to send to receiver   */
-        u8      cookie_plus:6,  /* bytes in authenticator/cookie option */
-                cookie_out_never:1,
-                cookie_in_always:1;
         u8      num_sacks;      /* Number of SACK blocks                */
         u16     user_mss;       /* mss requested by user in ioctl       */
         u16     mss_clamp;      /* Maximal mss, negotiated at connection setup */
@@ -102,7 +99,6 @@ static inline void tcp_clear_options(struct tcp_options_received *rx_opt)
 {
         rx_opt->tstamp_ok = rx_opt->sack_ok = 0;
         rx_opt->wscale_ok = rx_opt->snd_wscale = 0;
-        rx_opt->cookie_plus = 0;
 }
 
 /* This is the max number of SACKS that we'll generate and process. It's safe
@@ -191,20 +187,19 @@ struct tcp_sock {
         u32     window_clamp;   /* Maximal window to advertise          */
         u32     rcv_ssthresh;   /* Current window clamp                 */
 
-        u32     frto_highmark;  /* snd_nxt when RTO occurred */
         u16     advmss;         /* Advertised MSS                       */
-        u8      frto_counter;   /* Number of new acks after RTO */
+        u8      unused;
         u8      nonagle     : 4,/* Disable Nagle algorithm?             */
                 thin_lto    : 1,/* Use linear timeouts for thin streams */
                 thin_dupack : 1,/* Fast retransmit on first dupack      */
                 repair      : 1,
-                unused      : 1;
+                frto        : 1;/* F-RTO (RFC5682) activated in CA_Loss */
         u8      repair_queue;
         u8      do_early_retrans:1,/* Enable RFC5827 early-retransmit  */
-                early_retrans_delayed:1, /* Delayed ER timer installed */
                 syn_data:1,     /* SYN includes data */
                 syn_fastopen:1, /* SYN includes Fast Open option */
                 syn_data_acked:1;/* data in SYN is acked by SYN-ACK */
+        u32     tlp_high_seq;   /* snd_nxt at the time of TLP retransmit. */
 
 /* RTT measurement */
         u32     srtt;           /* smoothed round trip time << 3        */
@@ -320,12 +315,6 @@ struct tcp_sock {
         struct tcp_md5sig_info  __rcu *md5sig_info;
 #endif
 
-        /* When the cookie options are generated and exchanged, then this
-         * object holds a reference to them (cookie_values->kref).  Also
-         * contains related tcp_cookie_transactions fields.
-         */
-        struct tcp_cookie_values  *cookie_values;
-
 /* TCP fastopen related information */
         struct tcp_fastopen_request *fastopen_req;
         /* fastopen_rsk points to request_sock that resulted in this big
@@ -361,10 +350,6 @@ struct tcp_timewait_sock {
 #ifdef CONFIG_TCP_MD5SIG
         struct tcp_md5sig_key     *tw_md5_key;
 #endif
-        /* Few sockets in timewait have cookies; in that case, then this
-         * object holds a reference to them (tw_cookie_values->kref).
-         */
-        struct tcp_cookie_values  *tw_cookie_values;
 };
 
 static inline struct tcp_timewait_sock *tcp_twsk(const struct sock *sk)
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index 0e5ac93bab10..da46327fca17 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
@@ -72,6 +72,7 @@ struct usbnet {
 #               define EVENT_DEVICE_REPORT_IDLE 8
 #               define EVENT_NO_RUNTIME_PM      9
 #               define EVENT_RX_KILL    10
+#               define EVENT_LINK_CHANGE        11
 };
 
 static inline struct usb_driver *driver_of(struct usb_interface *intf)
@@ -245,5 +246,6 @@ extern void usbnet_get_drvinfo(struct net_device *, struct ethtool_drvinfo *);
 extern int usbnet_nway_reset(struct net_device *net);
 
 extern int usbnet_manage_power(struct usbnet *, int);
+extern void usbnet_link_change(struct usbnet *, bool, bool);
 
 #endif /* __LINUX_USB_USBNET_H */
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index ff6714e6d0f5..2d7a5e045908 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -58,12 +58,6 @@ void *virtqueue_detach_unused_buf(struct virtqueue *vq);
 
 unsigned int virtqueue_get_vring_size(struct virtqueue *vq);
 
-/* FIXME: Obsolete accessor, but required for virtio_net merge. */
-static inline unsigned int virtqueue_get_queue_index(struct virtqueue *vq)
-{
-        return vq->index;
-}
-
 /**
  * virtio_device - representation of a device using virtio
  * @index: unique position on the virtio bus
diff --git a/include/linux/vm_sockets.h b/include/linux/vm_sockets.h
new file mode 100644
index 000000000000..0805eecba8f7
--- /dev/null
+++ b/include/linux/vm_sockets.h
@@ -0,0 +1,23 @@
+/*
+ * VMware vSockets Driver
+ *
+ * Copyright (C) 2007-2013 VMware, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation version 2 and no later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#ifndef _VM_SOCKETS_H
+#define _VM_SOCKETS_H
+
+#include <uapi/linux/vm_sockets.h>
+
+int vm_sockets_get_local_cid(void);
+
+#endif /* _VM_SOCKETS_H */