diff options
| -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 427ff6d36265..000b8e3133ba 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -1015,12 +1015,6 @@ ieee80211_get_mc_list_item(struct ieee80211_hw *hw, | |||
| 1015 | /* called by driver to notify scan status completed */ | 1015 | /* called by driver to notify scan status completed */ |
| 1016 | void ieee80211_scan_completed(struct ieee80211_hw *hw); | 1016 | void ieee80211_scan_completed(struct ieee80211_hw *hw); |
| 1017 | 1017 | ||
| 1018 | /* Function to indicate Radar Detection. The low level driver must call this | ||
| 1019 | * function to indicate the presence of radar in the current channel. | ||
| 1020 | * Additionally the radar type also could be sent */ | ||
| 1021 | int ieee80211_radar_status(struct ieee80211_hw *hw, int channel, | ||
| 1022 | int radar, int radar_type); | ||
| 1023 | |||
| 1024 | /* return a pointer to the source address (SA) */ | 1018 | /* return a pointer to the source address (SA) */ |
| 1025 | static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr) | 1019 | static inline u8 *ieee80211_get_SA(struct ieee80211_hdr *hdr) |
| 1026 | { | 1020 | { |
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c index 00df2a9a2661..703f998292c8 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, | |||
| 201 | netif_rx(skb); | 201 | netif_rx(skb); |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | int ieee80211_radar_status(struct ieee80211_hw *hw, int channel, | ||
| 205 | int radar, int radar_type) | ||
| 206 | { | ||
| 207 | struct sk_buff *skb; | ||
| 208 | struct ieee80211_radar_info *msg; | ||
| 209 | struct ieee80211_local *local = hw_to_local(hw); | ||
| 210 | |||
| 211 | if (!local->apdev) | ||
| 212 | return 0; | ||
| 213 | |||
| 214 | skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) + | ||
| 215 | sizeof(struct ieee80211_radar_info)); | ||
| 216 | |||
| 217 | if (!skb) | ||
| 218 | return -ENOMEM; | ||
| 219 | skb_reserve(skb, sizeof(struct ieee80211_frame_info)); | ||
| 220 | |||
| 221 | msg = (struct ieee80211_radar_info *) | ||
| 222 | skb_put(skb, sizeof(struct ieee80211_radar_info)); | ||
| 223 | msg->channel = channel; | ||
| 224 | msg->radar = radar; | ||
| 225 | msg->radar_type = radar_type; | ||
| 226 | |||
| 227 | ieee80211_rx_mgmt(local, skb, NULL, ieee80211_msg_radar); | ||
| 228 | return 0; | ||
| 229 | } | ||
| 230 | EXPORT_SYMBOL(ieee80211_radar_status); | ||
| 231 | |||
| 232 | void ieee80211_key_threshold_notify(struct net_device *dev, | 204 | void ieee80211_key_threshold_notify(struct net_device *dev, |
| 233 | struct ieee80211_key *key, | 205 | struct ieee80211_key *key, |
| 234 | struct sta_info *sta) | 206 | struct sta_info *sta) |
diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h index dd315a057510..d0bbd00b4617 100644 --- a/net/mac80211/ieee80211_common.h +++ b/net/mac80211/ieee80211_common.h | |||
| @@ -54,7 +54,7 @@ enum ieee80211_msg_type { | |||
| 54 | ieee80211_msg_sta_not_assoc = 7, | 54 | ieee80211_msg_sta_not_assoc = 7, |
| 55 | /* 8 was ieee80211_msg_set_aid_for_sta */ | 55 | /* 8 was ieee80211_msg_set_aid_for_sta */ |
| 56 | ieee80211_msg_key_threshold_notification = 9, | 56 | ieee80211_msg_key_threshold_notification = 9, |
| 57 | ieee80211_msg_radar = 11, | 57 | /* 11 was ieee80211_msg_radar */ |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | struct ieee80211_msg_key_notification { | 60 | struct ieee80211_msg_key_notification { |
