diff options
| author | Thomas Pedersen <thomas@cozybit.com> | 2012-08-03 12:21:34 -0700 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-08-03 21:34:25 +0200 |
| commit | e7570dfb635b0c89570852002c9f85dd1cf82ba1 (patch) | |
| tree | 9a6948d49108dffc08953a862902f341d81b4f35 | |
| parent | 3e17f2be31f354fe03e1732bc527a31ff3dd3bb9 (diff) | |
| download | linux-stable-e7570dfb635b0c89570852002c9f85dd1cf82ba1.tar.gz linux-stable-e7570dfb635b0c89570852002c9f85dd1cf82ba1.tar.bz2 linux-stable-e7570dfb635b0c89570852002c9f85dd1cf82ba1.zip | |
mac80211: don't request ack for peering close
It doesn't make a lot of sense to wait for an ack in response to a
peering close frame since either peer in this exchange could be going
down.
Signed-off-by: Thomas Pedersen <thomas@cozybit.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/mesh_plink.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c index 985b37f7455d..bad5126c8483 100644 --- a/net/mac80211/mesh_plink.c +++ b/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; } |