[MAC80211]: remove key threshold stuff

This patch removes the key threshold stuff from mac80211.
I have patches for later that add it as a per-key setting
to nl/cfg80211.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

8 files changed, 3 insertions, 68 deletions

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 12db9adc0361..60514b2c97b9 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -90,8 +90,6 @@ DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d",
                       local->hw.conf.antenna_sel_rx);
 DEBUGFS_READONLY_FILE(bridge_packets, 20, "%d",
                       local->bridge_packets);
-DEBUGFS_READONLY_FILE(key_tx_rx_threshold, 20, "%d",
-                      local->key_tx_rx_threshold);
 DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d",
                       local->rts_threshold);
 DEBUGFS_READONLY_FILE(fragmentation_threshold, 20, "%d",
@@ -301,7 +299,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
         DEBUGFS_ADD(antenna_sel_tx);
         DEBUGFS_ADD(antenna_sel_rx);
         DEBUGFS_ADD(bridge_packets);
-        DEBUGFS_ADD(key_tx_rx_threshold);
         DEBUGFS_ADD(rts_threshold);
         DEBUGFS_ADD(fragmentation_threshold);
         DEBUGFS_ADD(short_retry_limit);
@@ -364,7 +361,6 @@ void debugfs_hw_del(struct ieee80211_local *local)
         DEBUGFS_DEL(antenna_sel_tx);
         DEBUGFS_DEL(antenna_sel_rx);
         DEBUGFS_DEL(bridge_packets);
-        DEBUGFS_DEL(key_tx_rx_threshold);
         DEBUGFS_DEL(rts_threshold);
         DEBUGFS_DEL(fragmentation_threshold);
         DEBUGFS_DEL(short_retry_limit);
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index ac812ec9fa2f..2300c5516458 100644
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -32,7 +32,6 @@ enum {
         PRISM2_PARAM_PREAMBLE = 1003,
         PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
         PRISM2_PARAM_NEXT_MODE = 1008,
-        PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,
         PRISM2_PARAM_WIFI_WME_NOACK_TEST = 1033,
         PRISM2_PARAM_SCAN_FLAGS = 1035,
         PRISM2_PARAM_HW_MODES = 1036,
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 23853331e8db..5e924588e9a2 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -189,41 +189,6 @@ ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb,
         netif_rx(skb);
 }
 
-void ieee80211_key_threshold_notify(struct net_device *dev,
-                                    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);
-}
-
 static int ieee80211_mgmt_open(struct net_device *dev)
 {
         struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
diff --git a/net/mac80211/ieee80211_common.h b/net/mac80211/ieee80211_common.h
index 5b5fb7bcfd72..c15295d43d87 100644
--- a/net/mac80211/ieee80211_common.h
+++ b/net/mac80211/ieee80211_common.h
@@ -53,7 +53,7 @@ enum ieee80211_msg_type {
         /* hole at 6, was monitor but never sent to userspace */
         ieee80211_msg_sta_not_assoc = 7,
         /* 8 was ieee80211_msg_set_aid_for_sta */
-        ieee80211_msg_key_threshold_notification = 9,
+        /* 9 was ieee80211_msg_key_threshold_notification */
         /* 11 was ieee80211_msg_radar */
 };
 
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 14e8c366af3d..c3f6f89755b1 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -465,9 +465,6 @@ struct ieee80211_local {
         struct crypto_blkcipher *wep_tx_tfm;
         struct crypto_blkcipher *wep_rx_tfm;
         u32 wep_iv;
-        int key_tx_rx_threshold; /* number of times any key can be used in TX
-                                  * or RX before generating a rekey
-                                  * notification; 0 = notification disabled. */
 
         int bridge_packets; /* bridge packets between associated stations and
                              * deliver multicast frames both back to wireless
@@ -573,7 +570,6 @@ struct ieee80211_local {
                 struct dentry *antenna_sel_tx;
                 struct dentry *antenna_sel_rx;
                 struct dentry *bridge_packets;
-                struct dentry *key_tx_rx_threshold;
                 struct dentry *rts_threshold;
                 struct dentry *fragmentation_threshold;
                 struct dentry *short_retry_limit;
@@ -724,9 +720,6 @@ void ieee80211_if_setup(struct net_device *dev);
 void ieee80211_if_mgmt_setup(struct net_device *dev);
 struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local,
                                           int phymode, int hwrate);
-void ieee80211_key_threshold_notify(struct net_device *dev,
-                                    struct ieee80211_key *key,
-                                    struct sta_info *sta);
 
 /* ieee80211_ioctl.c */
 extern const struct iw_handler_def ieee80211_iw_handler_def;
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index b4cce441d7e6..99023d0d7edc 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -912,10 +912,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
                 local->next_mode = hostapd_mode_to_mode(value);
                 break;
 
-        case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:
-                local->key_tx_rx_threshold = value;
-                break;
-
         case PRISM2_PARAM_WIFI_WME_NOACK_TEST:
                 local->wifi_wme_noack_test = value;
                 break;
@@ -1011,10 +1007,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
                 *param = local->next_mode;
                 break;
 
-        case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:
-                *param = local->key_tx_rx_threshold;
-                break;
-
         case PRISM2_PARAM_WIFI_WME_NOACK_TEST:
                 *param = local->wifi_wme_noack_test;
                 break;
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index cf2a72f89d68..9700c1c5b3cf 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -409,12 +409,7 @@ ieee80211_rx_h_load_key(struct ieee80211_txrx_data *rx)
 
         if (rx->key) {
                 rx->key->tx_rx_count++;
-                if (unlikely(rx->local->key_tx_rx_threshold &&
-                             rx->key->tx_rx_count >
-                             rx->local->key_tx_rx_threshold)) {
-                        ieee80211_key_threshold_notify(rx->dev, rx->key,
-                                                       rx->sta);
-                }
+                /* TODO: add threshold stuff again */
         }
 
         return TXRX_CONTINUE;
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 04b4fa9c69ea..e33f7641e6b4 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -451,12 +451,7 @@ ieee80211_tx_h_select_key(struct ieee80211_txrx_data *tx)
 
         if (tx->key) {
                 tx->key->tx_rx_count++;
-                if (unlikely(tx->local->key_tx_rx_threshold &&
-                             tx->key->tx_rx_count >
-                             tx->local->key_tx_rx_threshold)) {
-                        ieee80211_key_threshold_notify(tx->dev, tx->key,
-                                                       tx->sta);
-                }
+                /* TODO: add threshold stuff again */
         }
 
         return TXRX_CONTINUE;