Add sg helpers for iterating over a scatterlist table

[safe/jmp/linux-2.6] / net / mac80211 / ieee80211_common.h

diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h
index 77c6afb..c15295d 100644 (file)
--- a/net/mac80211/ieee80211_common.h
+++ b/net/mac80211/ieee80211_common.h
@@ -48,13 +48,13 @@ enum ieee80211_msg_type {
        ieee80211_msg_tx_callback_ack = 1,
        ieee80211_msg_tx_callback_fail = 2,
        /* hole at 3, was ieee80211_msg_passive_scan but unused */
-       ieee80211_msg_wep_frame_unknown_key = 4,
+       /* hole at 4, was ieee80211_msg_wep_frame_unknown_key but now unused */
        ieee80211_msg_michael_mic_failure = 5,
        /* hole at 6, was monitor but never sent to userspace */
        ieee80211_msg_sta_not_assoc = 7,
        /* 8 was ieee80211_msg_set_aid_for_sta */
-       ieee80211_msg_key_threshold_notification = 9,
-       ieee80211_msg_radar = 11,
+       /* 9 was ieee80211_msg_key_threshold_notification */
+       /* 11 was ieee80211_msg_radar */
 };
 
 struct ieee80211_msg_key_notification {
@@ -73,8 +73,6 @@ enum ieee80211_phytype {
        ieee80211_phytype_ofdm_dot11_g   = 6,
        ieee80211_phytype_pbcc_dot11_g   = 7,
        ieee80211_phytype_ofdm_dot11_a   = 8,
-       ieee80211_phytype_dsss_dot11_turbog = 255,
-       ieee80211_phytype_dsss_dot11_turbo = 256,
 };
 
 enum ieee80211_ssi_type {