summaryrefslogtreecommitdiff
path: root/net/wireless/util.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-14 10:52:54 -0800
committerDavid S. Miller <davem@davemloft.net>2010-12-14 10:52:54 -0800
commit6389aa73ab8c15084fce18307a8e198eaff818da (patch)
treecbad535e69b662cbb904afeacf4b50461e415b86 /net/wireless/util.c
parent0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be (diff)
parent1d212aa96e1b63459486f729af9a3fa38768b801 (diff)
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/wireless/util.c')
-rw-r--r--net/wireless/util.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/util.c b/net/wireless/util.c
index fee020b15a4e..4de624ca4c63 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -792,6 +792,7 @@ int cfg80211_change_iface(struct cfg80211_registered_device *rdev,
if (ntype != otype) {
dev->ieee80211_ptr->use_4addr = false;
+ dev->ieee80211_ptr->mesh_id_up_len = 0;
switch (otype) {
case NL80211_IFTYPE_ADHOC: