linux-next: manual merge of the wireless-next tree with thewireless tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless-next tree got a conflict in
drivers/net/wireless/libertas/cfg.c between commit d929bbc63069
("wireless: libertas: fix unaligned le64 accesses") from the wireless
tree and commit 731f8e1c41a4 ("libertas: release bss references and avoid
warning from cfg80211_inform_bss") from the wireless-next tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/net/wireless/libertas/cfg.c
index a7f1ab2,89f34ad..0000000
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@@ -632,9 -633,9 +633,9 @@@ static int lbs_ret_scan(struct lbs_priv
  				     LBS_SCAN_RSSI_TO_MBM(rssi)/100);
  
  			if (channel &&
- 			    !(channel->flags & IEEE80211_CHAN_DISABLED))
- 				cfg80211_inform_bss(wiphy, channel,
+ 			    !(channel->flags & IEEE80211_CHAN_DISABLED)) {
+ 				bss = cfg80211_inform_bss(wiphy, channel,
 -					bssid, le64_to_cpu(*(__le64 *)tsfdesc),
 +					bssid, get_unaligned_le64(tsfdesc),
  					capa, intvl, ie, ielen,
  					LBS_SCAN_RSSI_TO_MBM(rssi),
  					GFP_KERNEL);

Attachment: pgp00000.pgp
Description: PGP signature