staging: wfx: simplify hif_set_config_data_filter() (db949071) · Commits · 戴 / test

drivers/staging/wfx/hif_tx_mib.h

+11 −3

Original line number	Diff line number	Diff line
		@@ -265,11 +265,19 @@ static inline int hif_set_uc_mc_bc_condition(struct wfx_vif *wvif,
		&val, sizeof(val));
		}

		static inline int hif_set_config_data_filter(struct wfx_vif *wvif,
		struct hif_mib_config_data_filter *arg)
		static inline int hif_set_config_data_filter(struct wfx_vif *wvif, bool enable,
		int idx, int mac_filters,
		int frames_types_filters)
		{
		struct hif_mib_config_data_filter val = {
		.enable = enable,
		.filter_idx = idx,
		.mac_cond = mac_filters,
		.uc_mc_bc_cond = frames_types_filters,
		};

		return hif_write_mib(wvif->wdev, wvif->id,
		HIF_MIB_ID_CONFIG_DATA_FILTER, arg, sizeof(*arg));
		HIF_MIB_ID_CONFIG_DATA_FILTER, &val, sizeof(val));
		}

		static inline int hif_set_data_filtering(struct wfx_vif *wvif,

+2 −6

Original line number	Diff line number	Diff line
		@@ -117,7 +117,6 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
		struct wfx_grp_addr_table *fp)
		{
		int i, ret;
		struct hif_mib_config_data_filter config = { };

		// Temporary workaround for filters
		return hif_set_data_filtering(wvif, false, true);
		@@ -129,7 +128,6 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
		ret = hif_set_mac_addr_condition(wvif, i, fp->address_list[i]);
		if (ret)
		return ret;
		config.mac_cond \|= 1 << i;
		}

		ret = hif_set_uc_mc_bc_condition(wvif, 0, HIF_FILTER_UNICAST \|
		@@ -137,10 +135,8 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
		if (ret)
		return ret;

		config.uc_mc_bc_cond = 1;
		config.filter_idx = 0; // TODO #define MULTICAST_FILTERING 0
		config.enable = 1;
		ret = hif_set_config_data_filter(wvif, &config);
		ret = hif_set_config_data_filter(wvif, true, 0, BIT(1),
		BIT(fp->num_addresses) - 1);
		if (ret)
		return ret;