From: Felipe Contreras <felipe.contreras@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Jiri Kosina <jkosina@suse.cz>,
Felipe Contreras <felipe.contreras@gmail.com>,
Johannes Berg <johannes@sipsolutions.net>,
"John W. Linville" <linville@tuxdriver.com>,
"David S. Miller" <davem@davemloft.net>,
Kalle Valo <kalle.valo@iki.fi>, Felix Fietkau <nbd@openwrt.org>,
Jouni Malinen <j@w1.fi>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH 2/2] mac80211: fix compilation warning
Date: Sun, 12 Sep 2010 14:10:29 +0300 [thread overview]
Message-ID: <1284289829-25425-3-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1284289829-25425-1-git-send-email-felipe.contreras@gmail.com>
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@gmail.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
next prev parent reply other threads:[~2010-09-12 11:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-12 11:10 [PATCH 0/2] trivial: fix some compilation warnings Felipe Contreras
2010-09-12 11:10 ` [PATCH 1/2] autofs4: fix compilation warning Felipe Contreras
2010-09-12 11:10 ` Felipe Contreras [this message]
2010-09-14 5:17 ` [PATCH 2/2] mac80211: " Johannes Berg
2010-09-14 6:09 ` Jarek Poplawski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1284289829-25425-3-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=davem@davemloft.net \
--cc=j@w1.fi \
--cc=jkosina@suse.cz \
--cc=johannes@sipsolutions.net \
--cc=kalle.valo@iki.fi \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=nbd@openwrt.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®