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

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

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 06b8fc5d 8a98d935

drivers/net/wireless/ath/ath5k/pci.c

+5 −2
Original line number Diff line number Diff line
@@ -297,7 +297,9 @@ ath5k_pci_remove(struct pci_dev *pdev) 
#ifdef CONFIG_PM_SLEEP

static int ath5k_pci_suspend(struct device *dev)

{

	struct ath5k_softc *sc = pci_get_drvdata(to_pci_dev(dev));

	struct pci_dev *pdev = to_pci_dev(dev);

	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath5k_softc *sc = hw->priv;



	ath5k_led_off(sc);

	return 0;
@@ -306,7 +308,8 @@ static int ath5k_pci_suspend(struct device *dev) 
static int ath5k_pci_resume(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct ath5k_softc *sc = pci_get_drvdata(pdev);

	struct ieee80211_hw *hw = pci_get_drvdata(pdev);

	struct ath5k_softc *sc = hw->priv;



	/*

	 * Suspend/Resume resets the PCI configuration space, so we have to

drivers/net/wireless/ath/ath5k/sysfs.c

+6 −3
Original line number Diff line number Diff line
@@ -10,7 +10,8 @@ static ssize_t ath5k_attr_show_##name(struct device *dev, \ 
			struct device_attribute *attr,			\

			char *buf)					\

{									\

	struct ath5k_softc *sc = dev_get_drvdata(dev);			\

	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\

	struct ath5k_softc *sc = hw->priv;				\

	return snprintf(buf, PAGE_SIZE, "%d\n", get); 			\

}									\

									\
@@ -18,7 +19,8 @@ static ssize_t ath5k_attr_store_##name(struct device *dev, \ 
			struct device_attribute *attr,			\

			const char *buf, size_t count)			\

{									\

	struct ath5k_softc *sc = dev_get_drvdata(dev);			\

	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\

	struct ath5k_softc *sc = hw->priv;				\

	int val;							\

									\

	val = (int)simple_strtoul(buf, NULL, 10);			\
@@ -33,7 +35,8 @@ static ssize_t ath5k_attr_show_##name(struct device *dev, \ 
			struct device_attribute *attr,			\

			char *buf)					\

{									\

	struct ath5k_softc *sc = dev_get_drvdata(dev);			\

	struct ieee80211_hw *hw = dev_get_drvdata(dev);			\

	struct ath5k_softc *sc = hw->priv;				\

	return snprintf(buf, PAGE_SIZE, "%d\n", get); 			\

}									\

static DEVICE_ATTR(name, S_IRUGO, ath5k_attr_show_##name, NULL)

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

+2 −1
Original line number Diff line number Diff line
@@ -671,7 +671,8 @@ static int ath_compute_num_delims(struct ath_softc *sc, struct ath_atx_tid *tid, 
	 * TODO - this could be improved to be dependent on the rate.

	 *      The hardware can keep up at lower rates, but not higher rates

	 */

	if (fi->keyix != ATH9K_TXKEYIX_INVALID)

	if ((fi->keyix != ATH9K_TXKEYIX_INVALID) &&

	    !(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA))

		ndelim += ATH_AGGR_ENCRYPTDELIM;



	/*

drivers/net/wireless/ath/carl9170/usb.c

+2 −0
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ static struct usb_device_id carl9170_usb_ids[] = { 
	{ USB_DEVICE(0x04bb, 0x093f) },

	/* NEC WL300NU-G */

	{ USB_DEVICE(0x0409, 0x0249) },

	/* NEC WL300NU-AG */

	{ USB_DEVICE(0x0409, 0x02b4) },

	/* AVM FRITZ!WLAN USB Stick N */

	{ USB_DEVICE(0x057c, 0x8401) },

	/* AVM FRITZ!WLAN USB Stick N 2.4 */

drivers/net/wireless/rtlwifi/rtl8192cu/sw.c

+1 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static struct usb_device_id rtl8192c_usb_ids[] = { 
	{RTL_USB_DEVICE(0x06f8, 0xe033, rtl92cu_hal_cfg)}, /*Hercules - Edimax*/

	{RTL_USB_DEVICE(0x07b8, 0x8188, rtl92cu_hal_cfg)}, /*Abocom - Abocom*/

	{RTL_USB_DEVICE(0x07b8, 0x8189, rtl92cu_hal_cfg)}, /*Funai - Abocom*/

	{RTL_USB_DEVICE(0x0846, 0x9041, rtl92cu_hal_cfg)}, /*NetGear WNA1000M*/

	{RTL_USB_DEVICE(0x0Df6, 0x0052, rtl92cu_hal_cfg)}, /*Sitecom - Edimax*/

	{RTL_USB_DEVICE(0x0eb0, 0x9071, rtl92cu_hal_cfg)}, /*NO Brand - Etop*/

	/* HP - Lite-On ,8188CUS Slim Combo */