From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 5 May 2011 17:32:35 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a70171dce9cd44cb06c7d299eba9fa87a8933045;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Conflicts:
	drivers/net/wireless/libertas/if_cs.c
	drivers/net/wireless/rtlwifi/pci.c
	net/bluetooth/l2cap_sock.c
---

a70171dce9cd44cb06c7d299eba9fa87a8933045
diff --cc drivers/net/wireless/rtlwifi/base.c
index b259f807ad27,d3666573d6b8..ccb6da38fe22
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@@ -522,10 -698,10 +698,10 @@@ void rtl_get_tcb_desc(struct ieee80211_
  			 *because hw will nerver use hw_rate
  			 *when tcb_desc->use_driver_rate = false
  			 *so we never set highest N rate here,
 -			 *and N rate will all be controled by FW
 +			 *and N rate will all be controlled by FW
  			 *when tcb_desc->use_driver_rate = false
  			 */
- 			if (rtlmac->ht_enable) {
+ 			if (sta && (sta->ht_cap.ht_supported)) {
  				tcb_desc->hw_rate = _rtl_get_highest_n_rate(hw);
  			} else {
  				if (rtlmac->mode == WIRELESS_MODE_B) {
diff --cc net/bluetooth/l2cap_sock.c
index 47394a178bd5,09cc7a005349..7c4a9ae9b3ce
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@@ -678,8 -692,8 +692,8 @@@ static int l2cap_sock_setsockopt(struc
  		}
  
  		if (opt == BT_FLUSHABLE_OFF) {
- 			struct l2cap_conn *conn = l2cap_pi(sk)->conn;
+ 			struct l2cap_conn *conn = chan->conn;
 -			/* proceed futher only when we have l2cap_conn and
 +			/* proceed further only when we have l2cap_conn and
  			   No Flush support in the LM */
  			if (!conn || !lmp_no_flush_capable(conn->hcon->hdev)) {
  				err = -EINVAL;