diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 16:12:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 16:12:14 -0500 |
commit | 4dd61d92d7204788b93b064a679c9068fc5b8a5f (patch) | |
tree | 90dc522b71d06a336773f919def0fd99d59156c9 /include | |
parent | 95763dd52b4b9b3578d3428001ece1e11b016ffc (diff) | |
parent | 5ece6c2ddd6f7da9e95dc325c742c0f5afbcecbe (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits)
net: fix tiny output corruption of /proc/net/snmp6
atl2: don't request irq on resume if netif running
ipv6: use seq_release_private for ip6mr.c /proc entries
pkt_sched: fix missing check for packet overrun in qdisc_dump_stab()
smc911x: Fix printf format typo in smc911x driver.
asix: Fix asix-based cards connecting to 10/100Mbs LAN.
mv643xx_eth: fix recycle check bound
mv643xx_eth: fix the order of mdiobus_{unregister, free}() calls
sh: sh_eth: Update to change of mii_bus
TPROXY: supply a struct flowi->flags argument in inet_sk_rebuild_header()
TPROXY: fill struct flowi->flags in udp_sendmsg()
net: ipg.c fix bracing on endian swapping
phylib: Fix auto-negotiation restart avoidance
net: jme.c rxdesc.flags is __le16, other missing endian swaps
phylib: fix phy name example in documentation
net: Do not fire linkwatch events until the device is registered.
phonet: fix compilation with gcc-3.4
ixgbe: fix compilation with gcc-3.4
pktgen: fix multiple queue warning
net: fix ip_mr_init() error path
...
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 8856e2d60e9..73d81bc6aa7 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
@@ -74,14 +74,6 @@ | |||
74 | */ | 74 | */ |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * enum ieee80211_notification_type - Low level driver notification | ||
78 | * @IEEE80211_NOTIFY_RE_ASSOC: start the re-association sequence | ||
79 | */ | ||
80 | enum ieee80211_notification_types { | ||
81 | IEEE80211_NOTIFY_RE_ASSOC, | ||
82 | }; | ||
83 | |||
84 | /** | ||
85 | * struct ieee80211_ht_bss_info - describing BSS's HT characteristics | 77 | * struct ieee80211_ht_bss_info - describing BSS's HT characteristics |
86 | * | 78 | * |
87 | * This structure describes most essential parameters needed | 79 | * 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, | |||
1798 | u16 tid); | 1790 | u16 tid); |
1799 | 1791 | ||
1800 | /** | 1792 | /** |
1801 | * ieee80211_notify_mac - low level driver notification | ||
1802 | * @hw: pointer as obtained from ieee80211_alloc_hw(). | ||
1803 | * @notif_type: enum ieee80211_notification_types | ||
1804 | * | ||
1805 | * This function must be called by low level driver to inform mac80211 of | ||
1806 | * low level driver status change or force mac80211 to re-assoc for low | ||
1807 | * level driver internal error that require re-assoc. | ||
1808 | */ | ||
1809 | void ieee80211_notify_mac(struct ieee80211_hw *hw, | ||
1810 | enum ieee80211_notification_types notif_type); | ||
1811 | |||
1812 | /** | ||
1813 | * ieee80211_find_sta - find a station | 1793 | * ieee80211_find_sta - find a station |
1814 | * | 1794 | * |
1815 | * @hw: pointer as obtained from ieee80211_alloc_hw() | 1795 | * @hw: pointer as obtained from ieee80211_alloc_hw() |