1. 22 Aug, 2021 37 commits
  2. 20 Aug, 2021 3 commits
    • Jakub Kicinski's avatar
      Merge tag 'mac80211-next-for-net-next-2021-08-20' of... · 4af14dba
      Jakub Kicinski authored
      Merge tag 'mac80211-next-for-net-next-2021-08-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
      
      Johannes Berg says:
      
      ====================
      Minor updates:
       * BSS coloring support
       * MEI commands for Intel platforms
       * various fixes/cleanups
      
      * tag 'mac80211-next-for-net-next-2021-08-20' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next:
        cfg80211: fix BSS color notify trace enum confusion
        mac80211: Fix insufficient headroom issue for AMSDU
        mac80211: add support for BSS color change
        nl80211: add support for BSS coloring
        mac80211: Use flex-array for radiotap header bitmap
        mac80211: radiotap: Use BIT() instead of shifts
        mac80211: Remove unnecessary variable and label
        mac80211: include <linux/rbtree.h>
        mac80211: Fix monitor MTU limit so that A-MSDUs get through
        mac80211: remove unnecessary NULL check in ieee80211_register_hw()
        mac80211: Reject zero MAC address in sta_info_insert_check()
        nl80211: vendor-cmd: add Intel vendor commands for iwlmei usage
      ====================
      
      Link: https://lore.kernel.org/r/20210820105329.48674-1-johannes@sipsolutions.netSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      4af14dba
    • David S. Miller's avatar
      Merge branch 'bridge-vlan' · 0ba218e2
      David S. Miller authored
      Nikolay Aleksandrov says:
      
      ====================
      net: bridge: mcast: add support for port/vlan router control
      
      This small set adds control over port/vlan mcast router config.
      Initially I had added host vlan entry router control via vlan's global
      options but that is really unnecessary and we can use a single per-vlan
      option to control it both for port/vlan and host/vlan entries. Since
      it's all still in net-next we can convert BRIDGE_VLANDB_GOPTS_MCAST_ROUTER
      to BRIDGE_VLANDB_ENTRY_MCAST_ROUTER and use it for both. That makes much
      more sense and is easier for user-space. Patch 01 prepares the port
      router function to be used with port mcast context instead of port and
      then patch 02 converts the global vlan mcast router option to per-vlan
      mcast router option which directly gives us both host/vlan and port/vlan
      mcast router control without any additional changes.
      
      This way we get the following coherent syntax:
       [ port/vlan mcast router]
       $ bridge vlan set vid 100 dev ens20 mcast_router 2
      
       [ bridge/vlan mcast router ]
       $ bridge vlan set vid 100 dev bridge mcast_router 2
      instead of:
       $ bridge vlan set vid 100 dev bridge mcast_router 1 global
      
      The mcast_router should not be regarded as a global option, it controls
      the port/vlan and bridge/vlan mcast router behaviour.
      
      This is the last set needed for the initial per-vlan mcast support.
      Next patch-sets:
       - iproute2 support
       - selftests
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0ba218e2
    • Nikolay Aleksandrov's avatar
      net: bridge: vlan: convert mcast router global option to per-vlan entry · 2796d846
      Nikolay Aleksandrov authored
      The per-vlan router option controls the port/vlan and host vlan entries'
      mcast router config. The global option controlled only the host vlan
      config, but that is unnecessary and incosistent as it's not really a
      global vlan option, but rather bridge option to control host router
      config, so convert BRIDGE_VLANDB_GOPTS_MCAST_ROUTER to
      BRIDGE_VLANDB_ENTRY_MCAST_ROUTER which can be used to control both host
      vlan and port vlan mcast router config.
      Signed-off-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2796d846