diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
| commit | 1d212aa96e1b63459486f729af9a3fa38768b801 (patch) | |
| tree | e91e74db57a5bb7884b4681cdb788d405ec8f10f /net/wireless/util.c | |
| parent | 8c4877a4128e7931077b024a891a4b284d8756a3 (diff) | |
| parent | b7613370db5ba66ad81e41cd3a5417fde4d5e03c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/wireless/util.c')
| -rw-r--r-- | net/wireless/util.c | 1 |
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, | |||
| 792 | 792 | ||
| 793 | if (ntype != otype) { | 793 | if (ntype != otype) { |
| 794 | dev->ieee80211_ptr->use_4addr = false; | 794 | dev->ieee80211_ptr->use_4addr = false; |
| 795 | dev->ieee80211_ptr->mesh_id_up_len = 0; | ||
| 795 | 796 | ||
| 796 | switch (otype) { | 797 | switch (otype) { |
| 797 | case NL80211_IFTYPE_ADHOC: | 798 | case NL80211_IFTYPE_ADHOC: |