Search Linux Wireless

[PATCH] mac80211: deprecate conf.beacon_int properly

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 

Ivo has updated the driver to no longer use the change flag,
so we can remove that, but rt2x00 and ath5k still use the
actual value so let's add a wrapper to mark it as deprecated
too.

Signed-off-by: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
---
 drivers/net/wireless/ath/ath5k/base.c   |    2 +-
 drivers/net/wireless/rt2x00/rt2400pci.c |    2 +-
 drivers/net/wireless/rt2x00/rt2500pci.c |    2 +-
 drivers/net/wireless/rt2x00/rt2500usb.c |    2 +-
 drivers/net/wireless/rt2x00/rt61pci.c   |    2 +-
 drivers/net/wireless/rt2x00/rt73usb.c   |    2 +-
 include/net/mac80211.h                  |   19 +++++++------------
 net/mac80211/main.c                     |   12 ++----------
 8 files changed, 15 insertions(+), 28 deletions(-)

--- wireless-testing.orig/include/net/mac80211.h	2009-05-23 11:00:21.000000000 +0200
+++ wireless-testing/include/net/mac80211.h	2009-05-23 11:07:27.000000000 +0200
@@ -530,7 +530,6 @@ enum ieee80211_conf_flags {
  * enum ieee80211_conf_changed - denotes which configuration changed
  *
  * @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed
- * @_IEEE80211_CONF_CHANGE_BEACON_INTERVAL: DEPRECATED
  * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed
  * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed
  * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed
@@ -541,7 +540,6 @@ enum ieee80211_conf_flags {
  */
 enum ieee80211_conf_changed {
 	IEEE80211_CONF_CHANGE_RADIO_ENABLED	= BIT(0),
-	_IEEE80211_CONF_CHANGE_BEACON_INTERVAL	= BIT(1),
 	IEEE80211_CONF_CHANGE_LISTEN_INTERVAL	= BIT(2),
 	IEEE80211_CONF_CHANGE_RADIOTAP		= BIT(3),
 	IEEE80211_CONF_CHANGE_PS		= BIT(4),
@@ -551,14 +549,6 @@ enum ieee80211_conf_changed {
 	IEEE80211_CONF_CHANGE_IDLE		= BIT(8),
 };
 
-static inline __deprecated enum ieee80211_conf_changed
-__IEEE80211_CONF_CHANGE_BEACON_INTERVAL(void)
-{
-	return _IEEE80211_CONF_CHANGE_BEACON_INTERVAL;
-}
-#define IEEE80211_CONF_CHANGE_BEACON_INTERVAL \
-	__IEEE80211_CONF_CHANGE_BEACON_INTERVAL()
-
 /**
  * struct ieee80211_conf - configuration of the device
  *
@@ -567,7 +557,7 @@ __IEEE80211_CONF_CHANGE_BEACON_INTERVAL(
  * @flags: configuration flags defined above
  *
  * @radio_enabled: when zero, driver is required to switch off the radio.
- * @beacon_int: beacon interval (TODO make interface config)
+ * @__beacon_int: DEPRECATED, DO NOT USE
  *
  * @listen_interval: listen interval in units of beacon interval
  * @max_sleep_period: the maximum number of beacon intervals to sleep for
@@ -592,7 +582,7 @@ __IEEE80211_CONF_CHANGE_BEACON_INTERVAL(
  *    number of transmissions not the number of retries
  */
 struct ieee80211_conf {
-	int beacon_int;
+	int __beacon_int;
 	u32 flags;
 	int power_level, dynamic_ps_timeout;
 	int max_sleep_period;
@@ -606,6 +596,11 @@ struct ieee80211_conf {
 	enum nl80211_channel_type channel_type;
 };
 
+static inline __deprecated int conf_bcn_int(struct ieee80211_conf *c)
+{
+	return c->__beacon_int;
+}
+
 /**
  * struct ieee80211_vif - per-interface data
  *
--- wireless-testing.orig/net/mac80211/main.c	2009-05-23 11:06:11.000000000 +0200
+++ wireless-testing/net/mac80211/main.c	2009-05-23 11:06:42.000000000 +0200
@@ -289,16 +289,8 @@ void ieee80211_bss_info_change_notify(st
 	drv_bss_info_changed(local, &sdata->vif,
 			     &sdata->vif.bss_conf, changed);
 
-	/*
-	 * DEPRECATED
-	 *
-	 * ~changed is just there to not do this at resume time
-	 */
-	if (changed & BSS_CHANGED_BEACON_INT && ~changed) {
-		local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int;
-		ieee80211_hw_config(local,
-				    _IEEE80211_CONF_CHANGE_BEACON_INTERVAL);
-	}
+	/* DEPRECATED */
+	local->hw.conf.__beacon_int = sdata->vif.bss_conf.beacon_int;
 }
 
 u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata)
--- wireless-testing.orig/drivers/net/wireless/ath/ath5k/base.c	2009-05-23 11:07:37.000000000 +0200
+++ wireless-testing/drivers/net/wireless/ath/ath5k/base.c	2009-05-23 11:08:02.000000000 +0200
@@ -2775,7 +2775,7 @@ ath5k_config(struct ieee80211_hw *hw, u3
 
 	mutex_lock(&sc->lock);
 
-	sc->bintval = conf->beacon_int;
+	sc->bintval = conf_bcn_int(conf);
 
 	ret = ath5k_chan_set(sc, conf->channel);
 	if (ret < 0)
--- wireless-testing.orig/drivers/net/wireless/rt2x00/rt2400pci.c	2009-05-23 11:08:41.000000000 +0200
+++ wireless-testing/drivers/net/wireless/rt2x00/rt2400pci.c	2009-05-23 11:09:15.000000000 +0200
@@ -520,7 +520,7 @@ static void rt2400pci_config_ps(struct r
 	if (state == STATE_SLEEP) {
 		rt2x00pci_register_read(rt2x00dev, CSR20, &reg);
 		rt2x00_set_field32(&reg, CSR20_DELAY_AFTER_TBCN,
-				   (libconf->conf->beacon_int - 20) * 16);
+				   (conf_bcn_int(libconf->conf) - 20) * 16);
 		rt2x00_set_field32(&reg, CSR20_TBCN_BEFORE_WAKEUP,
 				   libconf->conf->listen_interval - 1);
 
--- wireless-testing.orig/drivers/net/wireless/rt2x00/rt2500pci.c	2009-05-23 11:09:25.000000000 +0200
+++ wireless-testing/drivers/net/wireless/rt2x00/rt2500pci.c	2009-05-23 11:09:34.000000000 +0200
@@ -569,7 +569,7 @@ static void rt2500pci_config_ps(struct r
 	if (state == STATE_SLEEP) {
 		rt2x00pci_register_read(rt2x00dev, CSR20, &reg);
 		rt2x00_set_field32(&reg, CSR20_DELAY_AFTER_TBCN,
-				   (libconf->conf->beacon_int - 20) * 16);
+				   (conf_bcn_int(libconf->conf) - 20) * 16);
 		rt2x00_set_field32(&reg, CSR20_TBCN_BEFORE_WAKEUP,
 				   libconf->conf->listen_interval - 1);
 
--- wireless-testing.orig/drivers/net/wireless/rt2x00/rt2500usb.c	2009-05-23 11:10:25.000000000 +0200
+++ wireless-testing/drivers/net/wireless/rt2x00/rt2500usb.c	2009-05-23 11:10:36.000000000 +0200
@@ -647,7 +647,7 @@ static void rt2500usb_config_ps(struct r
 	if (state == STATE_SLEEP) {
 		rt2500usb_register_read(rt2x00dev, MAC_CSR18, &reg);
 		rt2x00_set_field16(&reg, MAC_CSR18_DELAY_AFTER_BEACON,
-				   libconf->conf->beacon_int - 20);
+				   conf_bcn_int(libconf->conf) - 20);
 		rt2x00_set_field16(&reg, MAC_CSR18_BEACONS_BEFORE_WAKEUP,
 				   libconf->conf->listen_interval - 1);
 
--- wireless-testing.orig/drivers/net/wireless/rt2x00/rt61pci.c	2009-05-23 11:09:44.000000000 +0200
+++ wireless-testing/drivers/net/wireless/rt2x00/rt61pci.c	2009-05-23 11:10:04.000000000 +0200
@@ -956,7 +956,7 @@ static void rt61pci_config_ps(struct rt2
 	if (state == STATE_SLEEP) {
 		rt2x00pci_register_read(rt2x00dev, MAC_CSR11, &reg);
 		rt2x00_set_field32(&reg, MAC_CSR11_DELAY_AFTER_TBCN,
-				   libconf->conf->beacon_int - 10);
+				   conf_bcn_int(libconf->conf) - 10);
 		rt2x00_set_field32(&reg, MAC_CSR11_TBCN_BEFORE_WAKEUP,
 				   libconf->conf->listen_interval - 1);
 		rt2x00_set_field32(&reg, MAC_CSR11_WAKEUP_LATENCY, 5);
--- wireless-testing.orig/drivers/net/wireless/rt2x00/rt73usb.c	2009-05-23 11:10:44.000000000 +0200
+++ wireless-testing/drivers/net/wireless/rt2x00/rt73usb.c	2009-05-23 11:11:02.000000000 +0200
@@ -852,7 +852,7 @@ static void rt73usb_config_ps(struct rt2
 	if (state == STATE_SLEEP) {
 		rt2x00usb_register_read(rt2x00dev, MAC_CSR11, &reg);
 		rt2x00_set_field32(&reg, MAC_CSR11_DELAY_AFTER_TBCN,
-				   libconf->conf->beacon_int - 10);
+				   conf_bcn_int(libconf->conf) - 10);
 		rt2x00_set_field32(&reg, MAC_CSR11_TBCN_BEFORE_WAKEUP,
 				   libconf->conf->listen_interval - 1);
 		rt2x00_set_field32(&reg, MAC_CSR11_WAKEUP_LATENCY, 5);


--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux