Skip to contentSkip to conversation

pull request: wireless 2014-08-14

PATCH John W. Linville 3 participants 3 messages Aug 14, 2014 – Aug 15, 2014 1 message not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

Dave,

Please pull this batch of fixes intended for the 3.17 stream...

Arend van Spriel brings two brcmfmac fixes, one which fixes a memory leak and one which corrects some merge damage.

Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam.

Rickard Strandqvist does some proper NULL termination after a call to strncpy.

Ronald Wahl corrects a carl9170 problem with sending URBs with the wrong endpoint type (resulting in log spam).

Please let me know if there are problems!

---

The following changes since commit 33caee39925b887a99a2400dc5c980097c3573f9:

Merge branch 'akpm' (patchbomb from Andrew Morton) (2014-08-06 21:14:42 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git tags/master-2014-08-14

for you to fetch changes up to 77b2f2865956b7573f9b040db7a9f808b434acd1:

iwlwifi: mvm: disable scheduled scan to prevent firmware crash (2014-08-14 19:47:41 +0300)

----------------------------------------------------------------
Arend van Spriel (2):
brcmfmac: fix curly brace mistake in brcmf_pcie_handle_mb_data()
brcmfmac: fix memory leakage in msgbuf

Emmanuel Grumbach (1):
iwlwifi: mvm: disable scheduled scan to prevent firmware crash

Rickard Strandqvist (1):
net: wireless: ipw2x00: ipw2200.c: Cleaning up missing null-terminate after strncpy call

Ronald Wahl (1):
carl9170: fix sending URBs with wrong type when using full-speed

 drivers/net/wireless/ath/carl9170/carl9170.h     |  1 +
 drivers/net/wireless/ath/carl9170/usb.c          | 31 +++++++++++++++++++++---
 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c |  4 +++
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c   |  3 ++-
 drivers/net/wireless/ipw2x00/ipw2200.c           |  1 +
 drivers/net/wireless/iwlwifi/mvm/mac80211.c      |  3 ++-
 6 files changed, 37 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/carl9170/carl9170.h +1 -0
index 8596aba34f96..237d0cda1bcb 100644
@@ -256,6 +256,7 @@ struct ar9170 {
 	atomic_t rx_work_urbs;
 	atomic_t rx_pool_urbs;
 	kernel_ulong_t features;
+	bool usb_ep_cmd_is_bulk;
 
 	/* firmware settings */
 	struct completion fw_load_wait;
drivers/net/wireless/ath/carl9170/usb.c +27 -4
index f35c7f30f9a6..c9f93310c0d6 100644
@@ -621,9 +621,16 @@ int __carl9170_exec_cmd(struct ar9170 *ar, struct carl9170_cmd *cmd,
 		goto err_free;
 	}
 
-	usb_fill_int_urb(urb, ar->udev, usb_sndintpipe(ar->udev,
-		AR9170_USB_EP_CMD), cmd, cmd->hdr.len + 4,
-		carl9170_usb_cmd_complete, ar, 1);
+	if (ar->usb_ep_cmd_is_bulk)
+		usb_fill_bulk_urb(urb, ar->udev,
+				  usb_sndbulkpipe(ar->udev, AR9170_USB_EP_CMD),
+				  cmd, cmd->hdr.len + 4,
+				  carl9170_usb_cmd_complete, ar);
+	else
+		usb_fill_int_urb(urb, ar->udev,
+				 usb_sndintpipe(ar->udev, AR9170_USB_EP_CMD),
+				 cmd, cmd->hdr.len + 4,
+				 carl9170_usb_cmd_complete, ar, 1);
 
 	if (free_buf)
 		urb->transfer_flags |= URB_FREE_BUFFER;
@@ -1032,9 +1039,10 @@ static void carl9170_usb_firmware_step2(const struct firmware *fw,
 static int carl9170_usb_probe(struct usb_interface *intf,
 			      const struct usb_device_id *id)
 {
+	struct usb_endpoint_descriptor *ep;
 	struct ar9170 *ar;
 	struct usb_device *udev;
-	int err;
+	int i, err;
 
 	err = usb_reset_device(interface_to_usbdev(intf));
 	if (err)
@@ -1050,6 +1058,21 @@ static int carl9170_usb_probe(struct usb_interface *intf,
 	ar->intf = intf;
 	ar->features = id->driver_info;
 
+	/* We need to remember the type of endpoint 4 because it differs
+	 * between high- and full-speed configuration. The high-speed
+	 * configuration specifies it as interrupt and the full-speed
+	 * configuration as bulk endpoint. This information is required
+	 * later when sending urbs to that endpoint.
+	 */
+	for (i = 0; i < intf->cur_altsetting->desc.bNumEndpoints; ++i) {
+		ep = &intf->cur_altsetting->endpoint[i].desc;
+
+		if (usb_endpoint_num(ep) == AR9170_USB_EP_CMD &&
+		    usb_endpoint_dir_out(ep) &&
+		    usb_endpoint_type(ep) == USB_ENDPOINT_XFER_BULK)
+			ar->usb_ep_cmd_is_bulk = true;
+	}
+
 	usb_set_intfdata(intf, ar);
 	SET_IEEE80211_DEV(ar->hw, &intf->dev);
 
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c +4 -0
index 535c7eb01b3a..8f8b9373de95 100644
@@ -1318,6 +1318,8 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr)
 	msgbuf->nrof_flowrings = if_msgbuf->nrof_flowrings;
 	msgbuf->flowring_dma_handle = kzalloc(msgbuf->nrof_flowrings *
 		sizeof(*msgbuf->flowring_dma_handle), GFP_ATOMIC);
+	if (!msgbuf->flowring_dma_handle)
+		goto fail;
 
 	msgbuf->rx_dataoffset = if_msgbuf->rx_dataoffset;
 	msgbuf->max_rxbufpost = if_msgbuf->max_rxbufpost;
@@ -1362,6 +1364,7 @@ fail:
 		kfree(msgbuf->flow_map);
 		kfree(msgbuf->txstatus_done_map);
 		brcmf_msgbuf_release_pktids(msgbuf);
+		kfree(msgbuf->flowring_dma_handle);
 		if (msgbuf->ioctbuf)
 			dma_free_coherent(drvr->bus_if->dev,
 					  BRCMF_TX_IOCTL_MAX_MSG_SIZE,
@@ -1391,6 +1394,7 @@ void brcmf_proto_msgbuf_detach(struct brcmf_pub *drvr)
 				  BRCMF_TX_IOCTL_MAX_MSG_SIZE,
 				  msgbuf->ioctbuf, msgbuf->ioctbuf_handle);
 		brcmf_msgbuf_release_pktids(msgbuf);
+		kfree(msgbuf->flowring_dma_handle);
 		kfree(msgbuf);
 		drvr->proto->pd = NULL;
 	}
drivers/net/wireless/brcm80211/brcmfmac/pcie.c +2 -1
index bc972c0ba5f8..e5101b287e4e 100644
@@ -591,12 +591,13 @@ static void brcmf_pcie_handle_mb_data(struct brcmf_pciedev_info *devinfo)
 	}
 	if (dtoh_mb_data & BRCMF_D2H_DEV_DS_EXIT_NOTE)
 		brcmf_dbg(PCIE, "D2H_MB_DATA: DEEP SLEEP EXIT\n");
-	if (dtoh_mb_data & BRCMF_D2H_DEV_D3_ACK)
+	if (dtoh_mb_data & BRCMF_D2H_DEV_D3_ACK) {
 		brcmf_dbg(PCIE, "D2H_MB_DATA: D3 ACK\n");
 		if (waitqueue_active(&devinfo->mbdata_resp_wait)) {
 			devinfo->mbdata_completed = true;
 			wake_up(&devinfo->mbdata_resp_wait);
 		}
+	}
 }
 
 
drivers/net/wireless/ipw2x00/ipw2200.c +1 -0
index c5aa404069f3..389656bd1a74 100644
@@ -9853,6 +9853,7 @@ static int ipw_wx_get_wireless_mode(struct net_device *dev,
 		strncpy(extra, "unknown", MAX_WX_STRING);
 		break;
 	}
+	extra[MAX_WX_STRING - 1] = '\0';
 
 	IPW_DEBUG_WX("PRIV GET MODE: %s\n", extra);
 
drivers/net/wireless/iwlwifi/mvm/mac80211.c +2 -1
index 0d6a8b768a68..7c8796584c25 100644
@@ -396,7 +396,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 	else
 		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
-	hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;
+	/* TODO: enable that only for firmwares that don't crash */
+	/* hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN; */
 	hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX;
 	hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES;
 	/* we create the 802.11 header and zero length SSID IE. */
Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#1 lore raw

From: "John W. Linville" <[email protected]>
Date: Thu, 14 Aug 2014 14:32:53 -0400

Quoted 7 lines

Please pull this batch of fixes intended for the 3.17 stream...

Arend van Spriel brings two brcmfmac fixes, one which fixes a memory leak and one which corrects some merge damage.

Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam.

Quoted 7 lines

Rickard Strandqvist does some proper NULL termination after a call to strncpy.

Ronald Wahl corrects a carl9170 problem with sending URBs with the wrong endpoint type (resulting in log spam).

Please let me know if there are problems!

Pulled, thanks John.

I'm really happy that you send the iwlwifi regression fix so quickly!

A message that is not in the archive (sent off-list or not yet received): 20140814.151809.1355093138463959620.davem-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

#3 lore raw
Quoted 13 lines · David Miller

From: "John W. Linville" <[email protected]>
Date: Thu, 14 Aug 2014 14:32:53 -0400

Quoted 10 lines

Please pull this batch of fixes intended for the 3.17 stream...

Arend van Spriel brings two brcmfmac fixes, one which fixes a memory leak and one which corrects some merge damage.

Emmanuel Grumbach fixes Linus's iwlwifi firmware-related log spam.

Rickard Strandqvist does some proper NULL termination after a call to strncpy.

Quoted 8 lines
Quoted 4 lines

Ronald Wahl corrects a carl9170 problem with sending URBs with the wrong endpoint type (resulting in log spam).

Please let me know if there are problems!

Pulled, thanks John.

I'm really happy that you send the iwlwifi regression fix so quickly!

One-liners with a "Tested-by: Linus Torvalds" get a lot of respect... :-)

Signature · 6 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html