diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 18:58:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-07-14 18:58:49 -0700 |
| commit | cf3842ec5015c862f4869e3641a8549393bb958e (patch) | |
| tree | 6c2f0158504f3463fcca1359de90b699cb636e97 /net/mac80211/ieee80211_common.h | |
| parent | b3b0b681b12478a7afa7d1f3d58be96830e16c7d (diff) | |
| parent | 63fc33ceb0ccc08b3f62d7bfe56a33eb33ca9427 (diff) | |
| download | kernel_samsung_smdk4412-cf3842ec5015c862f4869e3641a8549393bb958e.tar.gz kernel_samsung_smdk4412-cf3842ec5015c862f4869e3641a8549393bb958e.tar.bz2 kernel_samsung_smdk4412-cf3842ec5015c862f4869e3641a8549393bb958e.zip | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/ieee80211_common.h')
| -rw-r--r-- | net/mac80211/ieee80211_common.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h index b9a73e7f5f7..77c6afb7f6a 100644 --- a/net/mac80211/ieee80211_common.h +++ b/net/mac80211/ieee80211_common.h @@ -47,21 +47,16 @@ enum ieee80211_msg_type { ieee80211_msg_normal = 0, ieee80211_msg_tx_callback_ack = 1, ieee80211_msg_tx_callback_fail = 2, - ieee80211_msg_passive_scan = 3, + /* hole at 3, was ieee80211_msg_passive_scan but unused */ ieee80211_msg_wep_frame_unknown_key = 4, ieee80211_msg_michael_mic_failure = 5, /* hole at 6, was monitor but never sent to userspace */ ieee80211_msg_sta_not_assoc = 7, - ieee80211_msg_set_aid_for_sta = 8 /* used by Intersil MVC driver */, + /* 8 was ieee80211_msg_set_aid_for_sta */ ieee80211_msg_key_threshold_notification = 9, ieee80211_msg_radar = 11, }; -struct ieee80211_msg_set_aid_for_sta { - char sta_address[ETH_ALEN]; - u16 aid; -}; - struct ieee80211_msg_key_notification { int tx_rx_count; char ifname[IFNAMSIZ]; |