Commit 10f5ae21 authored by Johannes Berg's avatar Johannes Berg
Browse files

Merge wireless into wireless-next 



There are a number of upcoming things in both the stack and
drivers that would otherwise conflict, so merge wireless to
wireless-next to be able to avoid those conflicts.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parents 7d528eaf f7e60032

drivers/net/wireless/broadcom/b43/b43.h

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ struct b43_iv { 
	union {

		__be16 d16;

		__be32 d32;

	} data __packed;

	} __packed data;

} __packed;

drivers/net/wireless/broadcom/b43legacy/b43legacy.h

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ struct b43legacy_iv { 
	union {

		__be16 d16;

		__be32 d32;

	} data __packed;

	} __packed data;

} __packed;



#define B43legacy_PHYMODE(phytype)	(1 << (phytype))

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+5 −0
Original line number Diff line number Diff line
@@ -1039,6 +1039,11 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func, 
	struct brcmf_sdio_dev *sdiodev;

	struct brcmf_bus *bus_if;



	if (!id) {

		dev_err(&func->dev, "Error no sdio_device_id passed for %x:%x\n", func->vendor, func->device);

		return -ENODEV;

	}



	brcmf_dbg(SDIO, "Enter\n");

	brcmf_dbg(SDIO, "Class=%x\n", func->class);

	brcmf_dbg(SDIO, "sdio vendor ID: 0x%04x\n", func->vendor);

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

+11 −0
Original line number Diff line number Diff line
@@ -2394,6 +2394,9 @@ static void brcmf_pcie_debugfs_create(struct device *dev) 
}

#endif



/* Forward declaration for pci_match_id() call */

static const struct pci_device_id brcmf_pcie_devid_table[];



static int

brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{
@@ -2404,6 +2407,14 @@ brcmf_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	struct brcmf_core *core;

	struct brcmf_bus *bus;



	if (!id) {

		id = pci_match_id(brcmf_pcie_devid_table, pdev);

		if (!id) {

			pci_err(pdev, "Error could not find pci_device_id for %x:%x\n", pdev->vendor, pdev->device);

			return -ENODEV;

		}

	}



	brcmf_dbg(PCIE, "Enter %x:%x\n", pdev->vendor, pdev->device);



	ret = -ENOMEM;

drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c

+11 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,9 @@ brcmf_usb_disconnect_cb(struct brcmf_usbdev_info *devinfo) 
	brcmf_usb_detach(devinfo);

}



/* Forward declaration for usb_match_id() call */

static const struct usb_device_id brcmf_usb_devid_table[];



static int

brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)

{
@@ -1342,6 +1345,14 @@ brcmf_usb_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	u32 num_of_eps;

	u8 endpoint_num, ep;



	if (!id) {

		id = usb_match_id(intf, brcmf_usb_devid_table);

		if (!id) {

			dev_err(&intf->dev, "Error could not find matching usb_device_id\n");

			return -ENODEV;

		}

	}



	brcmf_dbg(USB, "Enter 0x%04x:0x%04x\n", id->idVendor, id->idProduct);



	devinfo = kzalloc(sizeof(*devinfo), GFP_ATOMIC);