Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts: include/net/bluetooth/bluetooth.h
2011-11-17 13:11:43 -05:00
parent 8d26784cf0 b4487c2d0e
commit e11c259f74
205 changed files with 9029 additions and 6464 deletions
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -254,6 +254,8 @@ ath_reg_apply_active_scan_flags(struct wiphy *wiphy,
 	int r;

 	sband = wiphy->bands[IEEE80211_BAND_2GHZ];
+	if (!sband)
+		return;

 	/*
 	 * If no country IE has been received always enable active scan