[2/2] mac80211: fix compilation warning

Commit Message

Felipe Contreras Sept. 12, 2010, 11:10 a.m. UTC

None

Patch

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);