[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1284289829-25425-3-git-send-email-felipe.contreras@gmail.com>
Date: Sun, 12 Sep 2010 14:10:29 +0300
From: Felipe Contreras <felipe.contreras@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Jiri Kosina <jkosina@...e.cz>,
Felipe Contreras <felipe.contreras@...il.com>,
Johannes Berg <johannes@...solutions.net>,
"John W. Linville" <linville@...driver.com>,
"David S. Miller" <davem@...emloft.net>,
Kalle Valo <kalle.valo@....fi>,
Felix Fietkau <nbd@...nwrt.org>, Jouni Malinen <j@...fi>,
linux-wireless@...r.kernel.org, netdev@...r.kernel.org
Subject: [PATCH 2/2] mac80211: fix compilation warning
net/mac80211/tx.c: In function ‘ieee80211_subif_start_xmit’:
net/mac80211/tx.c:1702: warning: unused variable ‘mesh_hdr’
Signed-off-by: Felipe Contreras <felipe.contreras@...il.com>
---
net/mac80211/tx.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index c54db96..323a6b5 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1699,7 +1699,6 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
u16 ethertype, hdrlen, meshhdrlen = 0;
__le16 fc;
struct ieee80211_hdr hdr;
- struct ieee80211s_hdr mesh_hdr;
const u8 *encaps_data;
int encaps_len, skip_header_bytes;
int nh_pos, h_pos;
@@ -1755,7 +1754,9 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
hdrlen = 30;
break;
#ifdef CONFIG_MAC80211_MESH
- case NL80211_IFTYPE_MESH_POINT:
+ case NL80211_IFTYPE_MESH_POINT: {
+ struct ieee80211s_hdr mesh_hdr;
+
if (!sdata->u.mesh.mshcfg.dot11MeshTTL) {
/* Do not send frames with mesh_ttl == 0 */
sdata->u.mesh.mshstats.dropped_frames_ttl++;
@@ -1813,6 +1814,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
}
break;
+ }
#endif
case NL80211_IFTYPE_STATION:
memcpy(hdr.addr1, sdata->u.mgd.bssid, ETH_ALEN);
--
1.7.2.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists