staging: wfx: simplify hif_mib_uc_mc_bc_data_frame_condition (f5864a10) · Commits · 戴 / test

drivers/staging/wfx/hif_api_mib.h

+4 −10

Original line number	Diff line number	Diff line
		@@ -181,19 +181,13 @@ struct hif_mib_ipv6_addr_data_frame_condition {
		u8 i_pv6_address[HIF_API_IPV6_ADDRESS_SIZE];
		} __packed;

		union hif_addr_type {
		u8 value;
		struct {
		u8 type_unicast:1;
		u8 type_multicast:1;
		u8 type_broadcast:1;
		u8 reserved:5;
		} bits;
		};
		#define HIF_FILTER_UNICAST 0x1
		#define HIF_FILTER_MULTICAST 0x2
		#define HIF_FILTER_BROADCAST 0x4

		struct hif_mib_uc_mc_bc_data_frame_condition {
		u8 condition_idx;
		union hif_addr_type param;
		u8 allowed_frames;
		u8 reserved[2];
		} __packed;

+3 −6

Original line number	Diff line number	Diff line
		@@ -246,15 +246,12 @@ static inline int hif_set_mac_addr_condition(struct wfx_vif *wvif,
		arg, sizeof(*arg));
		}

		// FIXME: use a bitfield instead of 3 boolean values
		static inline int hif_set_uc_mc_bc_condition(struct wfx_vif *wvif, int idx,
		bool unic, bool multic, bool broadc)
		static inline int hif_set_uc_mc_bc_condition(struct wfx_vif *wvif,
		int idx, u8 allowed_frames)
		{
		struct hif_mib_uc_mc_bc_data_frame_condition val = {
		.condition_idx = idx,
		.param.bits.type_unicast = unic,
		.param.bits.type_multicast = multic,
		.param.bits.type_broadcast = broadc,
		.allowed_frames = allowed_frames,
		};

		return hif_write_mib(wvif->wdev, wvif->id,

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,8 +142,8 @@ static int wfx_set_mcast_filter(struct wfx_vif *wvif,
		config.mac_cond \|= 1 << i;
		}

		// Accept unicast and broadcast
		ret = hif_set_uc_mc_bc_condition(wvif, 0, true, false, true);
		ret = hif_set_uc_mc_bc_condition(wvif, 0, HIF_FILTER_UNICAST \|
		HIF_FILTER_BROADCAST);
		if (ret)
		return ret;