[MAC80211]: kill vlan_id

Each station has a vlan_id that is useless. Remove it.

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>

diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
index f7c717c906dc1a7f777c46e73bb3f6ccf7ae9bc5..8f5944c53d4e36166cbf09c0afce26e8e6392c76 100644 (file)
--- a/net/mac80211/debugfs_sta.c
+++ b/net/mac80211/debugfs_sta.c
@@ -61,7 +61,6 @@ static const struct file_operations sta_ ##name## _ops = {            \
 
 STA_FILE(aid, aid, D);
 STA_FILE(dev, dev->name, S);
-STA_FILE(vlan_id, vlan_id, D);
 STA_FILE(rx_packets, rx_packets, LU);
 STA_FILE(tx_packets, tx_packets, LU);
 STA_FILE(rx_bytes, rx_bytes, LU);

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index e3ae0f5cc228deea3998ea75f505c1fe8cb022ba..8f7ebe41c0246a91d687a1ac91e79509dc062b5f 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -97,8 +97,6 @@ struct sta_info {
        unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES];
 #endif /* CONFIG_MAC80211_DEBUG_COUNTERS */
 
-       int vlan_id;
-
        u16 listen_interval;
 
 #ifdef CONFIG_MAC80211_DEBUGFS