All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kvalo@adurom.com>
To: linux-wireless@vger.kernel.org
Subject: [RFC PATCH 09/27] mac80211: rename ieee80211_bss to mac80211_bss
Date: Sun, 29 May 2011 23:05:13 +0300	[thread overview]
Message-ID: <20110529200513.16479.66059.stgit@localhost6.localdomain6> (raw)
In-Reply-To: <20110529195022.16479.71762.stgit@localhost6.localdomain6>

Signed-off-by: Kalle Valo <kvalo@adurom.com>
---
 net/mac80211/ibss.c       |    6 +++---
 net/mac80211/mac80211_i.h |   16 ++++++++--------
 net/mac80211/main.c       |    2 +-
 net/mac80211/mlme.c       |   10 +++++-----
 net/mac80211/scan.c       |   12 ++++++------
 5 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 2533947..40f14f2 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -211,7 +211,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 }
 
 static void ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
-				    struct ieee80211_bss *bss)
+				    struct mac80211_bss *bss)
 {
 	struct cfg80211_bss *cbss =
 		container_of((void *)bss, struct cfg80211_bss, priv);
@@ -260,7 +260,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 	struct mac80211_local *local = sdata->local;
 	int freq;
 	struct cfg80211_bss *cbss;
-	struct ieee80211_bss *bss;
+	struct mac80211_bss *bss;
 	struct sta_info *sta;
 	struct ieee80211_channel *channel;
 	u64 beacon_timestamp, rx_timestamp;
@@ -600,7 +600,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
 				capability);
 
 	if (cbss) {
-		struct ieee80211_bss *bss;
+		struct mac80211_bss *bss;
 
 		bss = (void *)cbss->priv;
 #ifdef CONFIG_MAC80211_IBSS_DEBUG
diff --git a/net/mac80211/mac80211_i.h b/net/mac80211/mac80211_i.h
index ddaf7de..fffafa8 100644
--- a/net/mac80211/mac80211_i.h
+++ b/net/mac80211/mac80211_i.h
@@ -74,7 +74,7 @@ struct mac80211_fragment_entry {
 };
 
 
-struct ieee80211_bss {
+struct mac80211_bss {
 	/* don't want to look up all the time */
 	size_t ssid_len;
 	u8 ssid[IEEE80211_MAX_SSID_LEN];
@@ -106,7 +106,7 @@ struct ieee80211_bss {
 	u8 erp_value;
 };
 
-static inline u8 *bss_mesh_cfg(struct ieee80211_bss *bss)
+static inline u8 *bss_mesh_cfg(struct mac80211_bss *bss)
 {
 #ifdef CONFIG_MAC80211_MESH
 	return bss->mesh_cfg;
@@ -114,7 +114,7 @@ static inline u8 *bss_mesh_cfg(struct ieee80211_bss *bss)
 	return NULL;
 }
 
-static inline u8 *bss_mesh_id(struct ieee80211_bss *bss)
+static inline u8 *bss_mesh_id(struct mac80211_bss *bss)
 {
 #ifdef CONFIG_MAC80211_MESH
 	return bss->mesh_id;
@@ -122,7 +122,7 @@ static inline u8 *bss_mesh_id(struct ieee80211_bss *bss)
 	return NULL;
 }
 
-static inline u8 bss_mesh_id_len(struct ieee80211_bss *bss)
+static inline u8 bss_mesh_id_len(struct mac80211_bss *bss)
 {
 #ifdef CONFIG_MAC80211_MESH
 	return bss->mesh_id_len;
@@ -1104,7 +1104,7 @@ int ieee80211_max_network_latency(struct notifier_block *nb,
 int ieee80211_set_arp_filter(struct ieee80211_sub_if_data *sdata);
 void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
 				      struct ieee80211_channel_sw_ie *sw_elem,
-				      struct ieee80211_bss *bss,
+				      struct mac80211_bss *bss,
 				      u64 timestamp);
 void ieee80211_sta_quiesce(struct ieee80211_sub_if_data *sdata);
 void ieee80211_sta_restart(struct ieee80211_sub_if_data *sdata);
@@ -1146,7 +1146,7 @@ ieee80211_rx_result
 ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb);
 
 void ieee80211_mlme_notify_scan_completed(struct mac80211_local *local);
-struct ieee80211_bss *
+struct mac80211_bss *
 ieee80211_bss_info_update(struct mac80211_local *local,
 			  struct ieee80211_rx_status *rx_status,
 			  struct ieee80211_mgmt *mgmt,
@@ -1154,11 +1154,11 @@ ieee80211_bss_info_update(struct mac80211_local *local,
 			  struct ieee802_11_elems *elems,
 			  struct ieee80211_channel *channel,
 			  bool beacon);
-struct ieee80211_bss *
+struct mac80211_bss *
 ieee80211_rx_bss_get(struct mac80211_local *local, u8 *bssid, int freq,
 		     u8 *ssid, u8 ssid_len);
 void ieee80211_rx_bss_put(struct mac80211_local *local,
-			  struct ieee80211_bss *bss);
+			  struct mac80211_bss *bss);
 
 /* scheduled scan handling */
 int ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata,
diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 87416c3..244f588 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -586,7 +586,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
 	if (!ops->set_key)
 		wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
 
-	wiphy->bss_priv_size = sizeof(struct ieee80211_bss);
+	wiphy->bss_priv_size = sizeof(struct mac80211_bss);
 
 	local = wiphy_priv(wiphy);
 
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 451a9fd..4e24610 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -451,7 +451,7 @@ static void ieee80211_chswitch_timer(unsigned long data)
 
 void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata,
 				      struct ieee80211_channel_sw_ie *sw_elem,
-				      struct ieee80211_bss *bss,
+				      struct mac80211_bss *bss,
 				      u64 timestamp)
 {
 	struct cfg80211_bss *cbss =
@@ -708,7 +708,7 @@ void ieee80211_recalc_ps(struct mac80211_local *local, s32 latency)
 		if (beaconint_us > latency) {
 			local->ps_sdata = NULL;
 		} else {
-			struct ieee80211_bss *bss;
+			struct mac80211_bss *bss;
 			int maxslp = 1;
 			u8 dtimper;
 
@@ -963,7 +963,7 @@ static void ieee80211_set_associated(struct ieee80211_sub_if_data *sdata,
 				     struct cfg80211_bss *cbss,
 				     u32 bss_info_changed)
 {
-	struct ieee80211_bss *bss = (void *)cbss->priv;
+	struct mac80211_bss *bss = (void *)cbss->priv;
 	struct mac80211_local *local = sdata->local;
 	struct ieee80211_bss_conf *bss_conf = &sdata->vif.bss_conf;
 
@@ -1608,7 +1608,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata,
 {
 	struct mac80211_local *local = sdata->local;
 	int freq;
-	struct ieee80211_bss *bss;
+	struct mac80211_bss *bss;
 	struct ieee80211_channel *channel;
 	bool need_ps = false;
 
@@ -2413,7 +2413,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 			struct cfg80211_assoc_request *req)
 {
 	struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
-	struct ieee80211_bss *bss = (void *)req->bss->priv;
+	struct mac80211_bss *bss = (void *)req->bss->priv;
 	struct ieee80211_work *wk;
 	const u8 *ssid;
 	int i;
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index e7b8be2..7c3d17b 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -27,7 +27,7 @@
 #define IEEE80211_CHANNEL_TIME (HZ / 33)
 #define IEEE80211_PASSIVE_CHANNEL_TIME (HZ / 8)
 
-struct ieee80211_bss *
+struct mac80211_bss *
 ieee80211_rx_bss_get(struct mac80211_local *local, u8 *bssid, int freq,
 		     u8 *ssid, u8 ssid_len)
 {
@@ -43,14 +43,14 @@ ieee80211_rx_bss_get(struct mac80211_local *local, u8 *bssid, int freq,
 
 static void ieee80211_rx_bss_free(struct cfg80211_bss *cbss)
 {
-	struct ieee80211_bss *bss = (void *)cbss->priv;
+	struct mac80211_bss *bss = (void *)cbss->priv;
 
 	kfree(bss_mesh_id(bss));
 	kfree(bss_mesh_cfg(bss));
 }
 
 void ieee80211_rx_bss_put(struct mac80211_local *local,
-			  struct ieee80211_bss *bss)
+			  struct mac80211_bss *bss)
 {
 	if (!bss)
 		return;
@@ -74,7 +74,7 @@ static bool is_uapsd_supported(struct ieee802_11_elems *elems)
 	return qos_info & IEEE80211_WMM_IE_AP_QOSINFO_UAPSD;
 }
 
-struct ieee80211_bss *
+struct mac80211_bss *
 ieee80211_bss_info_update(struct mac80211_local *local,
 			  struct ieee80211_rx_status *rx_status,
 			  struct ieee80211_mgmt *mgmt,
@@ -84,7 +84,7 @@ ieee80211_bss_info_update(struct mac80211_local *local,
 			  bool beacon)
 {
 	struct cfg80211_bss *cbss;
-	struct ieee80211_bss *bss;
+	struct mac80211_bss *bss;
 	int clen, srlen;
 	s32 signal = 0;
 
@@ -151,7 +151,7 @@ ieee80211_scan_rx(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb)
 {
 	struct ieee80211_rx_status *rx_status = IEEE80211_SKB_RXCB(skb);
 	struct ieee80211_mgmt *mgmt;
-	struct ieee80211_bss *bss;
+	struct mac80211_bss *bss;
 	u8 *elements;
 	struct ieee80211_channel *channel;
 	size_t baselen;


  parent reply	other threads:[~2011-05-29 20:05 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-29 20:03 [RFC PATCH 00/27] mac80211: create mac80211_ prefix Kalle Valo
2011-05-29 20:04 ` [RFC PATCH 01/27] iwlegacy: fix stop/wake queue hacks Kalle Valo
2011-05-29 20:04 ` [RFC PATCH 02/27] iwlwifi: " Kalle Valo
2011-05-29 20:04 ` [RFC PATCH 03/27] zd1211rw: include mac80211.h from zd_chip.h Kalle Valo
2011-05-31  8:01   ` Walter Goldens
2011-05-31 13:03     ` Jussi Kivilinna
2011-05-31 17:46       ` Walter Goldens
2011-05-31 19:24         ` Jussi Kivilinna
2011-06-04  8:16           ` Walter Goldens
2011-05-29 20:04 ` [RFC PATCH 04/27] rtlwifi: include mac80211.h from core.h Kalle Valo
2011-05-30  4:30   ` Larry Finger
2011-05-29 20:04 ` [RFC PATCH 05/27] mac80211: switch mac80211.h to use mac80211 prefix Kalle Valo
2011-05-29 20:04 ` [RFC PATCH 06/27] mac80211: rename ieee80211_i.h to mac80211_i.h Kalle Valo
2011-05-29 20:04 ` [RFC PATCH 07/27] mac80211: rename ieee80211_local to mac80211_local Kalle Valo
2011-05-29 20:05 ` [RFC PATCH 08/27] mac80211: rename ieee80211_fragment_entry to mac80211_fragment_entry Kalle Valo
2011-05-29 20:05 ` Kalle Valo [this message]
2011-05-29 20:05 ` [RFC PATCH 10/27] mac80211: rename ieee80211_tx_data to mac80211_tx_data Kalle Valo
2011-05-29 20:05 ` [RFC PATCH 11/27] mac80211: rename ieee80211_packet_rx_flags to mac80211_packet_rx_flags Kalle Valo
2011-05-29 20:05 ` [RFC PATCH 12/27] mac80211: rename ieee80211_rx_flags to mac80211_i_rx_flags Kalle Valo
2011-05-29 20:05 ` [RFC PATCH 13/27] mac80211: rename ieee80211_rx_data to mac80211_rx_data Kalle Valo
2011-05-29 20:05 ` [RFC PATCH 14/27] mac80211: rename ieee80211_if_ap to mac80211_if_ap Kalle Valo
2011-05-29 20:05 ` [RFC PATCH 15/27] mac80211: change ieee80211_if_wds and _vlan to use mac80211 prefix Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 16/27] mac80211: rename ieee80211_work_type to mac80211_work_type Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 17/27] mac80211: rename ieee80211_work to mac80211_work Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 18/27] mac80211: rename ieee80211_sta_flags to mac80211_sta_flags Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 19/27] mac80211: rename ieee80211_if_managed to mac80211_if_managed Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 20/27] mac80211: rename ieee80211_if_ibss to mac80211_if_ibss Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 21/27] mac80211: rename ieee80211_if_mesh to mac80211_if_mesh Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 22/27] mac80211: rename ieee80211_sub_if_data_flags to mac80211_sub_if_data_flags Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 23/27] mac80211: rename ieee80211_sdata_state_bits to mac80211_sdata_state_bits Kalle Valo
2011-05-29 20:06 ` [RFC PATCH 24/27] mac80211: ieee80211_sub_if_data to mac80211_sub_if_data Kalle Valo
2011-05-29 20:07 ` [RFC PATCH 25/27] mac80211: use mac80211 prefix with rx and tx msg flags Kalle Valo
2011-05-29 20:07 ` [RFC PATCH 26/27] mac80211: change queue stop reasons to use mac80211 prefix Kalle Valo
2011-05-29 20:07 ` [RFC PATCH 27/27] mac80211: use mac80211_hw Kalle Valo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110529200513.16479.66059.stgit@localhost6.localdomain6 \
    --to=kvalo@adurom.com \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.