From: Johannes Berg Date: Tue, 18 Sep 2007 21:29:21 +0000 (-0400) Subject: [MAC80211]: kill vlan_id X-Git-Tag: v2.6.24-rc1~1454^2~367 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d86ec781ef9627a3fcd64a7a91d1b79a74d3927b;p=linux-2.6 [MAC80211]: kill vlan_id Each station has a vlan_id that is useless. Remove it. Signed-off-by: Johannes Berg Signed-off-by: Michael Wu Signed-off-by: John W. Linville Signed-off-by: David S. Miller --- diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c index f7c717c906..8f5944c53d 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 e3ae0f5cc2..8f7ebe41c0 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