mac80211: remove event.c

That file contains just a single function, which itself is just a
single statement to call a different function. Remove it.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 783e891b7525c537bcab70b1be7c603e5f6d1f0d..f9137a8341f4db16b9dca579b0ed8f5300a59767 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -27,7 +27,6 @@ mac80211-y := \
        key.o \
        util.o \
        wme.o \
-       event.o \
        chan.o \
        trace.o mlme.o \
        tdls.o \

diff --git a/net/mac80211/event.c b/net/mac80211/event.c
deleted file mode 100644 (file)
index 01ae759..0000000
--- a/net/mac80211/event.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2007      Johannes Berg <johannes@sipsolutions.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * mac80211 - events
- */
-#include <net/cfg80211.h>
-#include "ieee80211_i.h"
-
-/*
- * Indicate a failed Michael MIC to userspace. If the caller knows the TSC of
- * the frame that generated the MIC failure (i.e., if it was provided by the
- * driver or is still in the frame), it should provide that information.
- */
-void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,
-                                    struct ieee80211_hdr *hdr, const u8 *tsc,
-                                    gfp_t gfp)
-{
-       cfg80211_michael_mic_failure(sdata->dev, hdr->addr2,
-                                    (hdr->addr1[0] & 0x01) ?
-                                    NL80211_KEYTYPE_GROUP :
-                                    NL80211_KEYTYPE_PAIRWISE,
-                                    keyidx, tsc, gfp);
-}

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 04b62435f37eb2873d8686fd0f92f82a9bdb2d90..056d3721148c6a36fe3294d84a28c565844e697c 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -1765,9 +1765,6 @@ extern const void *const mac80211_wiphy_privid; /* for wiphy privid */
 int ieee80211_frame_duration(enum ieee80211_band band, size_t len,
                             int rate, int erp, int short_preamble,
                             int shift);
-void mac80211_ev_michael_mic_failure(struct ieee80211_sub_if_data *sdata, int keyidx,
-                                    struct ieee80211_hdr *hdr, const u8 *tsc,
-                                    gfp_t gfp);
 void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata,
                               bool bss_notify);
 void ieee80211_xmit(struct ieee80211_sub_if_data *sdata,

diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c
index feb547dc8643ab286fa0c64f19b01e2b4766898e..d824c38971ed53ff702669c9bce0f4a86495bdd0 100644 (file)
--- a/net/mac80211/wpa.c
+++ b/net/mac80211/wpa.c
@@ -174,9 +174,12 @@ mic_fail_no_key:
         * a driver that supports HW encryption. Send up the key idx only if
         * the key is set.
         */
-       mac80211_ev_michael_mic_failure(rx->sdata,
-                                       rx->key ? rx->key->conf.keyidx : -1,
-                                       (void *) skb->data, NULL, GFP_ATOMIC);
+       cfg80211_michael_mic_failure(rx->sdata->dev, hdr->addr2,
+                                    is_multicast_ether_addr(hdr->addr1) ?
+                                    NL80211_KEYTYPE_GROUP :
+                                    NL80211_KEYTYPE_PAIRWISE,
+                                    rx->key ? rx->key->conf.keyidx : -1,
+                                    NULL, GFP_ATOMIC);
        return RX_DROP_UNUSABLE;
 }