aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-01 20:36:13 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-01 20:36:13 +0100
commitf6d2e6f57bba66272b28dd20c949b14ce39cb804 (patch)
tree2bf153af4d5b4b33ad2c1e88347c7fd752fb6332 /include/net
parent8caac56305cef98f9357b060a77939d17699937d (diff)
parent7b1dedca42ac0d0d0be01e39d8461bb53a2389b3 (diff)
Merge branch 'x86/urgent' into x86/iommu
Diffstat (limited to 'include/net')
-rw-r--r--include/net/mac80211.h20
1 files changed, 0 insertions, 20 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 8856e2d60e9..73d81bc6aa7 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()