staging: rtl8723bs, wilc1000: update management frame registration API
PATCH 1/1 staging: rtl8723bs, wilc1000: update management frame registration API
From: Sergey Matyukevich <[email protected]>
Management frame registration API has been updated in wireless core and all the wireless drivers. Update staging wireless drivers as well.
Fixes 6cd536fe62ef ("cfg80211: change internal management frame registration API")
Signed-off-by Sergey Matyukevich <[email protected]>
--- .../rtl8723bs/include/ioctl_cfg80211.h | 1 + .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 21 ++++--- drivers/staging/wilc1000/cfg80211.c | 57 ++++++++++++------- drivers/staging/wilc1000/netdev.c | 35 +++++++----- drivers/staging/wilc1000/netdev.h | 1 + 5 files changed, 73 insertions(+), 42 deletions(-)
drivers/staging/rtl8723bs/include/ioctl_cfg80211.h +1 -0
@@ -83,6 +83,7 @@ struct rtw_wdev_privu8 bandroid_scan;bool block;bool power_mgmt; +u32 mgmt_mask; };#define wiphy_to_adapter (x) (*((struct adapter **)wiphy_priv(x)))
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +14 -7
@@ -3163,25 +3163,31 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,return ret; } -static void cfg80211_rtw_mgmt_frame_register (struct wiphy *wiphy, -struct wireless_dev *wdev, -u16 frame_type,bool reg) +static void cfg80211_rtw_update_mgmt_frame_register (struct wiphy *wiphy, +struct wireless_dev *wdev, +struct mgmt_frame_regs *upd) + { +u32 rtw_mask =BIT (IEEE80211_STYPE_PROBE_REQ >>4 );struct net_device *ndev =wdev_to_ndev (wdev); +struct rtw_wdev_priv *wd;struct adapter *adapter;if (ndev ==NULL ) goto exit; adapter = (struct adapter *)rtw_netdev_priv (ndev); + wd =adapter_wdev_data (adapter);#ifdef DEBUG_CFG80211 -DBG_871X (FUNC_ADPT_FMT " frame_type:%x, reg:%d\n" ,FUNC_ADPT_ARG (adapter), - frame_type, reg); +DBG_871X (FUNC_ADPT_FMT " old_regs:%x new_regs:%x\n" , +FUNC_ADPT_ARG (adapter), wd->mgmt_mask, upd->interface_stypes);#endif -if (frame_type != (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_PROBE_REQ )) +if ((upd->interface_stypes & rtw_mask) == (wd->mgmt_mask & rtw_mask))return ; + + wd->mgmt_mask = upd->interface_stypes; exit:return ; }
@@ -3397,7 +3403,8 @@ static struct cfg80211_ops rtw_cfg80211_ops = { .change_bss = cfg80211_rtw_change_bss, .mgmt_tx = cfg80211_rtw_mgmt_tx, - .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register, + .update_mgmt_frame_registrations = + cfg80211_rtw_update_mgmt_frame_register,#if defined(CONFIG_PNO_SUPPORT ) .sched_scan_start = cfg80211_rtw_sched_scan_start,
drivers/staging/wilc1000/cfg80211.c +37 -20
77 lines not on this page · raw message
drivers/staging/wilc1000/netdev.c +20 -15
@@ -570,6 +570,7 @@ static int wilc_mac_open(struct net_device *ndev)struct wilc_vif *vif =netdev_priv (ndev);struct wilc *wl = vif->wilc;unsigned char mac_add[ETH_ALEN ] = {0 }; +unsigned int i;int ret =0 ;if (!wl || !wl->dev) {
@@ -602,14 +603,12 @@ static int wilc_mac_open(struct net_device *ndev)return -EINVAL ; } -wilc_mgmt_frame_register (vif->ndev->ieee80211_ptr->wiphy, - vif->ndev->ieee80211_ptr, - vif->frame_reg[0 ].type, - vif->frame_reg[0 ].reg); -wilc_mgmt_frame_register (vif->ndev->ieee80211_ptr->wiphy, - vif->ndev->ieee80211_ptr, - vif->frame_reg[1 ].type, - vif->frame_reg[1 ].reg); +for (i =0 ; i <NUM_REG_FRAME ; i++) { +if (wl->initialized && vif->frame_reg[i].type) +wilc_frame_register (vif, vif->frame_reg[i].type, + vif->frame_reg[i].reg); + } +netif_wake_queue (ndev); wl->open_ifcs++; vif->mac_opened =1 ;
@@ -786,19 +785,25 @@ void wilc_frmw_to_host(struct wilc *wilc, u8 *buff, u32 size,void wilc_wfi_mgmt_rx (struct wilc *wilc,u8 *buff,u32 size) { -int srcu_idx;struct wilc_vif *vif; +struct frame_reg *fr; +unsigned int i; +int srcu_idx; srcu_idx =srcu_read_lock (&wilc->srcu);list_for_each_entry_rcu (vif, &wilc->vif_list, list) {u16 type =le16_to_cpup ((__le16 *)buff); -if (vif->priv.p2p_listen_state && - ((type == vif->frame_reg[0 ].type && - vif->frame_reg[0 ].reg) || - (type == vif->frame_reg[1 ].type && - vif->frame_reg[1 ].reg))) -wilc_wfi_p2p_rx (vif, buff, size); +if (vif->priv.p2p_listen_state) { +for (i =0 ; i <NUM_REG_FRAME ; i++) { + fr = &vif->frame_reg[i]; + +if (fr->type && fr->reg && type == fr->type) { +wilc_wfi_p2p_rx (vif, buff, size); +break ; + } + } + }if (vif->monitor_flag)wilc_wfi_monitor_rx (wilc->monitor_dev, buff, size);
drivers/staging/wilc1000/netdev.h +1 -0
@@ -202,6 +202,7 @@ struct wilc_vif {struct wilc_priv priv;struct list_head list;struct cfg80211_bss *bss; +u32 mgmt_bitmask; };struct wilc {
Signature · 1 line
2.26.2