staging: rtl8723bs: remove mgmt_frame_register method (2e410da6) · Commits · 戴 / test

This was changed in cfg80211, so having it broke things, but there's no need to adjust since it's an empty implementation. Just remove it. Fixes: ("cfg80211: change internal management frame registration API") Signed-off-by:

Johannes Berg <johannes.berg@intel.com> Acked-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20200428101400.ae19d651ec38.Ieb15844bb5ab93b3d7931d6561f42e3316ef8251@changeid Signed-off-by:

Johannes Berg <johannes.berg@intel.com>

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+0 −24

Original line number	Diff line number	Diff line
		@@ -3163,29 +3163,6 @@ exit:
		return ret;
		}

		static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
		struct wireless_dev *wdev,
		u16 frame_type, bool reg)
		{
		struct net_device *ndev = wdev_to_ndev(wdev);
		struct adapter *adapter;

		if (ndev == NULL)
		goto exit;

		adapter = (struct adapter *)rtw_netdev_priv(ndev);

		#ifdef DEBUG_CFG80211
		DBG_871X(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
		frame_type, reg);
		#endif

		if (frame_type != (IEEE80211_FTYPE_MGMT \| IEEE80211_STYPE_PROBE_REQ))
		return;
		exit:
		return;
		}

		#if defined(CONFIG_PNO_SUPPORT)
		static int cfg80211_rtw_sched_scan_start(struct wiphy *wiphy,
		struct net_device *dev,
		@@ -3397,7 +3374,6 @@ 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,

		#if defined(CONFIG_PNO_SUPPORT)
		.sched_scan_start = cfg80211_rtw_sched_scan_start,

Admin message