2009-01-06 08:51:27

by Rami Rosen

[permalink] [raw]

Subject: [PATCH 5/6] mac80211: remove unused variable in ieee80211_local (dot11WEPUndecryptableCount).

---

This patch removes and unused declaration of dot11WEPUndecryptableCount (an
snmp counter) in ieee80211_local structure ; this counter is not
incremented/decremented
anywhere.


(wireless-testing).

Signed-off-by: Rami Rosen <[email protected]>

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 2697a2f..39f00e1 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -136,8 +136,6 @@ DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
local->dot11MulticastReceivedFrameCount);
DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
local->dot11TransmittedFrameCount);
-DEBUGFS_STATS_FILE(wep_undecryptable_count, 20, "%u",
- local->dot11WEPUndecryptableCount);
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
DEBUGFS_STATS_FILE(tx_handlers_drop, 20, "%u",
local->tx_handlers_drop);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 117718b..c45db51 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -650,7 +650,6 @@ struct ieee80211_local {
u32 dot11ReceivedFragmentCount;
u32 dot11MulticastReceivedFrameCount;
u32 dot11TransmittedFrameCount;
- u32 dot11WEPUndecryptableCount;

#ifdef CONFIG_MAC80211_LEDS
int tx_led_counter, rx_led_counter;

2009-01-06 13:01:36

by Johannes Berg

[permalink] [raw]

Subject: Re: [PATCH 5/6] mac80211: remove unused variable in ieee80211_local (dot11WEPUndecryptableCount).

---

On Tue, 2009-01-06 at 10:51 +0200, Rami Rosen wrote:
> This patch removes and unused declaration of dot11WEPUndecryptableCount (an
> snmp counter) in ieee80211_local structure ; this counter is not
> incremented/decremented
> anywhere.
>
>
> (wireless-testing).
>
> Signed-off-by: Rami Rosen <[email protected]>
>
> diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
> index 2697a2f..39f00e1 100644
> --- a/net/mac80211/debugfs.c
> +++ b/net/mac80211/debugfs.c
> @@ -136,8 +136,6 @@ DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
> local->dot11MulticastReceivedFrameCount);
> DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
> local->dot11TransmittedFrameCount);
> -DEBUGFS_STATS_FILE(wep_undecryptable_count, 20, "%u",
> - local->dot11WEPUndecryptableCount);

this won't compile

johannes

---

Attachments:

signature.asc (836.00 B)
This is a digitally signed message part

2009-01-06 13:24:59

by Rami Rosen

[permalink] [raw]

Subject: [PATCH 5/6] [v2] mac80211: remove unused variable in ieee80211_local (dot11WEPUndecryptableCount).

---

This patch removes an unused declaration of dot11WEPUndecryptableCount
(an snmp counter) in ieee80211_local structure and its usage in
debugfs.c since this counter is not incremented/decremented anywhere.


(wireless-testing).

Signed-off-by: Rami Rosen <[email protected]>

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 2697a2f..18541bb 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -136,8 +136,6 @@ DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
local->dot11MulticastReceivedFrameCount);
DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
local->dot11TransmittedFrameCount);
-DEBUGFS_STATS_FILE(wep_undecryptable_count, 20, "%u",
- local->dot11WEPUndecryptableCount);
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
DEBUGFS_STATS_FILE(tx_handlers_drop, 20, "%u",
local->tx_handlers_drop);
@@ -221,7 +219,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
DEBUGFS_STATS_ADD(received_fragment_count);
DEBUGFS_STATS_ADD(multicast_received_frame_count);
DEBUGFS_STATS_ADD(transmitted_frame_count);
- DEBUGFS_STATS_ADD(wep_undecryptable_count);
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
DEBUGFS_STATS_ADD(tx_handlers_drop);
DEBUGFS_STATS_ADD(tx_handlers_queued);
@@ -268,7 +265,6 @@ void debugfs_hw_del(struct ieee80211_local *local)
DEBUGFS_STATS_DEL(received_fragment_count);
DEBUGFS_STATS_DEL(multicast_received_frame_count);
DEBUGFS_STATS_DEL(transmitted_frame_count);
- DEBUGFS_STATS_DEL(wep_undecryptable_count);
DEBUGFS_STATS_DEL(num_scans);
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
DEBUGFS_STATS_DEL(tx_handlers_drop);
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 117718b..c45db51 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -650,7 +650,6 @@ struct ieee80211_local {
u32 dot11ReceivedFragmentCount;
u32 dot11MulticastReceivedFrameCount;
u32 dot11TransmittedFrameCount;
- u32 dot11WEPUndecryptableCount;

#ifdef CONFIG_MAC80211_LEDS
int tx_led_counter, rx_led_counter;

On Tue, Jan 6, 2009 at 3:02 PM, Johannes Berg <[email protected]> wrote:
> On Tue, 2009-01-06 at 10:51 +0200, Rami Rosen wrote:
>> This patch removes and unused declaration of dot11WEPUndecryptableCount (an
>> snmp counter) in ieee80211_local structure ; this counter is not
>> incremented/decremented
>> anywhere.
>>
>>
>> (wireless-testing).
>>
>> Signed-off-by: Rami Rosen <[email protected]>
>>
>> diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
>> index 2697a2f..39f00e1 100644
>> --- a/net/mac80211/debugfs.c
>> +++ b/net/mac80211/debugfs.c
>> @@ -136,8 +136,6 @@ DEBUGFS_STATS_FILE(multicast_received_frame_count, 20, "%u",
>> local->dot11MulticastReceivedFrameCount);
>> DEBUGFS_STATS_FILE(transmitted_frame_count, 20, "%u",
>> local->dot11TransmittedFrameCount);
>> -DEBUGFS_STATS_FILE(wep_undecryptable_count, 20, "%u",
>> - local->dot11WEPUndecryptableCount);
>
> this won't compile
>
> johannes
>