Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b8ec87a authored by Zhao, Gang's avatar Zhao, Gang Committed by Johannes Berg
Browse files

cfg80211: change registered device pointer name 



Name "dev" is too common and ambiguous, let all the pointer name
pointing to struct cfg80211_registered_device be "rdev". This can
improve code readability and consistency(since other places have
already called it rdev).

Signed-off-by: default avatarZhao, Gang <gamerh2o@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 308f7fcf

net/wireless/core.h

+2 −2
Original line number Diff line number Diff line
@@ -251,8 +251,8 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev, 


void ieee80211_set_bitrate_flags(struct wiphy *wiphy);



void cfg80211_bss_expire(struct cfg80211_registered_device *dev);

void cfg80211_bss_age(struct cfg80211_registered_device *dev,

void cfg80211_bss_expire(struct cfg80211_registered_device *rdev);

void cfg80211_bss_age(struct cfg80211_registered_device *rdev,

                      unsigned long age_secs);



/* IBSS */

net/wireless/nl80211.c

+129 −129
Original line number Diff line number Diff line
@@ -1013,42 +1013,42 @@ static int nl80211_send_wowlan_tcp_caps(struct cfg80211_registered_device *rdev, 
}



static int nl80211_send_wowlan(struct sk_buff *msg,

			       struct cfg80211_registered_device *dev,

			       struct cfg80211_registered_device *rdev,

			       bool large)

{

	struct nlattr *nl_wowlan;



	if (!dev->wiphy.wowlan)

	if (!rdev->wiphy.wowlan)

		return 0;



	nl_wowlan = nla_nest_start(msg, NL80211_ATTR_WOWLAN_TRIGGERS_SUPPORTED);

	if (!nl_wowlan)

		return -ENOBUFS;



	if (((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_ANY) &&

	if (((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_ANY) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_ANY)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_DISCONNECT) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_DISCONNECT) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_DISCONNECT)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_MAGIC_PKT) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_MAGIC_PKT) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_MAGIC_PKT)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_SUPPORTS_GTK_REKEY) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_GTK_REKEY_FAILURE) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_GTK_REKEY_FAILURE)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_EAP_IDENTITY_REQ) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_EAP_IDENTITY_REQ) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_4WAY_HANDSHAKE) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_4WAY_HANDSHAKE) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE)) ||

	    ((dev->wiphy.wowlan->flags & WIPHY_WOWLAN_RFKILL_RELEASE) &&

	    ((rdev->wiphy.wowlan->flags & WIPHY_WOWLAN_RFKILL_RELEASE) &&

	     nla_put_flag(msg, NL80211_WOWLAN_TRIG_RFKILL_RELEASE)))

		return -ENOBUFS;



	if (dev->wiphy.wowlan->n_patterns) {

	if (rdev->wiphy.wowlan->n_patterns) {

		struct nl80211_pattern_support pat = {

			.max_patterns = dev->wiphy.wowlan->n_patterns,

			.min_pattern_len = dev->wiphy.wowlan->pattern_min_len,

			.max_pattern_len = dev->wiphy.wowlan->pattern_max_len,

			.max_pkt_offset = dev->wiphy.wowlan->max_pkt_offset,

			.max_patterns = rdev->wiphy.wowlan->n_patterns,

			.min_pattern_len = rdev->wiphy.wowlan->pattern_min_len,

			.max_pattern_len = rdev->wiphy.wowlan->pattern_max_len,

			.max_pkt_offset = rdev->wiphy.wowlan->max_pkt_offset,

		};



		if (nla_put(msg, NL80211_WOWLAN_TRIG_PKT_PATTERN,
@@ -1056,7 +1056,7 @@ static int nl80211_send_wowlan(struct sk_buff *msg, 
			return -ENOBUFS;

	}



	if (large && nl80211_send_wowlan_tcp_caps(dev, msg))

	if (large && nl80211_send_wowlan_tcp_caps(rdev, msg))

		return -ENOBUFS;



	nla_nest_end(msg, nl_wowlan);
@@ -1066,19 +1066,19 @@ static int nl80211_send_wowlan(struct sk_buff *msg, 
#endif



static int nl80211_send_coalesce(struct sk_buff *msg,

				 struct cfg80211_registered_device *dev)

				 struct cfg80211_registered_device *rdev)

{

	struct nl80211_coalesce_rule_support rule;



	if (!dev->wiphy.coalesce)

	if (!rdev->wiphy.coalesce)

		return 0;



	rule.max_rules = dev->wiphy.coalesce->n_rules;

	rule.max_delay = dev->wiphy.coalesce->max_delay;

	rule.pat.max_patterns = dev->wiphy.coalesce->n_patterns;

	rule.pat.min_pattern_len = dev->wiphy.coalesce->pattern_min_len;

	rule.pat.max_pattern_len = dev->wiphy.coalesce->pattern_max_len;

	rule.pat.max_pkt_offset = dev->wiphy.coalesce->max_pkt_offset;

	rule.max_rules = rdev->wiphy.coalesce->n_rules;

	rule.max_delay = rdev->wiphy.coalesce->max_delay;

	rule.pat.max_patterns = rdev->wiphy.coalesce->n_patterns;

	rule.pat.min_pattern_len = rdev->wiphy.coalesce->pattern_min_len;

	rule.pat.max_pattern_len = rdev->wiphy.coalesce->pattern_max_len;

	rule.pat.max_pkt_offset = rdev->wiphy.coalesce->max_pkt_offset;



	if (nla_put(msg, NL80211_ATTR_COALESCE_RULE, sizeof(rule), &rule))

		return -ENOBUFS;
@@ -1209,7 +1209,7 @@ struct nl80211_dump_wiphy_state { 
	bool split;

};



static int nl80211_send_wiphy(struct cfg80211_registered_device *dev,

static int nl80211_send_wiphy(struct cfg80211_registered_device *rdev,

			      struct sk_buff *msg, u32 portid, u32 seq,

			      int flags, struct nl80211_dump_wiphy_state *state)

{
@@ -1221,7 +1221,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
	struct ieee80211_channel *chan;

	int i;

	const struct ieee80211_txrx_stypes *mgmt_stypes =

				dev->wiphy.mgmt_stypes;

				rdev->wiphy.mgmt_stypes;

	u32 features;



	hdr = nl80211hdr_put(msg, portid, seq, flags, NL80211_CMD_NEW_WIPHY);
@@ -1231,9 +1231,9 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
	if (WARN_ON(!state))

		return -EINVAL;



	if (nla_put_u32(msg, NL80211_ATTR_WIPHY, dev->wiphy_idx) ||

	if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) ||

	    nla_put_string(msg, NL80211_ATTR_WIPHY_NAME,

			   wiphy_name(&dev->wiphy)) ||

			   wiphy_name(&rdev->wiphy)) ||

	    nla_put_u32(msg, NL80211_ATTR_GENERATION,

			cfg80211_rdev_list_generation))

		goto nla_put_failure;
@@ -1241,43 +1241,43 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
	switch (state->split_start) {

	case 0:

		if (nla_put_u8(msg, NL80211_ATTR_WIPHY_RETRY_SHORT,

			       dev->wiphy.retry_short) ||

			       rdev->wiphy.retry_short) ||

		    nla_put_u8(msg, NL80211_ATTR_WIPHY_RETRY_LONG,

			       dev->wiphy.retry_long) ||

			       rdev->wiphy.retry_long) ||

		    nla_put_u32(msg, NL80211_ATTR_WIPHY_FRAG_THRESHOLD,

				dev->wiphy.frag_threshold) ||

				rdev->wiphy.frag_threshold) ||

		    nla_put_u32(msg, NL80211_ATTR_WIPHY_RTS_THRESHOLD,

				dev->wiphy.rts_threshold) ||

				rdev->wiphy.rts_threshold) ||

		    nla_put_u8(msg, NL80211_ATTR_WIPHY_COVERAGE_CLASS,

			       dev->wiphy.coverage_class) ||

			       rdev->wiphy.coverage_class) ||

		    nla_put_u8(msg, NL80211_ATTR_MAX_NUM_SCAN_SSIDS,

			       dev->wiphy.max_scan_ssids) ||

			       rdev->wiphy.max_scan_ssids) ||

		    nla_put_u8(msg, NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS,

			       dev->wiphy.max_sched_scan_ssids) ||

			       rdev->wiphy.max_sched_scan_ssids) ||

		    nla_put_u16(msg, NL80211_ATTR_MAX_SCAN_IE_LEN,

				dev->wiphy.max_scan_ie_len) ||

				rdev->wiphy.max_scan_ie_len) ||

		    nla_put_u16(msg, NL80211_ATTR_MAX_SCHED_SCAN_IE_LEN,

				dev->wiphy.max_sched_scan_ie_len) ||

				rdev->wiphy.max_sched_scan_ie_len) ||

		    nla_put_u8(msg, NL80211_ATTR_MAX_MATCH_SETS,

			       dev->wiphy.max_match_sets))

			       rdev->wiphy.max_match_sets))

			goto nla_put_failure;



		if ((dev->wiphy.flags & WIPHY_FLAG_IBSS_RSN) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_IBSS_RSN) &&

		    nla_put_flag(msg, NL80211_ATTR_SUPPORT_IBSS_RSN))

			goto nla_put_failure;

		if ((dev->wiphy.flags & WIPHY_FLAG_MESH_AUTH) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_MESH_AUTH) &&

		    nla_put_flag(msg, NL80211_ATTR_SUPPORT_MESH_AUTH))

			goto nla_put_failure;

		if ((dev->wiphy.flags & WIPHY_FLAG_AP_UAPSD) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_AP_UAPSD) &&

		    nla_put_flag(msg, NL80211_ATTR_SUPPORT_AP_UAPSD))

			goto nla_put_failure;

		if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_FW_ROAM) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_FW_ROAM) &&

		    nla_put_flag(msg, NL80211_ATTR_ROAM_SUPPORT))

			goto nla_put_failure;

		if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) &&

		    nla_put_flag(msg, NL80211_ATTR_TDLS_SUPPORT))

			goto nla_put_failure;

		if ((dev->wiphy.flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_TDLS_EXTERNAL_SETUP) &&

		    nla_put_flag(msg, NL80211_ATTR_TDLS_EXTERNAL_SETUP))

			goto nla_put_failure;

		state->split_start++;
@@ -1285,35 +1285,35 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
			break;

	case 1:

		if (nla_put(msg, NL80211_ATTR_CIPHER_SUITES,

			    sizeof(u32) * dev->wiphy.n_cipher_suites,

			    dev->wiphy.cipher_suites))

			    sizeof(u32) * rdev->wiphy.n_cipher_suites,

			    rdev->wiphy.cipher_suites))

			goto nla_put_failure;



		if (nla_put_u8(msg, NL80211_ATTR_MAX_NUM_PMKIDS,

			       dev->wiphy.max_num_pmkids))

			       rdev->wiphy.max_num_pmkids))

			goto nla_put_failure;



		if ((dev->wiphy.flags & WIPHY_FLAG_CONTROL_PORT_PROTOCOL) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_CONTROL_PORT_PROTOCOL) &&

		    nla_put_flag(msg, NL80211_ATTR_CONTROL_PORT_ETHERTYPE))

			goto nla_put_failure;



		if (nla_put_u32(msg, NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX,

				dev->wiphy.available_antennas_tx) ||

				rdev->wiphy.available_antennas_tx) ||

		    nla_put_u32(msg, NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX,

				dev->wiphy.available_antennas_rx))

				rdev->wiphy.available_antennas_rx))

			goto nla_put_failure;



		if ((dev->wiphy.flags & WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD) &&

		    nla_put_u32(msg, NL80211_ATTR_PROBE_RESP_OFFLOAD,

				dev->wiphy.probe_resp_offload))

				rdev->wiphy.probe_resp_offload))

			goto nla_put_failure;



		if ((dev->wiphy.available_antennas_tx ||

		     dev->wiphy.available_antennas_rx) &&

		    dev->ops->get_antenna) {

		if ((rdev->wiphy.available_antennas_tx ||

		     rdev->wiphy.available_antennas_rx) &&

		    rdev->ops->get_antenna) {

			u32 tx_ant = 0, rx_ant = 0;

			int res;

			res = rdev_get_antenna(dev, &tx_ant, &rx_ant);

			res = rdev_get_antenna(rdev, &tx_ant, &rx_ant);

			if (!res) {

				if (nla_put_u32(msg,

						NL80211_ATTR_WIPHY_ANTENNA_TX,
@@ -1330,7 +1330,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
			break;

	case 2:

		if (nl80211_put_iftypes(msg, NL80211_ATTR_SUPPORTED_IFTYPES,

					dev->wiphy.interface_modes))

					rdev->wiphy.interface_modes))

				goto nla_put_failure;

		state->split_start++;

		if (state->split)
@@ -1344,7 +1344,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		     band < IEEE80211_NUM_BANDS; band++) {

			struct ieee80211_supported_band *sband;



			sband = dev->wiphy.bands[band];

			sband = rdev->wiphy.bands[band];



			if (!sband)

				continue;
@@ -1421,7 +1421,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		i = 0;

#define CMD(op, n)							\

		 do {							\

			if (dev->ops->op) {				\

			if (rdev->ops->op) {				\

				i++;					\

				if (nla_put_u32(msg, i, NL80211_CMD_ ## n)) \

					goto nla_put_failure;		\
@@ -1445,32 +1445,32 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		CMD(set_pmksa, SET_PMKSA);

		CMD(del_pmksa, DEL_PMKSA);

		CMD(flush_pmksa, FLUSH_PMKSA);

		if (dev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL)

		if (rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL)

			CMD(remain_on_channel, REMAIN_ON_CHANNEL);

		CMD(set_bitrate_mask, SET_TX_BITRATE_MASK);

		CMD(mgmt_tx, FRAME);

		CMD(mgmt_tx_cancel_wait, FRAME_WAIT_CANCEL);

		if (dev->wiphy.flags & WIPHY_FLAG_NETNS_OK) {

		if (rdev->wiphy.flags & WIPHY_FLAG_NETNS_OK) {

			i++;

			if (nla_put_u32(msg, i, NL80211_CMD_SET_WIPHY_NETNS))

				goto nla_put_failure;

		}

		if (dev->ops->set_monitor_channel || dev->ops->start_ap ||

		    dev->ops->join_mesh) {

		if (rdev->ops->set_monitor_channel || rdev->ops->start_ap ||

		    rdev->ops->join_mesh) {

			i++;

			if (nla_put_u32(msg, i, NL80211_CMD_SET_CHANNEL))

				goto nla_put_failure;

		}

		CMD(set_wds_peer, SET_WDS_PEER);

		if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) {

		if (rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) {

			CMD(tdls_mgmt, TDLS_MGMT);

			CMD(tdls_oper, TDLS_OPER);

		}

		if (dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN)

		if (rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_SCHED_SCAN)

			CMD(sched_scan_start, START_SCHED_SCAN);

		CMD(probe_client, PROBE_CLIENT);

		CMD(set_noack_map, SET_NOACK_MAP);

		if (dev->wiphy.flags & WIPHY_FLAG_REPORTS_OBSS) {

		if (rdev->wiphy.flags & WIPHY_FLAG_REPORTS_OBSS) {

			i++;

			if (nla_put_u32(msg, i, NL80211_CMD_REGISTER_BEACONS))

				goto nla_put_failure;
@@ -1480,7 +1480,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		if (state->split) {

			CMD(crit_proto_start, CRIT_PROTOCOL_START);

			CMD(crit_proto_stop, CRIT_PROTOCOL_STOP);

			if (dev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH)

			if (rdev->wiphy.flags & WIPHY_FLAG_HAS_CHANNEL_SWITCH)

				CMD(channel_switch, CHANNEL_SWITCH);

		}

		CMD(set_qos_map, SET_QOS_MAP);
@@ -1491,13 +1491,13 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 


#undef CMD



		if (dev->ops->connect || dev->ops->auth) {

		if (rdev->ops->connect || rdev->ops->auth) {

			i++;

			if (nla_put_u32(msg, i, NL80211_CMD_CONNECT))

				goto nla_put_failure;

		}



		if (dev->ops->disconnect || dev->ops->deauth) {

		if (rdev->ops->disconnect || rdev->ops->deauth) {

			i++;

			if (nla_put_u32(msg, i, NL80211_CMD_DISCONNECT))

				goto nla_put_failure;
@@ -1508,14 +1508,14 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		if (state->split)

			break;

	case 5:

		if (dev->ops->remain_on_channel &&

		    (dev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL) &&

		if (rdev->ops->remain_on_channel &&

		    (rdev->wiphy.flags & WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL) &&

		    nla_put_u32(msg,

				NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION,

				dev->wiphy.max_remain_on_channel_duration))

				rdev->wiphy.max_remain_on_channel_duration))

			goto nla_put_failure;



		if ((dev->wiphy.flags & WIPHY_FLAG_OFFCHAN_TX) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_OFFCHAN_TX) &&

		    nla_put_flag(msg, NL80211_ATTR_OFFCHANNEL_TX_OK))

			goto nla_put_failure;
@@ -1526,7 +1526,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
			break;

	case 6:

#ifdef CONFIG_PM

		if (nl80211_send_wowlan(msg, dev, state->split))

		if (nl80211_send_wowlan(msg, rdev, state->split))

			goto nla_put_failure;

		state->split_start++;

		if (state->split)
@@ -1536,10 +1536,10 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
#endif

	case 7:

		if (nl80211_put_iftypes(msg, NL80211_ATTR_SOFTWARE_IFTYPES,

					dev->wiphy.software_iftypes))

					rdev->wiphy.software_iftypes))

			goto nla_put_failure;



		if (nl80211_put_iface_combinations(&dev->wiphy, msg,

		if (nl80211_put_iface_combinations(&rdev->wiphy, msg,

						   state->split))

			goto nla_put_failure;
@@ -1547,12 +1547,12 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		if (state->split)

			break;

	case 8:

		if ((dev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME) &&

		    nla_put_u32(msg, NL80211_ATTR_DEVICE_AP_SME,

				dev->wiphy.ap_sme_capa))

				rdev->wiphy.ap_sme_capa))

			goto nla_put_failure;



		features = dev->wiphy.features;

		features = rdev->wiphy.features;

		/*

		 * We can only add the per-channel limit information if the

		 * dump is split, otherwise it makes it too big. Therefore
@@ -1563,16 +1563,16 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		if (nla_put_u32(msg, NL80211_ATTR_FEATURE_FLAGS, features))

			goto nla_put_failure;



		if (dev->wiphy.ht_capa_mod_mask &&

		if (rdev->wiphy.ht_capa_mod_mask &&

		    nla_put(msg, NL80211_ATTR_HT_CAPABILITY_MASK,

			    sizeof(*dev->wiphy.ht_capa_mod_mask),

			    dev->wiphy.ht_capa_mod_mask))

			    sizeof(*rdev->wiphy.ht_capa_mod_mask),

			    rdev->wiphy.ht_capa_mod_mask))

			goto nla_put_failure;



		if (dev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME &&

		    dev->wiphy.max_acl_mac_addrs &&

		if (rdev->wiphy.flags & WIPHY_FLAG_HAVE_AP_SME &&

		    rdev->wiphy.max_acl_mac_addrs &&

		    nla_put_u32(msg, NL80211_ATTR_MAC_ACL_MAX,

				dev->wiphy.max_acl_mac_addrs))

				rdev->wiphy.max_acl_mac_addrs))

			goto nla_put_failure;



		/*
@@ -1588,41 +1588,41 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
		state->split_start++;

		break;

	case 9:

		if (dev->wiphy.extended_capabilities &&

		if (rdev->wiphy.extended_capabilities &&

		    (nla_put(msg, NL80211_ATTR_EXT_CAPA,

			     dev->wiphy.extended_capabilities_len,

			     dev->wiphy.extended_capabilities) ||

			     rdev->wiphy.extended_capabilities_len,

			     rdev->wiphy.extended_capabilities) ||

		     nla_put(msg, NL80211_ATTR_EXT_CAPA_MASK,

			     dev->wiphy.extended_capabilities_len,

			     dev->wiphy.extended_capabilities_mask)))

			     rdev->wiphy.extended_capabilities_len,

			     rdev->wiphy.extended_capabilities_mask)))

			goto nla_put_failure;



		if (dev->wiphy.vht_capa_mod_mask &&

		if (rdev->wiphy.vht_capa_mod_mask &&

		    nla_put(msg, NL80211_ATTR_VHT_CAPABILITY_MASK,

			    sizeof(*dev->wiphy.vht_capa_mod_mask),

			    dev->wiphy.vht_capa_mod_mask))

			    sizeof(*rdev->wiphy.vht_capa_mod_mask),

			    rdev->wiphy.vht_capa_mod_mask))

			goto nla_put_failure;



		state->split_start++;

		break;

	case 10:

		if (nl80211_send_coalesce(msg, dev))

		if (nl80211_send_coalesce(msg, rdev))

			goto nla_put_failure;



		if ((dev->wiphy.flags & WIPHY_FLAG_SUPPORTS_5_10_MHZ) &&

		if ((rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_5_10_MHZ) &&

		    (nla_put_flag(msg, NL80211_ATTR_SUPPORT_5_MHZ) ||

		     nla_put_flag(msg, NL80211_ATTR_SUPPORT_10_MHZ)))

			goto nla_put_failure;



		if (dev->wiphy.max_ap_assoc_sta &&

		if (rdev->wiphy.max_ap_assoc_sta &&

		    nla_put_u32(msg, NL80211_ATTR_MAX_AP_ASSOC_STA,

				dev->wiphy.max_ap_assoc_sta))

				rdev->wiphy.max_ap_assoc_sta))

			goto nla_put_failure;



		state->split_start++;

		break;

	case 11:

		if (dev->wiphy.n_vendor_commands) {

		if (rdev->wiphy.n_vendor_commands) {

			const struct nl80211_vendor_cmd_info *info;

			struct nlattr *nested;
@@ -1630,15 +1630,15 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
			if (!nested)

				goto nla_put_failure;



			for (i = 0; i < dev->wiphy.n_vendor_commands; i++) {

				info = &dev->wiphy.vendor_commands[i].info;

			for (i = 0; i < rdev->wiphy.n_vendor_commands; i++) {

				info = &rdev->wiphy.vendor_commands[i].info;

				if (nla_put(msg, i + 1, sizeof(*info), info))

					goto nla_put_failure;

			}

			nla_nest_end(msg, nested);

		}



		if (dev->wiphy.n_vendor_events) {

		if (rdev->wiphy.n_vendor_events) {

			const struct nl80211_vendor_cmd_info *info;

			struct nlattr *nested;
@@ -1647,8 +1647,8 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, 
			if (!nested)

				goto nla_put_failure;



			for (i = 0; i < dev->wiphy.n_vendor_events; i++) {

				info = &dev->wiphy.vendor_events[i];

			for (i = 0; i < rdev->wiphy.n_vendor_events; i++) {

				info = &rdev->wiphy.vendor_events[i];

				if (nla_put(msg, i + 1, sizeof(*info), info))

					goto nla_put_failure;

			}
@@ -1704,7 +1704,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) 
{

	int idx = 0, ret;

	struct nl80211_dump_wiphy_state *state = (void *)cb->args[0];

	struct cfg80211_registered_device *dev;

	struct cfg80211_registered_device *rdev;



	rtnl_lock();

	if (!state) {
@@ -1723,17 +1723,17 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) 
		cb->args[0] = (long)state;

	}



	list_for_each_entry(dev, &cfg80211_rdev_list, list) {

		if (!net_eq(wiphy_net(&dev->wiphy), sock_net(skb->sk)))

	list_for_each_entry(rdev, &cfg80211_rdev_list, list) {

		if (!net_eq(wiphy_net(&rdev->wiphy), sock_net(skb->sk)))

			continue;

		if (++idx <= state->start)

			continue;

		if (state->filter_wiphy != -1 &&

		    state->filter_wiphy != dev->wiphy_idx)

		    state->filter_wiphy != rdev->wiphy_idx)

			continue;

		/* attempt to fit multiple wiphy data chunks into the skb */

		do {

			ret = nl80211_send_wiphy(dev, skb,

			ret = nl80211_send_wiphy(rdev, skb,

						 NETLINK_CB(cb->skb).portid,

						 cb->nlh->nlmsg_seq,

						 NLM_F_MULTI, state);
@@ -1781,14 +1781,14 @@ static int nl80211_dump_wiphy_done(struct netlink_callback *cb) 
static int nl80211_get_wiphy(struct sk_buff *skb, struct genl_info *info)

{

	struct sk_buff *msg;

	struct cfg80211_registered_device *dev = info->user_ptr[0];

	struct cfg80211_registered_device *rdev = info->user_ptr[0];

	struct nl80211_dump_wiphy_state state = {};



	msg = nlmsg_new(4096, GFP_KERNEL);

	if (!msg)

		return -ENOMEM;



	if (nl80211_send_wiphy(dev, msg, info->snd_portid, info->snd_seq, 0,

	if (nl80211_send_wiphy(rdev, msg, info->snd_portid, info->snd_seq, 0,

			       &state) < 0) {

		nlmsg_free(msg);

		return -ENOBUFS;
@@ -2362,7 +2362,7 @@ static int nl80211_dump_interface(struct sk_buff *skb, struct netlink_callback * 
static int nl80211_get_interface(struct sk_buff *skb, struct genl_info *info)

{

	struct sk_buff *msg;

	struct cfg80211_registered_device *dev = info->user_ptr[0];

	struct cfg80211_registered_device *rdev = info->user_ptr[0];

	struct wireless_dev *wdev = info->user_ptr[1];



	msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -2370,7 +2370,7 @@ static int nl80211_get_interface(struct sk_buff *skb, struct genl_info *info) 
		return -ENOMEM;



	if (nl80211_send_iface(msg, info->snd_portid, info->snd_seq, 0,

			       dev, wdev) < 0) {

			       rdev, wdev) < 0) {

		nlmsg_free(msg);

		return -ENOBUFS;

	}
@@ -3673,13 +3673,13 @@ static int nl80211_dump_station(struct sk_buff *skb, 
				struct netlink_callback *cb)

{

	struct station_info sinfo;

	struct cfg80211_registered_device *dev;

	struct cfg80211_registered_device *rdev;

	struct wireless_dev *wdev;

	u8 mac_addr[ETH_ALEN];

	int sta_idx = cb->args[2];

	int err;



	err = nl80211_prepare_wdev_dump(skb, cb, &dev, &wdev);

	err = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);

	if (err)

		return err;
@@ -3688,14 +3688,14 @@ static int nl80211_dump_station(struct sk_buff *skb, 
		goto out_err;

	}



	if (!dev->ops->dump_station) {

	if (!rdev->ops->dump_station) {

		err = -EOPNOTSUPP;

		goto out_err;

	}



	while (1) {

		memset(&sinfo, 0, sizeof(sinfo));

		err = rdev_dump_station(dev, wdev->netdev, sta_idx,

		err = rdev_dump_station(rdev, wdev->netdev, sta_idx,

					mac_addr, &sinfo);

		if (err == -ENOENT)

			break;
@@ -3705,7 +3705,7 @@ static int nl80211_dump_station(struct sk_buff *skb, 
		if (nl80211_send_station(skb,

				NETLINK_CB(cb->skb).portid,

				cb->nlh->nlmsg_seq, NLM_F_MULTI,

				dev, wdev->netdev, mac_addr,

				rdev, wdev->netdev, mac_addr,

				&sinfo) < 0)

			goto out;
@@ -3717,7 +3717,7 @@ static int nl80211_dump_station(struct sk_buff *skb, 
	cb->args[2] = sta_idx;

	err = skb->len;

 out_err:

	nl80211_finish_wdev_dump(dev);

	nl80211_finish_wdev_dump(rdev);



	return err;

}
@@ -4378,18 +4378,18 @@ static int nl80211_dump_mpath(struct sk_buff *skb, 
			      struct netlink_callback *cb)

{

	struct mpath_info pinfo;

	struct cfg80211_registered_device *dev;

	struct cfg80211_registered_device *rdev;

	struct wireless_dev *wdev;

	u8 dst[ETH_ALEN];

	u8 next_hop[ETH_ALEN];

	int path_idx = cb->args[2];

	int err;



	err = nl80211_prepare_wdev_dump(skb, cb, &dev, &wdev);

	err = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);

	if (err)

		return err;



	if (!dev->ops->dump_mpath) {

	if (!rdev->ops->dump_mpath) {

		err = -EOPNOTSUPP;

		goto out_err;

	}
@@ -4400,7 +4400,7 @@ static int nl80211_dump_mpath(struct sk_buff *skb, 
	}



	while (1) {

		err = rdev_dump_mpath(dev, wdev->netdev, path_idx, dst,

		err = rdev_dump_mpath(rdev, wdev->netdev, path_idx, dst,

				      next_hop, &pinfo);

		if (err == -ENOENT)

			break;
@@ -4421,7 +4421,7 @@ static int nl80211_dump_mpath(struct sk_buff *skb, 
	cb->args[2] = path_idx;

	err = skb->len;

 out_err:

	nl80211_finish_wdev_dump(dev);

	nl80211_finish_wdev_dump(rdev);

	return err;

}
@@ -6162,12 +6162,12 @@ static int nl80211_dump_survey(struct sk_buff *skb, 
			struct netlink_callback *cb)

{

	struct survey_info survey;

	struct cfg80211_registered_device *dev;

	struct cfg80211_registered_device *rdev;

	struct wireless_dev *wdev;

	int survey_idx = cb->args[2];

	int res;



	res = nl80211_prepare_wdev_dump(skb, cb, &dev, &wdev);

	res = nl80211_prepare_wdev_dump(skb, cb, &rdev, &wdev);

	if (res)

		return res;
@@ -6176,7 +6176,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, 
		goto out_err;

	}



	if (!dev->ops->dump_survey) {

	if (!rdev->ops->dump_survey) {

		res = -EOPNOTSUPP;

		goto out_err;

	}
@@ -6184,7 +6184,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, 
	while (1) {

		struct ieee80211_channel *chan;



		res = rdev_dump_survey(dev, wdev->netdev, survey_idx, &survey);

		res = rdev_dump_survey(rdev, wdev->netdev, survey_idx, &survey);

		if (res == -ENOENT)

			break;

		if (res)
@@ -6196,7 +6196,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, 
			goto out;

		}



		chan = ieee80211_get_channel(&dev->wiphy,

		chan = ieee80211_get_channel(&rdev->wiphy,

					     survey.channel->center_freq);

		if (!chan || chan->flags & IEEE80211_CHAN_DISABLED) {

			survey_idx++;
@@ -6215,7 +6215,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, 
	cb->args[2] = survey_idx;

	res = skb->len;

 out_err:

	nl80211_finish_wdev_dump(dev);

	nl80211_finish_wdev_dump(rdev);

	return res;

}