Return-path: Received: from mail-pv0-f174.google.com ([74.125.83.174]:53092 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753284Ab0KHQCc (ORCPT ); Mon, 8 Nov 2010 11:02:32 -0500 Message-ID: <4CD81EDD.1000309@gmail.com> Date: Mon, 08 Nov 2010 21:31:33 +0530 From: Atul Sowani Reply-To: sowani@gmail.com MIME-Version: 1.0 To: johannes@sipsolutions.net CC: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2.6.36 1/1] mac80211: fix for tx.c compiler warnings. Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Added conditional compilation with CONFIG_MAC80211_MESH to avoid compile time warning about declared but unused variable. Signed-off-by: Atul Sowani --- 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 ------------------------------------------------------------------------