Commit 9d4990a2 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
parents 64f0a836 2504a642

drivers/bluetooth/btusb.c

+1 −3
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static struct usb_device_id btusb_table[] = { 


	/* Broadcom BCM20702A0 */

	{ USB_DEVICE(0x0a5c, 0x21e3) },

	{ USB_DEVICE(0x0a5c, 0x21f3) },

	{ USB_DEVICE(0x413c, 0x8197) },



	{ }	/* Terminating entry */
@@ -726,9 +727,6 @@ static int btusb_send_frame(struct sk_buff *skb) 
		usb_fill_bulk_urb(urb, data->udev, pipe,

				skb->data, skb->len, btusb_tx_complete, skb);



		if (skb->priority >= HCI_PRIO_MAX - 1)

			urb->transfer_flags  = URB_ISO_ASAP;



		hdev->stat.acl_tx++;

		break;

drivers/net/wireless/ath/ath9k/rc.c

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, 
	fc = hdr->frame_control;

	for (i = 0; i < sc->hw->max_rates; i++) {

		struct ieee80211_tx_rate *rate = &tx_info->status.rates[i];

		if (!rate->count)

		if (rate->idx < 0 || !rate->count)

			break;



		final_ts_idx = i;

drivers/net/wireless/mwifiex/cfg80211.c

+7 −1
Original line number Diff line number Diff line
@@ -841,7 +841,12 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, 
		ret = mwifiex_set_rf_channel(priv, channel,

						priv->adapter->channel_type);



	ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);	/* Disable keys */

	/* As this is new association, clear locally stored

	 * keys and security related flags */

	priv->sec_info.wpa_enabled = false;

	priv->sec_info.wpa2_enabled = false;

	priv->wep_key_curr_index = 0;

	ret = mwifiex_set_encode(priv, NULL, 0, 0, 1);



	if (mode == NL80211_IFTYPE_ADHOC) {

		/* "privacy" is set only for ad-hoc mode */
@@ -886,6 +891,7 @@ mwifiex_cfg80211_assoc(struct mwifiex_private *priv, size_t ssid_len, u8 *ssid, 
			dev_dbg(priv->adapter->dev,

				"info: setting wep encryption"

				" with key len %d\n", sme->key_len);

			priv->wep_key_curr_index = sme->key_idx;

			ret = mwifiex_set_encode(priv, sme->key, sme->key_len,

							sme->key_idx, 0);

		}

include/net/bluetooth/bluetooth.h

+2 −0
Original line number Diff line number Diff line
@@ -256,4 +256,6 @@ void l2cap_exit(void); 
int sco_init(void);

void sco_exit(void);



void bt_sock_reclassify_lock(struct sock *sk, int proto);



#endif /* __BLUETOOTH_H */

include/net/bluetooth/hci_core.h

+3 −3
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ void hci_conn_put_device(struct hci_conn *conn); 
static inline void hci_conn_hold(struct hci_conn *conn)

{

	atomic_inc(&conn->refcnt);

	cancel_delayed_work_sync(&conn->disc_work);

	cancel_delayed_work(&conn->disc_work);

}



static inline void hci_conn_put(struct hci_conn *conn)
@@ -559,9 +559,9 @@ static inline void hci_conn_put(struct hci_conn *conn) 
		} else {

			timeo = msecs_to_jiffies(10);

		}

		cancel_delayed_work_sync(&conn->disc_work);

		cancel_delayed_work(&conn->disc_work);

		queue_delayed_work(conn->hdev->workqueue,

					&conn->disc_work, jiffies + timeo);

					&conn->disc_work, timeo);

	}

}