* [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings.
@ 2010-11-08 16:01 Atul Sowani
2010-11-08 17:49 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Atul Sowani @ 2010-11-08 16:01 UTC (permalink / raw)
To: johannes; +Cc: linux-wireless, linux-kernel
Added conditional compilation with CONFIG_MAC80211_MESH to avoid compile time
warning about declared but unused variable.
Signed-off-by: Atul Sowani <sowani@gmail.com>
---
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 (sowani@gmail.com)
http://savannah.gnu.org/users/atul
------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings.
2010-11-08 16:01 [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings Atul Sowani
@ 2010-11-08 17:49 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2010-11-08 17:49 UTC (permalink / raw)
To: sowani; +Cc: linux-wireless, linux-kernel
On Mon, 08 Nov 2010 21:31:33 +0530, Atul Sowani <sowani@gmail.com> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-11-08 17:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-08 16:01 [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings Atul Sowani
2010-11-08 17:49 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).