]> git.baikalelectronics.ru Git - kernel.git/commit
mac80211: fix ibss joining
authorReinette Chatre <reinette.chatre@intel.com>
Mon, 19 Oct 2009 21:55:37 +0000 (14:55 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 27 Oct 2009 20:29:46 +0000 (16:29 -0400)
commit64c5a6ce9a34dbc95de11dbdaa47102eaecbb3db
tree9437f790f07c46a645b867871e81a71dc1058749
parent75bb7ad84192af12d2844064049db5fe22063538
mac80211: fix ibss joining

Recent commit "mac80211: fix logic error ibss merge bssid check" fixed
joining of ibss cell when static bssid is provided. In this case
ifibss->bssid is set before the cell is joined and comparing that address
to a bss should thus always succeed. Unfortunately this change broke the
other case of joining a ibss cell without providing a static bssid where
the value of ifibss->bssid is not set before the cell is joined.

Since ifibss->bssid may be set before or after joining the cell we do not
learn anything by comparing it to a known bss. Remove this check.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c