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

Commit 319090bf authored by Johannes Berg's avatar Johannes Berg
Browse files

cfg80211: remove enum station_info_flags 



This is really just duplicating the list of information that's
already available in the nl80211 attribute, so remove the list.
Two small changes are needed:
 * remove STATION_INFO_ASSOC_REQ_IES complete, but the length
   (assoc_req_ies_len) can be used instead
 * add NL80211_STA_INFO_RX_DROP_MISC which exists internally
   but not in nl80211 yet

This gets rid of the duplicate maintenance of the two lists.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 2b9a7e1b

drivers/net/wireless/ath/ath6kl/cfg80211.c

+7 −7
Original line number Diff line number Diff line
@@ -1799,20 +1799,20 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 


	if (vif->target_stats.rx_byte) {

		sinfo->rx_bytes = vif->target_stats.rx_byte;

		sinfo->filled |= STATION_INFO_RX_BYTES64;

		sinfo->filled |= BIT(NL80211_STA_INFO_RX_BYTES64);

		sinfo->rx_packets = vif->target_stats.rx_pkt;

		sinfo->filled |= STATION_INFO_RX_PACKETS;

		sinfo->filled |= BIT(NL80211_STA_INFO_RX_PACKETS);

	}



	if (vif->target_stats.tx_byte) {

		sinfo->tx_bytes = vif->target_stats.tx_byte;

		sinfo->filled |= STATION_INFO_TX_BYTES64;

		sinfo->filled |= BIT(NL80211_STA_INFO_TX_BYTES64);

		sinfo->tx_packets = vif->target_stats.tx_pkt;

		sinfo->filled |= STATION_INFO_TX_PACKETS;

		sinfo->filled |= BIT(NL80211_STA_INFO_TX_PACKETS);

	}



	sinfo->signal = vif->target_stats.cs_rssi;

	sinfo->filled |= STATION_INFO_SIGNAL;

	sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);



	rate = vif->target_stats.tx_ucast_rate;
@@ -1844,12 +1844,12 @@ static int ath6kl_get_station(struct wiphy *wiphy, struct net_device *dev, 
		return 0;

	}



	sinfo->filled |= STATION_INFO_TX_BITRATE;

	sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);



	if (test_bit(CONNECTED, &vif->flags) &&

	    test_bit(DTIM_PERIOD_AVAIL, &vif->flags) &&

	    vif->nw_type == INFRA_NETWORK) {

		sinfo->filled |= STATION_INFO_BSS_PARAM;

		sinfo->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);

		sinfo->bss_param.flags = 0;

		sinfo->bss_param.dtim_period = vif->assoc_bss_dtim_period;

		sinfo->bss_param.beacon_interval = vif->assoc_bss_beacon_int;

drivers/net/wireless/ath/ath6kl/main.c

+0 −1
Original line number Diff line number Diff line
@@ -488,7 +488,6 @@ void ath6kl_connect_ap_mode_sta(struct ath6kl_vif *vif, u16 aid, u8 *mac_addr, 


	sinfo.assoc_req_ies = ies;

	sinfo.assoc_req_ies_len = ies_len;

	sinfo.filled |= STATION_INFO_ASSOC_REQ_IES;



	cfg80211_new_sta(vif->ndev, mac_addr, &sinfo, GFP_KERNEL);

drivers/net/wireless/ath/wil6210/cfg80211.c

+9 −9
Original line number Diff line number Diff line
@@ -142,14 +142,14 @@ int wil_cid_fill_sinfo(struct wil6210_priv *wil, int cid, 


	sinfo->generation = wil->sinfo_gen;



	sinfo->filled = STATION_INFO_RX_BYTES |

			STATION_INFO_TX_BYTES |

			STATION_INFO_RX_PACKETS |

			STATION_INFO_TX_PACKETS |

			STATION_INFO_RX_BITRATE |

			STATION_INFO_TX_BITRATE |

			STATION_INFO_RX_DROP_MISC |

			STATION_INFO_TX_FAILED;

	sinfo->filled = BIT(NL80211_STA_INFO_RX_BYTES) |

			BIT(NL80211_STA_INFO_TX_BYTES) |

			BIT(NL80211_STA_INFO_RX_PACKETS) |

			BIT(NL80211_STA_INFO_TX_PACKETS) |

			BIT(NL80211_STA_INFO_RX_BITRATE) |

			BIT(NL80211_STA_INFO_TX_BITRATE) |

			BIT(NL80211_STA_INFO_RX_DROP_MISC) |

			BIT(NL80211_STA_INFO_TX_FAILED);



	sinfo->txrate.flags = RATE_INFO_FLAGS_MCS | RATE_INFO_FLAGS_60G;

	sinfo->txrate.mcs = le16_to_cpu(reply.evt.bf_mcs);
@@ -163,7 +163,7 @@ int wil_cid_fill_sinfo(struct wil6210_priv *wil, int cid, 
	sinfo->tx_failed = stats->tx_errors;



	if (test_bit(wil_status_fwconnected, &wil->status)) {

		sinfo->filled |= STATION_INFO_SIGNAL;

		sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

		sinfo->signal = reply.evt.sqi;

	}

drivers/net/wireless/ath/wil6210/wmi.c

+0 −1
Original line number Diff line number Diff line
@@ -457,7 +457,6 @@ static void wmi_evt_connect(struct wil6210_priv *wil, int id, void *d, int len) 
		if (assoc_req_ie) {

			sinfo.assoc_req_ies = assoc_req_ie;

			sinfo.assoc_req_ies_len = assoc_req_ielen;

			sinfo.filled |= STATION_INFO_ASSOC_REQ_IES;

		}



		cfg80211_new_sta(ndev, evt->bssid, &sinfo, GFP_KERNEL);

drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c

+5 −6
Original line number Diff line number Diff line
@@ -2333,10 +2333,10 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
			brcmf_err("GET STA INFO failed, %d\n", err);

			goto done;

		}

		sinfo->filled = STATION_INFO_INACTIVE_TIME;

		sinfo->filled = BIT(NL80211_STA_INFO_INACTIVE_TIME);

		sinfo->inactive_time = le32_to_cpu(sta_info_le.idle) * 1000;

		if (le32_to_cpu(sta_info_le.flags) & BRCMF_STA_ASSOC) {

			sinfo->filled |= STATION_INFO_CONNECTED_TIME;

			sinfo->filled |= BIT(NL80211_STA_INFO_CONNECTED_TIME);

			sinfo->connected_time = le32_to_cpu(sta_info_le.in);

		}

		brcmf_dbg(TRACE, "STA idle time : %d ms, connected time :%d sec\n",
@@ -2354,7 +2354,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
			brcmf_err("Could not get rate (%d)\n", err);

			goto done;

		} else {

			sinfo->filled |= STATION_INFO_TX_BITRATE;

			sinfo->filled |= BIT(NL80211_STA_INFO_TX_BITRATE);

			sinfo->txrate.legacy = rate * 5;

			brcmf_dbg(CONN, "Rate %d Mbps\n", rate / 2);

		}
@@ -2369,7 +2369,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
				goto done;

			} else {

				rssi = le32_to_cpu(scb_val.val);

				sinfo->filled |= STATION_INFO_SIGNAL;

				sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);

				sinfo->signal = rssi;

				brcmf_dbg(CONN, "RSSI %d dBm\n", rssi);

			}
@@ -2396,7 +2396,7 @@ brcmf_cfg80211_get_station(struct wiphy *wiphy, struct net_device *ndev, 
				brcmf_dbg(CONN, "DTIM peroid %d\n",

					  dtim_period);

			}

			sinfo->filled |= STATION_INFO_BSS_PARAM;

			sinfo->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);

		}

	} else

		err = -EPERM;
@@ -4778,7 +4778,6 @@ brcmf_notify_connect_status_ap(struct brcmf_cfg80211_info *cfg, 
	if (((event == BRCMF_E_ASSOC_IND) || (event == BRCMF_E_REASSOC_IND)) &&

	    (reason == BRCMF_E_STATUS_SUCCESS)) {

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

		sinfo.filled = STATION_INFO_ASSOC_REQ_IES;

		if (!data) {

			brcmf_err("No IEs present in ASSOC/REASSOC_IND");

			return -EINVAL;