From eee7e850310194c1a976a2515961f4088cc1ec5d Mon Sep 17 00:00:00 2001
From: Rui Paulo <rpaulo@gmail.com>
Date: Mon, 9 Nov 2009 23:46:54 +0000
Subject: [PATCH] --- yaml --- r: 171738 b: refs/heads/master c:
 be125c60e46e165fbfe33db36a4a9d943d560a5b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mesh.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b988e2e633a..d0b163e7bf2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36f0d5f537885179c8fa92a70d4fcfb3a336b082
+refs/heads/master: be125c60e46e165fbfe33db36a4a9d943d560a5b
diff --git a/trunk/net/mac80211/mesh.c b/trunk/net/mac80211/mesh.c
index 63427d983216..222a31338390 100644
--- a/trunk/net/mac80211/mesh.c
+++ b/trunk/net/mac80211/mesh.c
@@ -247,6 +247,13 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata)
 		}
 	}
 
+	if (sband->band == IEEE80211_BAND_2GHZ) {
+		pos = skb_put(skb, 2 + 1);
+		*pos++ = WLAN_EID_DS_PARAMS;
+		*pos++ = 1;
+		*pos++ = ieee80211_frequency_to_channel(local->hw.conf.channel->center_freq);
+	}
+
 	pos = skb_put(skb, 2 + sdata->u.mesh.mesh_id_len);
 	*pos++ = WLAN_EID_MESH_ID;
 	*pos++ = sdata->u.mesh.mesh_id_len;