From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from crystal.sipsolutions.net ([195.210.38.204]:45697 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1763356AbXHJWEc (ORCPT ); Fri, 10 Aug 2007 18:04:32 -0400 Message-Id: <20070810220634.036380000@sipsolutions.net> References: <20070810220544.321975000@sipsolutions.net> Date: Sat, 11 Aug 2007 00:05:47 +0200 From: Johannes Berg To: John Linville Cc: Jiri Benc , linux-wireless Subject: [PATCH 3/4] mac80211: remove ieee80211_msg_key_threshold_notification Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: Hostapd doesn't care at the moment. Signed-off-by: Johannes Berg --- net/mac80211/ieee80211.c | 31 ++----------------------------- net/mac80211/ieee80211_common.h | 2 +- 2 files changed, 3 insertions(+), 30 deletions(-) --- wireless-dev.orig/net/mac80211/ieee80211.c 2007-08-11 00:01:06.323840246 +0200 +++ wireless-dev/net/mac80211/ieee80211.c 2007-08-11 00:01:44.943840246 +0200 @@ -233,35 +233,8 @@ void ieee80211_key_threshold_notify(stru struct ieee80211_key *key, struct sta_info *sta) { - struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); - struct sk_buff *skb; - struct ieee80211_msg_key_notification *msg; - - /* if no one will get it anyway, don't even allocate it. - * unlikely because this is only relevant for APs - * where the device must be open... */ - if (unlikely(!local->apdev)) - return; - - skb = dev_alloc_skb(sizeof(struct ieee80211_frame_info) + - sizeof(struct ieee80211_msg_key_notification)); - if (!skb) - return; - - skb_reserve(skb, sizeof(struct ieee80211_frame_info)); - msg = (struct ieee80211_msg_key_notification *) - skb_put(skb, sizeof(struct ieee80211_msg_key_notification)); - msg->tx_rx_count = key->tx_rx_count; - memcpy(msg->ifname, dev->name, IFNAMSIZ); - if (sta) - memcpy(msg->addr, sta->addr, ETH_ALEN); - else - memset(msg->addr, 0xff, ETH_ALEN); - - key->tx_rx_count = 0; - - ieee80211_rx_mgmt(local, skb, NULL, - ieee80211_msg_key_threshold_notification); + /* dummy function for when we add back support */ + /* TODO: add back support via cfg80211/nl80211 */ } static int ieee80211_mgmt_open(struct net_device *dev) --- wireless-dev.orig/net/mac80211/ieee80211_common.h 2007-08-11 00:01:42.273840246 +0200 +++ wireless-dev/net/mac80211/ieee80211_common.h 2007-08-11 00:01:44.943840246 +0200 @@ -53,7 +53,7 @@ enum ieee80211_msg_type { /* hole at 6, was monitor but never sent to userspace */ /* hole at 7, was ieee80211_msg_sta_not_assoc but now unused */ /* 8 was ieee80211_msg_set_aid_for_sta */ - ieee80211_msg_key_threshold_notification = 9, + /* hole at 9, was ieee80211_msg_key_threshold_notification */ ieee80211_msg_radar = 11, }; --