diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-10 22:24:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-10 22:24:44 +0100 |
| commit | 23779897546c1effb546ff89b89803d9d955d517 (patch) | |
| tree | d4b5d52b5d716a72755ba018382d4b87eae763a4 /net/mac80211/mesh.c | |
| parent | tipc: trivial endian annotation in debug statement (diff) | |
| parent | rtl8187: Change TX power settings (diff) | |
| download | linux-23779897546c1effb546ff89b89803d9d955d517.tar.xz linux-23779897546c1effb546ff89b89803d9d955d517.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/mesh.c')
| -rw-r--r-- | net/mac80211/mesh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index d3b6e1a648bd..82f568e94365 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -238,7 +238,7 @@ void mesh_mgmt_ies_add(struct sk_buff *skb, struct ieee80211_sub_if_data *sdata) pos = skb_put(skb, 21); *pos++ = WLAN_EID_MESH_CONFIG; - *pos++ = MESH_CFG_LEN; + *pos++ = IEEE80211_MESH_CONFIG_LEN; /* Version */ *pos++ = 1; |