From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from crystal.sipsolutions.net ([195.210.38.204]:43751 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932823AbXHOOxd (ORCPT ); Wed, 15 Aug 2007 10:53:33 -0400 Message-Id: <20070815145042.613693000@sipsolutions.net> References: <20070815144920.135826000@sipsolutions.net> Date: Wed, 15 Aug 2007 16:49:23 +0200 From: Johannes Berg To: John Linville Cc: Jiri Benc , Michael Wu , linux-wireless@vger.kernel.org Subject: [PATCH 03/20] mac80211: remove radar stuff Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: Unused in drivers, userspace and mac80211. Signed-off-by: Johannes Berg --- include/net/mac80211.h | 6 ------ net/mac80211/ieee80211.c | 28 ---------------------------- net/mac80211/ieee80211_common.h | 2 +- 3 files changed, 1 insertion(+), 35 deletions(-) --- wireless-dev.orig/include/net/mac80211.h 2007-08-15 14:04:48.196516958 +0200 +++ wireless-dev/include/net/mac80211.h 2007-08-15 14:07:04.636516958 +0200 @@ -1038,12 +1038,6 @@ ieee80211_get_mc_list_item(struct ieee80 /* 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) { --- wireless-dev.orig/net/mac80211/ieee80211.c 2007-08-15 14:06:33.976516958 +0200 +++ wireless-dev/net/mac80211/ieee80211.c 2007-08-15 14:07:04.636516958 +0200 @@ -201,34 +201,6 @@ ieee80211_rx_mgmt(struct ieee80211_local 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) --- wireless-dev.orig/net/mac80211/ieee80211_common.h 2007-08-15 14:06:34.006516958 +0200 +++ wireless-dev/net/mac80211/ieee80211_common.h 2007-08-15 14:07:04.636516958 +0200 @@ -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 { --