2010-11-08 16:02:34

by Atul Sowani

Subject: [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings.

Added conditional compilation with CONFIG_MAC80211_MESH to avoid compile time
warning about declared but unused variable.

Signed-off-by: Atul Sowani <[email protected]>
---
diff -uprN a/net/mac80211/tx.c b/net/mac80211/tx.c
--- a/net/mac80211/tx.c 2010-10-21 02:00:22.000000000 +0530
+++ b/net/mac80211/tx.c 2010-11-08 10:37:42.331750460 +0530
@@ -1699,7 +1699,9 @@ netdev_tx_t ieee80211_subif_start_xmit(s
u16 ethertype, hdrlen, meshhdrlen = 0;
__le16 fc;
struct ieee80211_hdr hdr;
+#ifdef CONFIG_MAC80211_MESH
struct ieee80211s_hdr mesh_hdr;
+#endif
const u8 *encaps_data;
int encaps_len, skip_header_bytes;
int nh_pos, h_pos;

--
Atul Sowani ([email protected])
http://savannah.gnu.org/users/atul
------------------------------------------------------------------------

2010-11-08 17:49:10

by Johannes Berg

Subject: Re: [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings.

On Mon, 08 Nov 2010 21:31:33 +0530, Atul Sowani <[email protected]> wrote:
> Added conditional compilation with CONFIG_MAC80211_MESH to avoid compile
> time
> warning about declared but unused variable.

2.6.36? Really? a trivial warning fix for the stable tree? I don't think
so...


> +#ifdef CONFIG_MAC80211_MESH
> struct ieee80211s_hdr mesh_hdr;
> +#endif

Besides, it should be __maybe_unused.

johannes