Merge branch 'master' of... (82362ccb) · Commits · EulixOS / Software / Kernel

drivers/bluetooth/btmrvl_debugfs.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -64,6 +64,8 @@ static ssize_t btmrvl_hscfgcmd_write(struct file *file,
	return -EFAULT;		return -EFAULT;

	ret = strict_strtol(buf, 10, &result);		ret = strict_strtol(buf, 10, &result);
			if (ret)
			return ret;

	priv->btmrvl_dev.hscfgcmd = result;		priv->btmrvl_dev.hscfgcmd = result;

	@@ -108,6 +110,8 @@ static ssize_t btmrvl_psmode_write(struct file file, const char __user ubuf,
	return -EFAULT;		return -EFAULT;

	ret = strict_strtol(buf, 10, &result);		ret = strict_strtol(buf, 10, &result);
			if (ret)
			return ret;

	priv->btmrvl_dev.psmode = result;		priv->btmrvl_dev.psmode = result;

	@@ -147,6 +151,8 @@ static ssize_t btmrvl_pscmd_write(struct file file, const char __user ubuf,
	return -EFAULT;		return -EFAULT;

	ret = strict_strtol(buf, 10, &result);		ret = strict_strtol(buf, 10, &result);
			if (ret)
			return ret;

	priv->btmrvl_dev.pscmd = result;		priv->btmrvl_dev.pscmd = result;

	@@ -191,6 +197,8 @@ static ssize_t btmrvl_gpiogap_write(struct file file, const char __user ubuf,
	return -EFAULT;		return -EFAULT;

	ret = strict_strtol(buf, 16, &result);		ret = strict_strtol(buf, 16, &result);
			if (ret)
			return ret;

	priv->btmrvl_dev.gpio_gap = result;		priv->btmrvl_dev.gpio_gap = result;

	@@ -230,6 +238,8 @@ static ssize_t btmrvl_hscmd_write(struct file file, const char __user ubuf,
	return -EFAULT;		return -EFAULT;

	ret = strict_strtol(buf, 10, &result);		ret = strict_strtol(buf, 10, &result);
			if (ret)
			return ret;

	priv->btmrvl_dev.hscmd = result;		priv->btmrvl_dev.hscmd = result;
	if (priv->btmrvl_dev.hscmd) {		if (priv->btmrvl_dev.hscmd) {
	@@ -272,6 +282,8 @@ static ssize_t btmrvl_hsmode_write(struct file file, const char __user ubuf,
	return -EFAULT;		return -EFAULT;

	ret = strict_strtol(buf, 10, &result);		ret = strict_strtol(buf, 10, &result);
			if (ret)
			return ret;

	priv->btmrvl_dev.hsmode = result;		priv->btmrvl_dev.hsmode = result;

drivers/net/wireless/mwifiex/cfg80211.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1288,6 +1288,8 @@ int mwifiex_register_cfg80211(struct net_device dev, u8 mac,

	(unsigned long ) wdev_priv = (unsigned long) priv;		(unsigned long ) wdev_priv = (unsigned long) priv;

			set_wiphy_dev(wdev->wiphy, (struct device *) priv->adapter->dev);

	ret = wiphy_register(wdev->wiphy);		ret = wiphy_register(wdev->wiphy);
	if (ret < 0) {		if (ret < 0) {
	dev_err(priv->adapter->dev, "%s: registering cfg80211 device\n",		dev_err(priv->adapter->dev, "%s: registering cfg80211 device\n",

drivers/net/wireless/mwl8k.c

+3 −1

net/bluetooth/hci_event.c

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -477,14 +477,16 @@ static void hci_setup_event_mask(struct hci_dev *hdev)
	* command otherwise */		* command otherwise */
	u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 };		u8 events[8] = { 0xff, 0xff, 0xfb, 0xff, 0x00, 0x00, 0x00, 0x00 };

	/* Events for 1.2 and newer controllers */		/* CSR 1.1 dongles does not accept any bitfield so don't try to set
	if (hdev->lmp_ver > 1) {		* any event mask for pre 1.2 devices */
			if (hdev->lmp_ver <= 1)
			return;

	events[4] \|= 0x01; /* Flow Specification Complete */		events[4] \|= 0x01; /* Flow Specification Complete */
	events[4] \|= 0x02; /* Inquiry Result with RSSI */		events[4] \|= 0x02; /* Inquiry Result with RSSI */
	events[4] \|= 0x04; /* Read Remote Extended Features Complete */		events[4] \|= 0x04; /* Read Remote Extended Features Complete */
	events[5] \|= 0x08; /* Synchronous Connection Complete */		events[5] \|= 0x08; /* Synchronous Connection Complete */
	events[5] \|= 0x10; /* Synchronous Connection Changed */		events[5] \|= 0x10; /* Synchronous Connection Changed */
	}

	if (hdev->features[3] & LMP_RSSI_INQ)		if (hdev->features[3] & LMP_RSSI_INQ)
	events[4] \|= 0x04; /* Inquiry Result with RSSI */		events[4] \|= 0x04; /* Inquiry Result with RSSI */

net/bluetooth/l2cap_sock.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -413,6 +413,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
	break;		break;
	}		}

			memset(&cinfo, 0, sizeof(cinfo));
	cinfo.hci_handle = chan->conn->hcon->handle;		cinfo.hci_handle = chan->conn->hcon->handle;
	memcpy(cinfo.dev_class, chan->conn->hcon->dev_class, 3);		memcpy(cinfo.dev_class, chan->conn->hcon->dev_class, 3);

Original line number	Original line	Diff line number	Diff line
	@@ -2474,6 +2474,7 @@ struct mwl8k_cmd_set_hw_spec {
	* faster client.		* faster client.
	*/		*/
	#define MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY 0x00000400		#define MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY 0x00000400
			#define MWL8K_SET_HW_SPEC_FLAG_GENERATE_CCMP_HDR 0x00000200
	#define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT 0x00000080		#define MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT 0x00000080
	#define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP 0x00000020		#define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP 0x00000020
	#define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON 0x00000010		#define MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON 0x00000010
	@@ -2510,7 +2511,8 @@ static int mwl8k_cmd_set_hw_spec(struct ieee80211_hw *hw)
	cmd->flags = cpu_to_le32(MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT \|		cmd->flags = cpu_to_le32(MWL8K_SET_HW_SPEC_FLAG_HOST_DECR_MGMT \|
	MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP \|		MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_PROBERESP \|
	MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON \|		MWL8K_SET_HW_SPEC_FLAG_HOSTFORM_BEACON \|
	MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY);		MWL8K_SET_HW_SPEC_FLAG_ENABLE_LIFE_TIME_EXPIRY \|
			MWL8K_SET_HW_SPEC_FLAG_GENERATE_CCMP_HDR);
	cmd->num_tx_desc_per_queue = cpu_to_le32(MWL8K_TX_DESCS);		cmd->num_tx_desc_per_queue = cpu_to_le32(MWL8K_TX_DESCS);
	cmd->total_rxd = cpu_to_le32(MWL8K_RX_DESCS);		cmd->total_rxd = cpu_to_le32(MWL8K_RX_DESCS);