From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 18 Sep 2007 21:29:21 +0000 (-0400)
Subject: [MAC80211]: kill vlan_id
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d86ec781ef9627a3fcd64a7a91d1b79a74d3927b;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

[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 f7c717c906d..8f5944c53d4 100644
--- 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 e3ae0f5cc22..8f7ebe41c02 100644
--- 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