From: Reinette Chatre <reinette.chatre@intel.com>
Date: Mon, 19 Oct 2009 21:55:37 +0000 (-0700)
Subject: mac80211: fix ibss joining
X-Git-Tag: v2.6.32-rc6~32^2~5^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d419b9f0fa69e79ccba3e5e79a58a52ae0c2ed6a;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed