summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-03 22:42:54 -0800
committerDavid S. Miller <davem@davemloft.net>2010-03-03 22:42:54 -0800
commite5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 (patch)
tree5ed22d681be9cc6a3677d61b0a19fcea5702d98c /include
parent1cd4efddc4512ccbd9fe317f688f361605ca0c88 (diff)
parent31f66be44a657a14e0ab3536e4877c66c9ce031e (diff)
downloadop-kernel-dev-e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3.zip
op-kernel-dev-e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'include')
-rw-r--r--include/linux/rfkill.h2
-rw-r--r--include/net/mac80211.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index 97059d0..4f82326 100644
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -29,7 +29,7 @@
/**
* enum rfkill_type - type of rfkill switch.
*
- * @RFKILL_TYPE_ALL: toggles all switches (userspace only)
+ * @RFKILL_TYPE_ALL: toggles all switches (requests only - not a switch type)
* @RFKILL_TYPE_WLAN: switch is on a 802.11 wireless network device.
* @RFKILL_TYPE_BLUETOOTH: switch is on a bluetooth device.
* @RFKILL_TYPE_UWB: switch is on a ultra wideband device.
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 80eb7cc..45d7d44 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -2426,7 +2426,8 @@ struct rate_control_ops {
struct ieee80211_sta *sta, void *priv_sta);
void (*rate_update)(void *priv, struct ieee80211_supported_band *sband,
struct ieee80211_sta *sta,
- void *priv_sta, u32 changed);
+ void *priv_sta, u32 changed,
+ enum nl80211_channel_type oper_chan_type);
void (*free_sta)(void *priv, struct ieee80211_sta *sta,
void *priv_sta);
OpenPOWER on IntegriCloud