| Message ID | 1284289829-25425-3-git-send-email-felipe.contreras@gmail.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-)