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

Pull networking updates from David Miller:
 "Highlights:

   1) Support more Realtek wireless chips, from Jes Sorenson.

   2) New BPF types for per-cpu hash and arrap maps, from Alexei
      Starovoitov.

   3) Make several TCP sysctls per-namespace, from Nikolay Borisov.

   4) Allow the use of SO_REUSEPORT in order to do per-thread processing
   of incoming TCP/UDP connections.  The muxing can be done using a
   BPF program which hashes the incoming packet.  From Craig Gallek.

   5) Add a multiplexer for TCP streams, to provide a messaged based
      interface.  BPF programs can be used to determine the message
      boundaries.  From Tom Herbert.

   6) Add 802.1AE MACSEC support, from Sabrina Dubroca.

   7) Avoid factorial complexity when taking down an inetdev interface
      with lots of configured addresses.  We were doing things like
      traversing the entire address less for each address removed, and
      flushing the entire netfilter conntrack table for every address as
      well.

   8) Add and use SKB bulk free infrastructure, from Jesper Brouer.

   9) Allow offloading u32 classifiers to hardware, and implement for
      ixgbe, from John Fastabend.

  10) Allow configuring IRQ coalescing parameters on a per-queue basis,
      from Kan Liang.

  11) Extend ethtool so that larger link mode masks can be supported.
      From David Decotigny.

  12) Introduce devlink, which can be used to configure port link types
      (ethernet vs Infiniband, etc.), port splitting, and switch device
      level attributes as a whole.  From Jiri Pirko.

  13) Hardware offload support for flower classifiers, from Amir Vadai.

  14) Add "Local Checksum Offload".  Basically, for a tunneled packet
      the checksum of the outer header is 'constant' (because with the
      checksum field filled into the inner protocol header, the payload
      of the outer frame checksums to 'zero'), and we can take advantage
      of that in various ways.  From Edward Cree"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1548 commits)
  bonding: fix bond_get_stats()
  net: bcmgenet: fix dma api length mismatch
  net/mlx4_core: Fix backward compatibility on VFs
  phy: mdio-thunder: Fix some Kconfig typos
  lan78xx: add ndo_get_stats64
  lan78xx: handle statistics counter rollover
  RDS: TCP: Remove unused constant
  RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket
  net: smc911x: convert pxa dma to dmaengine
  team: remove duplicate set of flag IFF_MULTICAST
  bonding: remove duplicate set of flag IFF_MULTICAST
  net: fix a comment typo
  ethernet: micrel: fix some error codes
  ip_tunnels, bpf: define IP_TUNNEL_OPTS_MAX and use it
  bpf, dst: add and use dst_tclassid helper
  bpf: make skb->tc_classid also readable
  net: mvneta: bm: clarify dependencies
  cls_bpf: reset class and reuse major in da
  ldmvsw: Checkpatch sunvnet.c and sunvnet_common.c
  ldmvsw: Add ldmvsw.c driver code
  ...

diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/armada-xp-db.dts
index ebe1d267406df5ab30e3a3189b669733eb8fcaa4,30657302305d737375014d9ff363b3a67d54f2bd..cca366590561077b2fd5aeeb358c97eced2bfa66
--- 1/arch/arm/boot/dts/armada-xp-db.dts
--- 2/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@@ -76,8 -76,9 +76,9 @@@
                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
 -                        MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
 -                        MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
 +                        MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
++                        MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                         MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
  
                devbus-bootcs {
                        status = "okay";

diff --cc arch/arm/boot/dts/armada-xp-gp.dts
index 5730b875c4f51a1aa2743d8881b18d6dbc0b27cd,a1ded01d0c0762da87f81c27c14e1377811e2d3f..061f4237760e7c917d11056b97b5971bcd4680b5
--- 1/arch/arm/boot/dts/armada-xp-gp.dts
--- 2/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@@ -95,8 -95,9 +95,9 @@@
                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
 -                        MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
 -                        MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
 +                        MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
++                        MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                         MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
  
                devbus-bootcs {
                        status = "okay";

diff --cc arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 853bd392a4fe20155ed1469a23175213814ca9dc,3aa29a91c7b8c5b4b17af8fe1fecae2cf04e3c8b..ed3b889d16ce439a4e933cdcd17ff37ed6adc4c4
--- 1/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
--- 2/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@@ -65,9 -65,10 +65,10 @@@
        soc {
                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
 -                        MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000
 -                        MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
 -                        MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000
 +                        MBUS_ID(0x01, 0x2f) 0 0 0xe8000000 0x8000000
 +                        MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
-                         MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000>;
++                        MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
+                         MBUS_ID(0x0c, 0x04) 0 0 0xd1200000 0x100000>;
  
                devbus-bootcs {
                        status = "okay";

diff --cc arch/arm64/boot/dts/apm/apm-storm.dtsi
Simple merge

diff --cc arch/tile/configs/tilegx_defconfig
Simple merge

diff --cc arch/tile/configs/tilepro_defconfig
Simple merge

diff --cc arch/x86/events/core.c
Simple merge

diff --cc arch/x86/kernel/dumpstack.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

diff --cc drivers/infiniband/hw/mlx5/main.c
Simple merge

diff --cc drivers/net/ethernet/freescale/gianfar.c
Simple merge

diff --cc drivers/net/ethernet/intel/fm10k/fm10k_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
index bf3446794bd5f5d3eb05229d3e57fdb10ed3f046,e848d708d2b733caf9edc9a0f0f0f1cdd60ad688..5121be4675d14de3ea8f7722434945caeb307eb9
--- 1/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
@@@ -73,13 -73,10 +73,13 @@@
  #define BY_PASS_MIN_LEVEL (KENREL_MIN_LEVEL + MLX5_BY_PASS_NUM_PRIOS +\
                           LEFTOVERS_MAX_FT)
  
- #define KERNEL_MAX_FT 2
- #define KERNEL_NUM_PRIOS 1
+ #define KERNEL_MAX_FT 3
+ #define KERNEL_NUM_PRIOS 2
  #define KENREL_MIN_LEVEL 2
  
 +#define ANCHOR_MAX_FT 1
 +#define ANCHOR_NUM_PRIOS 1
 +#define ANCHOR_MIN_LEVEL (BY_PASS_MIN_LEVEL + 1)
  struct node_caps {
        size_t  arr_sz;
        long    *caps;
@@@ -367,13 -360,8 +367,13 @@@ static void del_rule(struct fs_node *no
        memcpy(match_value, fte->val, sizeof(fte->val));
        fs_get_obj(ft, fg->node.parent);
        list_del(&rule->node.list);
-       fte->dests_size--;
-       if (fte->dests_size) {
 +      if (rule->sw_action == MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO) {
 +              mutex_lock(&rule->dest_attr.ft->lock);
 +              list_del(&rule->next_ft);
 +              mutex_unlock(&rule->dest_attr.ft->lock);
 +      }
+       if ((fte->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) &&
+           --fte->dests_size) {
                err = mlx5_cmd_update_fte(dev, ft,
                                          fg->id, fte);
                if (err)
@@@ -835,9 -762,9 +835,10 @@@ static struct mlx5_flow_rule *alloc_rul
        if (!rule)
                return NULL;
  
 +      INIT_LIST_HEAD(&rule->next_ft);
        rule->node.type = FS_TYPE_FLOW_DEST;
-       memcpy(&rule->dest_attr, dest, sizeof(*dest));
+       if (dest)
+               memcpy(&rule->dest_attr, dest, sizeof(*dest));
  
        return rule;
  }
@@@ -856,16 -783,12 +857,17 @@@ static struct mlx5_flow_rule *add_rule_
                return ERR_PTR(-ENOMEM);
  
        fs_get_obj(ft, fg->node.parent);
 -      /* Add dest to dests list- added as first element after the head */
 +      /* Add dest to dests list- we need flow tables to be in the
 +       * end of the list for forward to next prio rules.
 +       */
        tree_init_node(&rule->node, 1, del_rule);
 -      list_add_tail(&rule->node.list, &fte->node.children);
 +      if (dest && dest->type != MLX5_FLOW_DESTINATION_TYPE_FLOW_TABLE)
 +              list_add(&rule->node.list, &fte->node.children);
 +      else
 +              list_add_tail(&rule->node.list, &fte->node.children);
-       fte->dests_size++;
-       if (fte->dests_size == 1)
+       if (dest)
+               fte->dests_size++;
+       if (fte->dests_size == 1 || !dest)
                err = mlx5_cmd_create_fte(get_dev(&ft->node),
                                          ft, fg->id, fte);
        else

diff --cc drivers/net/ethernet/mellanox/mlx5/core/main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/port.c
Simple merge

diff --cc drivers/net/wireless/marvell/mwifiex/debugfs.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/mlx5/device.h
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge

diff --cc include/linux/perf_event.h
Simple merge

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc include/uapi/linux/Kbuild
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/ipv4/syncookies.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv4/tcp_fastopen.c
Simple merge

diff --cc net/ipv4/tcp_ipv4.c
Simple merge

diff --cc net/ipv6/syncookies.c
Simple merge

diff --cc net/ipv6/tcp_ipv6.c
Simple merge

diff --cc net/rxrpc/ar-internal.h
Simple merge

diff --cc net/rxrpc/rxkad.c
index 0d96b48a64925840cfc2249e928ebdde51ac00a8,3106a0c4960be7db6e726ab70bf1ed6b891b9c2f..f0aeb8163688e6f4167874d9a6ac0f3bd270891d
--- 1/net/rxrpc/rxkad.c
--- 2/net/rxrpc/rxkad.c
+++ b/net/rxrpc/rxkad.c
@@@ -128,23 -128,21 +128,23 @@@ static void rxkad_prime_packet_security
        token = conn->key->payload.data[0];
        memcpy(&iv, token->kad->session_key, sizeof(iv));
  
-       tmpbuf.x[0] = conn->epoch;
-       tmpbuf.x[1] = conn->cid;
 -      desc.tfm = conn->cipher;
 -      desc.info = iv.x;
 -      desc.flags = 0;
 -
+       tmpbuf.x[0] = htonl(conn->epoch);
+       tmpbuf.x[1] = htonl(conn->cid);
        tmpbuf.x[2] = 0;
        tmpbuf.x[3] = htonl(conn->security_ix);
  
        sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
        sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
 -      crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
 +
 +      skcipher_request_set_tfm(req, conn->cipher);
 +      skcipher_request_set_callback(req, 0, NULL, NULL);
 +      skcipher_request_set_crypt(req, &sg[1], &sg[0], sizeof(tmpbuf), iv.x);
 +
 +      crypto_skcipher_encrypt(req);
 +      skcipher_request_zero(req);
  
        memcpy(&conn->csum_iv, &tmpbuf.x[2], sizeof(conn->csum_iv));
-       ASSERTCMP(conn->csum_iv.n[0], ==, tmpbuf.x[2]);
+       ASSERTCMP((u32 __force)conn->csum_iv.n[0], ==, (u32 __force)tmpbuf.x[2]);
  
        _leave("");
  }
@@@ -267,12 -251,12 +267,12 @@@ out
   * checksum an RxRPC packet header
   */
  static int rxkad_secure_packet(const struct rxrpc_call *call,
-                               struct sk_buff *skb,
-                               size_t data_size,
-                               void *sechdr)
+                              struct sk_buff *skb,
+                              size_t data_size,
+                              void *sechdr)
  {
        struct rxrpc_skb_priv *sp;
 -      struct blkcipher_desc desc;
 +      SKCIPHER_REQUEST_ON_STACK(req, call->conn->cipher);
        struct rxrpc_crypt iv;
        struct scatterlist sg[2];
        struct {
@@@ -297,12 -280,15 +296,12 @@@
  
        /* continue encrypting from where we left off */
        memcpy(&iv, call->conn->csum_iv.x, sizeof(iv));
 -      desc.tfm = call->conn->cipher;
 -      desc.info = iv.x;
 -      desc.flags = 0;
  
        /* calculate the security checksum */
-       x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
-       x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
-       tmpbuf.x[0] = sp->hdr.callNumber;
-       tmpbuf.x[1] = x;
+       x = call->channel << (32 - RXRPC_CIDSHIFT);
+       x |= sp->hdr.seq & 0x3fffffff;
+       tmpbuf.x[0] = htonl(sp->hdr.callNumber);
+       tmpbuf.x[1] = htonl(x);
  
        sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
        sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
@@@ -539,29 -513,25 +536,28 @@@ static int rxkad_verify_packet(const st
  
        /* continue encrypting from where we left off */
        memcpy(&iv, call->conn->csum_iv.x, sizeof(iv));
 -      desc.tfm = call->conn->cipher;
 -      desc.info = iv.x;
 -      desc.flags = 0;
  
        /* validate the security checksum */
-       x = htonl(call->channel << (32 - RXRPC_CIDSHIFT));
-       x |= sp->hdr.seq & cpu_to_be32(0x3fffffff);
-       tmpbuf.x[0] = call->call_id;
-       tmpbuf.x[1] = x;
+       x = call->channel << (32 - RXRPC_CIDSHIFT);
+       x |= sp->hdr.seq & 0x3fffffff;
+       tmpbuf.x[0] = htonl(call->call_id);
+       tmpbuf.x[1] = htonl(x);
  
        sg_init_one(&sg[0], &tmpbuf, sizeof(tmpbuf));
        sg_init_one(&sg[1], &tmpbuf, sizeof(tmpbuf));
 -      crypto_blkcipher_encrypt_iv(&desc, &sg[0], &sg[1], sizeof(tmpbuf));
 +
 +      skcipher_request_set_tfm(req, call->conn->cipher);
 +      skcipher_request_set_callback(req, 0, NULL, NULL);
 +      skcipher_request_set_crypt(req, &sg[1], &sg[0], sizeof(tmpbuf), iv.x);
 +
 +      crypto_skcipher_encrypt(req);
 +      skcipher_request_zero(req);
  
        y = ntohl(tmpbuf.x[1]);
-       y = (y >> 16) & 0xffff;
-       if (y == 0)
-               y = 1; /* zero checksums are not permitted */
+       cksum = (y >> 16) & 0xffff;
+       if (cksum == 0)
+               cksum = 1; /* zero checksums are not permitted */
  
-       cksum = htons(y);
        if (sp->hdr.cksum != cksum) {
                *_abort_code = RXKADSEALEDINCON;
                _leave(" = -EPROTO [csum failed]");

diff --cc net/sctp/sm_make_chunk.c
Simple merge

diff --cc net/sctp/socket.c
Simple merge