Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a61ebdfd authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'master-2014-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 



John W. Linville says:

====================
pull request: wireless 2014-08-14

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).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 9ce12eb1 77b2f286

drivers/net/wireless/ath/carl9170/carl9170.h

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -621,8 +621,15 @@ 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,

	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)
@@ -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
Original line number Diff line number Diff line
@@ -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 @@ int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr) 
		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
Original line number Diff line number Diff line
@@ -591,13 +591,14 @@ 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);

		}

	}

}





static void brcmf_pcie_bus_console_init(struct brcmf_pciedev_info *devinfo)

drivers/net/wireless/ipw2x00/ipw2200.c

+1 −0
Original line number Diff line number Diff line
@@ -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);