From 05535b9995aae994c14fd1f0fa0bced873c8b939 Mon Sep 17 00:00:00 2001
From: Thomas Pedersen <thomas@cozybit.com>
Date: Fri, 3 Aug 2012 12:21:34 -0700
Subject: [PATCH] --- yaml --- r: 327647 b: refs/heads/master c:
 e7570dfb635b0c89570852002c9f85dd1cf82ba1 h: refs/heads/master i:   327645:
 2a7b5850f41ace3db1c27e74196dc9b517f38c21   327643:
 cbfb0d939090383ccf2f6c5b61ab51b0f417bf10   327639:
 dd8042fa328990803aee0eb5361d5faa386f39ac   327631:
 8023c13566bc39b2be359ddafecac61ca00272c1   327615:
 188fe701a49b852a6999cec4a2782c69955e65ba v: v3

---
 [refs]                          | 2 +-
 trunk/net/mac80211/mesh_plink.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0e1a83b6456c..9434f9facda3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e17f2be31f354fe03e1732bc527a31ff3dd3bb9
+refs/heads/master: e7570dfb635b0c89570852002c9f85dd1cf82ba1
diff --git a/trunk/net/mac80211/mesh_plink.c b/trunk/net/mac80211/mesh_plink.c
index 985b37f7455d..bad5126c8483 100644
--- a/trunk/net/mac80211/mesh_plink.c
+++ b/trunk/net/mac80211/mesh_plink.c
@@ -217,6 +217,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
 		u8 *da, __le16 llid, __le16 plid, __le16 reason) {
 	struct ieee80211_local *local = sdata->local;
 	struct sk_buff *skb;
+	struct ieee80211_tx_info *info;
 	struct ieee80211_mgmt *mgmt;
 	bool include_plid = false;
 	u16 peering_proto = 0;
@@ -238,6 +239,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
 			    sdata->u.mesh.ie_len);
 	if (!skb)
 		return -1;
+	info = IEEE80211_SKB_CB(skb);
 	skb_reserve(skb, local->tx_headroom);
 	mgmt = (struct ieee80211_mgmt *) skb_put(skb, hdr_len);
 	memset(mgmt, 0, hdr_len);
@@ -267,6 +269,7 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
 		    mesh_add_meshconf_ie(skb, sdata))
 			return -1;
 	} else {	/* WLAN_SP_MESH_PEERING_CLOSE */
+		info->flags |= IEEE80211_TX_CTL_NO_ACK;
 		if (mesh_add_meshid_ie(skb, sdata))
 			return -1;
 	}