diff --git a/[refs] b/[refs]
index 0f3e271384ba..3592963a8266 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 115dad7a7f42e68840392767323ceb9306dbdb36
+refs/heads/master: 0a65169b1f602b955176cb5f0789139d0fccb041
diff --git a/trunk/net/mac80211/tx.c b/trunk/net/mac80211/tx.c
index dc261bbba522..2378305f7534 100644
--- a/trunk/net/mac80211/tx.c
+++ b/trunk/net/mac80211/tx.c
@@ -1750,7 +1750,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb,
 	__le16 fc;
 	struct ieee80211_hdr hdr;
 	struct ieee80211s_hdr mesh_hdr __maybe_unused;
-	struct mesh_path *mppath = NULL;
+	struct mesh_path __maybe_unused *mppath = NULL;
 	const u8 *encaps_data;
 	int encaps_len, skip_header_bytes;
 	int nh_pos, h_pos;