diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2007-08-28 21:01:53 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 23:48:43 (GMT) |
| commit | 82f716056fb1c214289fe6c284b0316858c1b70c (patch) | |
| tree | 913ab04947109bfeff815d3076117842f651f26d | |
| parent | 643856729e2fde781f63eb84ecb43bbad35bf1ae (diff) | |
| download | linux-82f716056fb1c214289fe6c284b0316858c1b70c.tar.xz | |
[MAC80211]: remove radar stuff
Unused in drivers, userspace and mac80211.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/mac80211.h | 6 | ||||
| -rw-r--r-- | net/mac80211/ieee80211.c | 28 | ||||
| -rw-r--r-- | net/mac80211/ieee80211_common.h | 2 |
3 files changed, 1 insertions, 35 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 427ff6d..000b8e3 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1015,12 +1015,6 @@ ieee80211_get_mc_list_item(struct ieee80211_hw *hw, /* called by driver to notify scan status completed */ void ieee80211_scan_completed(struct ieee80211_hw *hw); -/* Function to indicate Radar Detection. The low level driver must call this - * function to indicate the presence of radar in the current channel. - * Additionally the radar type also could be sent */ -int ieee80211_radar_status(struct ieee80211_hw *hw, int channel, - int radar, int radar_type); - /* return a pointer to the source address (SA) */ static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr) { diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 00df2a9..703f998 100644 --- a/net/mac80211/ieee80211.c +++ b/net/mac80211/ieee80211.c @@ -201,34 +201,6 @@ ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb, netif_rx(skb); } -int ieee80211_radar_status(struct ieee80211_hw *hw, int channel, - int radar, int radar_type) -{ - struct sk_buff *skb; - struct ieee80211_radar_info *msg; - struct ieee80211_local *local = hw_to_local(hw); - - if (!local->apdev) - return 0; - - skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) + - sizeof(struct ieee80211_radar_info)); - - if (!skb) - return -ENOMEM; - skb_reserve(skb, sizeof(struct ieee80211_frame_info)); - - msg = (struct ieee80211_radar_info *) - skb_put(skb, sizeof(struct ieee80211_radar_info)); - msg->channel = channel; - msg->radar = radar; - msg->radar_type = radar_type; - - ieee80211_rx_mgmt(local, skb, NULL, ieee80211_msg_radar); - return 0; -} -EXPORT_SYMBOL(ieee80211_radar_status); - void ieee80211_key_threshold_notify(struct net_device *dev, struct ieee80211_key *key, struct sta_info *sta) diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h index dd315a0..d0bbd00 100644 --- a/net/mac80211/ieee80211_common.h +++ b/net/mac80211/ieee80211_common.h @@ -54,7 +54,7 @@ enum ieee80211_msg_type { ieee80211_msg_sta_not_assoc = 7, /* 8 was ieee80211_msg_set_aid_for_sta */ ieee80211_msg_key_threshold_notification = 9, - ieee80211_msg_radar = 11, + /* 11 was ieee80211_msg_radar */ }; struct ieee80211_msg_key_notification { |