From: David S. Miller <davem@davemloft.net>
Date: Tue, 8 Jul 2008 23:30:17 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~969^2~185
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7c3ceb4a409e2b838700edf081d61a8a4c921e79;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/iwlwifi/iwl-3945.c
	net/mac80211/mlme.c
---

7c3ceb4a409e2b838700edf081d61a8a4c921e79
diff --cc drivers/net/wireless/iwlwifi/iwl-3945.c
index 38866ab0040,55ac850744b..94e177a9f51
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@@ -489,8 -487,8 +489,8 @@@ static void iwl3945_dbg_report_frame(st
  		 *    but you can hack it to show more, if you'd like to. */
  		if (dataframe)
  			IWL_DEBUG_RX("%s: mhd=0x%04x, dst=0x%02x, "
- 				     "len=%u, rssi=%d, chnl=%d, rate=%u, \n",
+ 				     "len=%u, rssi=%d, chnl=%d, rate=%d, \n",
 -				     title, fc, header->addr1[5],
 +				     title, le16_to_cpu(fc), header->addr1[5],
  				     length, rssi, channel, rate);
  		else {
  			/* src/dst addresses assume managed mode */
diff --cc net/mac80211/mlme.c
index 37ea04f5bab,b404537c0bc..dbc8cf454bc
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@@ -570,10 -552,10 +569,10 @@@ static void ieee80211_set_associated(st
  		memcpy(wrqu.ap_addr.sa_data, sdata->u.sta.bssid, ETH_ALEN);
  		ieee80211_sta_send_associnfo(dev, ifsta);
  	} else {
+ 		netif_carrier_off(dev);
  		ieee80211_sta_tear_down_BA_sessions(dev, ifsta->bssid);
  		ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;
- 		netif_carrier_off(dev);
 -		ieee80211_reset_erp_info(dev);
 +		changed |= ieee80211_reset_erp_info(dev);
  
  		sdata->bss_conf.assoc_ht = 0;
  		sdata->bss_conf.ht_conf = NULL;