1. 31 May, 2020 12 commits
  2. 30 May, 2020 23 commits
  3. 29 May, 2020 5 commits
    • YueHaibing's avatar
      tipc: remove set but not used variable 'prev' · 8298a419
      YueHaibing authored
      Fixes gcc '-Wunused-but-set-variable' warning:
      
      net/tipc/msg.c: In function 'tipc_msg_append':
      net/tipc/msg.c:215:24: warning:
       variable 'prev' set but not used [-Wunused-but-set-variable]
      
      commit 0a3e060f ("tipc: add test for Nagle algorithm effectiveness")
      left behind this, remove it.
      Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8298a419
    • Vladimir Oltean's avatar
      net: dsa: sja1105: avoid invalid state in sja1105_vlan_filtering · aef31718
      Vladimir Oltean authored
      Be there 2 switches spi/spi2.0 and spi/spi2.1 in a cross-chip setup,
      both under the same VLAN-filtering bridge, both in the
      SJA1105_VLAN_BEST_EFFORT state.
      
      If we try to change the VLAN state of one of the switches (to
      SJA1105_VLAN_FILTERING_FULL) we get the following error:
      
      devlink dev param set spi/spi2.1 name best_effort_vlan_filtering value
      false cmode runtime
      [   38.325683] sja1105 spi2.1: Not allowed to overcommit frame memory.
                     L2 memory partitions and VL memory partitions share the
                     same space. The sum of all 16 memory partitions is not
                     allowed to be larger than 929 128-byte blocks (or 910
                     with retagging). Please adjust
                     l2-forwarding-parameters-table.part_spc and/or
                     vl-forwarding-parameters-table.partspc.
      [   38.356803] sja1105 spi2.1: Invalid config, cannot upload
      
      This is because the spi/spi2.1 switch doesn't support tagging anymore in
      the SJA1105_VLAN_FILTERING_FULL state, so it doesn't need to have any
      retagging rules defined. Great, so it can use more frame memory
      (retagging consumes extra memory).
      
      But the built-in low-level static config checker from the sja1105 driver
      says "not so fast, you've increased the frame memory to non-retagging
      values, but you still kept the retagging rules in the static config".
      
      So we need to rebuild the VLAN table immediately before re-uploading the
      static config, operation which will take care, based on the new VLAN
      state, of removing the retagging rules.
      
      Fixes: 3f01c91a ("net: dsa: sja1105: implement VLAN retagging for dsa_8021q sub-VLANs")
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      aef31718
    • Vladimir Oltean's avatar
      net: dsa: tag_8021q: stop restoring VLANs from bridge · 04198499
      Vladimir Oltean authored
      Right now, our only tag_8021q user, sja1105, has the ability to restore
      bridge VLANs on its own, so this logic is unnecessary.
      Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      04198499
    • Saeed Mahameed's avatar
      Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux · 971ae1ed
      Saeed Mahameed authored
        net/mlx5: Add ability to read and write ECE options
        net/mlx5: Add support for RDMA TX FT headers modifying
        net/mlx5: Move iseg access helper routines close to mlx5_core driver
        net/mlx5: Cleanup mlx5_ifc_fte_match_set_misc2_bits
        net/mlx5: Add support in forward to namespace
        {IB/net}/mlx5: Simplify don't trap code
        net/mlx5: Replace zero-length array with flexible-array
      Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
      971ae1ed
    • David S. Miller's avatar
      Merge branch 'remove-kernel_setsockopt-v4' · c223c7f2
      David S. Miller authored
      Christoph Hellwig says:
      
      ====================
      remove kernel_setsockopt v4
      
      now that only the dlm calls to sctp are left for kernel_setsockopt,
      while we haven't really made much progress with the sctp setsockopt
      refactoring, how about this small series that splits out a
      sctp_setsockopt_bindx_kernel that takes a kernel space address array
      to share more code as requested by Marcelo.  This should fit in with
      whatever variant of the refator of sctp setsockopt we go with, but
      just solved the immediate problem for now.
      
      Changes since v3:
       - dropped all the merged patches, just sctp setsockopt left now
       - factor out a new sctp_setsockopt_bindx_kernel helper instead of
         duplicating a small amount of logic
      
      Changes since v2:
       - drop the separately merged kernel_getopt_removal
       - drop the sctp patches, as there is conflicting cleanup going on
       - add an additional ACK for the rxrpc changes
      
      Changes since v1:
       - use ->getname for sctp sockets in dlm
       - add a new ->bind_add struct proto method for dlm/sctp
       - switch the ipv6 and remaining sctp helpers to inline function so that
         the ipv6 and sctp modules are not pulled in by any module that could
         potentially use ipv6 or sctp connections
       - remove arguments to various sock_* helpers that are always used with
         the same constant arguments
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c223c7f2