Re: [PATCH] ath9k: remove useless NULL initialisers

Re: [PATCH] ath9k: remove useless NULL initialisers

[Luis R. Rodriguez]

[-- Attachment #1: Type: text/plain, Size: 1834 bytes --]

Seems you forgot to cc linux-wireless so I'll leave the entire patch
in my reply. Seems right for stable too, so sending a reduced version
which applies to it (using gmail right now, will send shortly inline).

On Tue, Oct 28, 2008 at 8:59 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> When I added .set_frag_threshold I didn't realise it was already
> there which now generated a sparse warning. Therefore, remove
> the .set_frag_threshold NULL initialiser, and while at it all the
> other useless ones.
>
> Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

ACKed-by: lrodriguez@atheros.com

  Luis

> ---
>  drivers/net/wireless/ath9k/main.c |    8 --------
>  1 file changed, 8 deletions(-)
>
> --- everything.orig/drivers/net/wireless/ath9k/main.c   2008-10-28 16:57:36.000000000 +0100
> +++ everything/drivers/net/wireless/ath9k/main.c        2008-10-28 16:57:45.000000000 +0100
> @@ -1651,20 +1651,12 @@ static struct ieee80211_ops ath9k_ops =
>        .config             = ath9k_config,
>        .config_interface   = ath9k_config_interface,
>        .configure_filter   = ath9k_configure_filter,
> -       .get_stats          = NULL,
>        .sta_notify         = ath9k_sta_notify,
>        .conf_tx            = ath9k_conf_tx,
> -       .get_tx_stats       = NULL,
>        .bss_info_changed   = ath9k_bss_info_changed,
> -       .set_tim            = NULL,
>        .set_key            = ath9k_set_key,
> -       .hw_scan            = NULL,
> -       .get_tkip_seq       = NULL,
> -       .set_rts_threshold  = NULL,
> -       .set_frag_threshold = NULL,
>        .get_tsf            = ath9k_get_tsf,
>        .reset_tsf          = ath9k_reset_tsf,
> -       .tx_last_beacon     = NULL,
>        .ampdu_action       = ath9k_ampdu_action,
>        .set_frag_threshold = ath9k_no_fragmentation,
>  };
>
>
>

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: remove-dupe-frag.patch --]
[-- Type: text/x-patch; name=remove-dupe-frag.patch, Size: 399 bytes --]

--- a/drivers/net/wireless/ath9k/main.c.orig	2008-10-28 11:55:49.000000000 -0700
+++ b/drivers/net/wireless/ath9k/main.c	2008-10-28 11:56:00.000000000 -0700
@@ -1031,7 +1031,6 @@
 	.hw_scan            = NULL,
 	.get_tkip_seq       = NULL,
 	.set_rts_threshold  = NULL,
-	.set_frag_threshold = NULL,
 	.set_retry_limit    = NULL,
 	.get_tsf 	    = ath9k_get_tsf,
 	.reset_tsf 	    = ath9k_reset_tsf,

[PATCH] ath9k: remove duplicate set_frag_threshold

[Luis R. Rodriguez]

This removes a duplicate set_frag_threshold which was overlooked.
The last set_frag_threshold simply overwrites the pointer for
set_rts_threshold so no harm is currently done.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Luis R. Rodriguez" <lrodriguez@atheros.com>

---

Feel free to ignore this patch for stable as I see no issue
with the current behaviour which would cause an oops.

--- a/drivers/net/wireless/ath9k/main.c.orig	2008-10-28 11:55:49.000000000 -0700
+++ b/drivers/net/wireless/ath9k/main.c	2008-10-28 11:56:00.000000000 -0700
@@ -1031,7 +1031,6 @@
 	.hw_scan            = NULL,
 	.get_tkip_seq       = NULL,
 	.set_rts_threshold  = NULL,
-	.set_frag_threshold = NULL,
 	.set_retry_limit    = NULL,
 	.get_tsf 	    = ath9k_get_tsf,
 	.reset_tsf 	    = ath9k_reset_tsf,