summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-18 17:29:21 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:52:33 -0700
commitd86ec781ef9627a3fcd64a7a91d1b79a74d3927b (patch)
tree377a14668e77254ee85675320513f4823849b1b0 /net
parentc095df531f3ab9699b031e220c0da76d6407b157 (diff)
downloadkernel-crypto-d86ec781ef9627a3fcd64a7a91d1b79a74d3927b.tar.gz
kernel-crypto-d86ec781ef9627a3fcd64a7a91d1b79a74d3927b.tar.xz
kernel-crypto-d86ec781ef9627a3fcd64a7a91d1b79a74d3927b.zip
[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>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/debugfs_sta.c1
-rw-r--r--net/mac80211/sta_info.h2
2 files changed, 0 insertions, 3 deletions
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