* [PATCH 2/2] mac80211: fix compilation warning [not found] <1284289829-25425-1-git-send-email-felipe.contreras@gmail.com> @ 2010-09-12 11:10 ` Felipe Contreras 2010-09-14 5:17 ` Johannes Berg 0 siblings, 1 reply; 3+ messages in thread From: Felipe Contreras @ 2010-09-12 11:10 UTC (permalink / raw) To: linux-kernel Cc: Jiri Kosina, Felipe Contreras, Johannes Berg, John W. Linville, David S. Miller, Kalle Valo, Felix Fietkau, Jouni Malinen, linux-wireless, netdev 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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] mac80211: fix compilation warning 2010-09-12 11:10 ` [PATCH 2/2] mac80211: fix compilation warning Felipe Contreras @ 2010-09-14 5:17 ` Johannes Berg [not found] ` <1284441432.3704.0.camel-8upI4CBIZJIJvtFkdXX2HixXY32XiHfO@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Johannes Berg @ 2010-09-14 5:17 UTC (permalink / raw) To: Felipe Contreras Cc: linux-kernel, Jiri Kosina, John W. Linville, David S. Miller, Kalle Valo, Felix Fietkau, Jouni Malinen, linux-wireless, netdev On Sun, 2010-09-12 at 14:10 +0300, Felipe Contreras wrote: > 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; > + ... might be nicer to just add __maybe_unused. johannes ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <1284441432.3704.0.camel-8upI4CBIZJIJvtFkdXX2HixXY32XiHfO@public.gmane.org>]
* Re: [PATCH 2/2] mac80211: fix compilation warning [not found] ` <1284441432.3704.0.camel-8upI4CBIZJIJvtFkdXX2HixXY32XiHfO@public.gmane.org> @ 2010-09-14 6:09 ` Jarek Poplawski 0 siblings, 0 replies; 3+ messages in thread From: Jarek Poplawski @ 2010-09-14 6:09 UTC (permalink / raw) To: Johannes Berg Cc: Felipe Contreras, linux-kernel-u79uwXL29TY76Z2rM5mHXA, Jiri Kosina, John W. Linville, David S. Miller, Kalle Valo, Felix Fietkau, Jouni Malinen, linux-wireless-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA On 2010-09-14 07:17, Johannes Berg wrote: > On Sun, 2010-09-12 at 14:10 +0300, Felipe Contreras wrote: > >> 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; >> + > > ... > > might be nicer to just add __maybe_unused. > > johannes > Or at least more consistent with the fix in net-next ;-) Jarek P. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-14 6:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1284289829-25425-1-git-send-email-felipe.contreras@gmail.com>
2010-09-12 11:10 ` [PATCH 2/2] mac80211: fix compilation warning Felipe Contreras
2010-09-14 5:17 ` Johannes Berg
[not found] ` <1284441432.3704.0.camel-8upI4CBIZJIJvtFkdXX2HixXY32XiHfO@public.gmane.org>
2010-09-14 6:09 ` Jarek Poplawski
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).