1. 12 Dec, 2020 2 commits
    • Jakub Kicinski's avatar
      Merge tag 'mac80211-next-for-net-next-2020-12-11' of... · 00f7763a
      Jakub Kicinski authored
      Merge tag 'mac80211-next-for-net-next-2020-12-11' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
      
      Johannes Berg says:
      
      ====================
      A new set of wireless changes:
       * validate key indices for key deletion
       * more preamble support in mac80211
       * various 6 GHz scan fixes/improvements
       * a common SAR power limitations API
       * various small fixes & code improvements
      
      * tag 'mac80211-next-for-net-next-2020-12-11' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next: (35 commits)
        mac80211: add ieee80211_set_sar_specs
        nl80211: add common API to configure SAR power limitations
        mac80211: fix a mistake check for rx_stats update
        mac80211: mlme: save ssid info to ieee80211_bss_conf while assoc
        mac80211: Update rate control on channel change
        mac80211: don't filter out beacons once we start CSA
        mac80211: Fix calculation of minimal channel width
        mac80211: ignore country element TX power on 6 GHz
        mac80211: use bitfield helpers for BA session action frames
        mac80211: support Rx timestamp calculation for all preamble types
        mac80211: don't set set TDLS STA bandwidth wider than possible
        mac80211: support driver-based disconnect with reconnect hint
        cfg80211: support immediate reconnect request hint
        mac80211: use struct assignment for he_obss_pd
        cfg80211: remove struct ieee80211_he_bss_color
        nl80211: validate key indexes for cfg80211_registered_device
        cfg80211: include block-tx flag in channel switch started event
        mac80211: disallow band-switch during CSA
        ieee80211: update reduced neighbor report TBTT info length
        cfg80211: Save the regulatory domain when setting custom regulatory
        ...
      ====================
      
      Link: https://lore.kernel.org/r/20201211142552.209018-1-johannes@sipsolutions.netSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      00f7763a
    • Jakub Kicinski's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 46d5e62d
      Jakub Kicinski authored
      xdp_return_frame_bulk() needs to pass a xdp_buff
      to __xdp_return().
      
      strlcpy got converted to strscpy but here it makes no
      functional difference, so just keep the right code.
      
      Conflicts:
      	net/netfilter/nf_tables_api.c
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      46d5e62d
  2. 11 Dec, 2020 38 commits