diff options
author | David S. Miller <davem@davemloft.net> | 2008-11-20 13:01:29 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-20 13:01:29 +0100 |
commit | f7f65d1e8bfaa92c1a419c2a52faeca835659295 (patch) | |
tree | b616a113bddb2728fca89ef3062c16b220cee620 /include | |
parent | smc911x: Fix printf format typo in smc911x driver. (diff) | |
parent | iwlagn: fix RX skb alignment (diff) | |
download | linux-f7f65d1e8bfaa92c1a419c2a52faeca835659295.tar.xz linux-f7f65d1e8bfaa92c1a419c2a52faeca835659295.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'include')
-rw-r--r-- | include/net/mac80211.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 8856e2d60e9f..73d81bc6aa75 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -74,14 +74,6 @@ */ /** - * enum ieee80211_notification_type - Low level driver notification - * @IEEE80211_NOTIFY_RE_ASSOC: start the re-association sequence - */ -enum ieee80211_notification_types { - IEEE80211_NOTIFY_RE_ASSOC, -}; - -/** * struct ieee80211_ht_bss_info - describing BSS's HT characteristics * * This structure describes most essential parameters needed @@ -1798,18 +1790,6 @@ void ieee80211_stop_tx_ba_cb_irqsafe(struct ieee80211_hw *hw, const u8 *ra, u16 tid); /** - * ieee80211_notify_mac - low level driver notification - * @hw: pointer as obtained from ieee80211_alloc_hw(). - * @notif_type: enum ieee80211_notification_types - * - * This function must be called by low level driver to inform mac80211 of - * low level driver status change or force mac80211 to re-assoc for low - * level driver internal error that require re-assoc. - */ -void ieee80211_notify_mac(struct ieee80211_hw *hw, - enum ieee80211_notification_types notif_type); - -/** * ieee80211_find_sta - find a station * * @hw: pointer as obtained from ieee80211_alloc_hw() |