mac80211: remove ieee80211_netif_oper from mac80211.h
From: Michael Wu <flamingice@xxxxxxxxxxxx>
rt2x00 was the last user of ieee80211_netif_oper outside of mac80211.
ieee80211_netif_oper can now be removed from mac80211.h
Signed-off-by: Michael Wu <flamingice@xxxxxxxxxxxx>
---
include/net/mac80211.h | 11 -----------
net/mac80211/ieee80211.c | 1 -
net/mac80211/ieee80211_i.h | 6 ++++++
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 2ec1d04..0c7e088 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -975,17 +975,6 @@ int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb);
/* Like ieee80211_get_hdrlen_from_skb() but takes a FC in CPU order. */
int ieee80211_get_hdrlen(u16 fc);
-/* Function for net interface operation. IEEE 802.11 may use multiple kernel
- * netdevices for each hardware device. The low-level driver does not "see"
- * these interfaces, so it should use this function to perform netif
- * operations on all interface. */
-/* This function is deprecated. */
-typedef enum {
- NETIF_ATTACH, NETIF_DETACH, NETIF_START, NETIF_STOP, NETIF_WAKE,
- NETIF_IS_STOPPED, NETIF_UPDATE_TX_START
-} Netif_Oper;
-int ieee80211_netif_oper(struct ieee80211_hw *hw, Netif_Oper op);
-
/**
* ieee80211_wake_queue - wake specific queue
* @hw: pointer as obtained from ieee80211_alloc_hw().
diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 439246a..fae3666 100644
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -5069,7 +5069,6 @@ int ieee80211_netif_oper(struct ieee80211_hw *hw, Netif_Oper op)
return 0;
}
-EXPORT_SYMBOL(ieee80211_netif_oper);
void ieee80211_wake_queue(struct ieee80211_hw *hw, int queue)
{
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 3205bfe..2bf26cf 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -761,6 +761,12 @@ void ieee80211_if_mgmt_setup(struct net_device *dev);
int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
const char *name);
struct net_device_stats *ieee80211_dev_stats(struct net_device *dev);
+/* This function is deprecated. */
+typedef enum {
+ NETIF_ATTACH, NETIF_DETACH, NETIF_START, NETIF_STOP, NETIF_WAKE,
+ NETIF_IS_STOPPED, NETIF_UPDATE_TX_START
+} Netif_Oper;
+int ieee80211_netif_oper(struct ieee80211_hw *hw, Netif_Oper op);
/* ieee80211_ioctl.c */
int ieee80211_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
Attachment:
pgpHYFV5knpoI.pgp
Description: PGP signature
