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

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

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

parents 85997576 26d1597c

drivers/net/wireless/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ config WLAN_80211 
	  lets you choose drivers.



config PCMCIA_RAYCS

	tristate "Aviator/Raytheon 2.4MHz wireless support"

	tristate "Aviator/Raytheon 2.4GHz wireless support"

	depends on PCMCIA && WLAN_80211

	select WIRELESS_EXT

	---help---

drivers/net/wireless/ath5k/base.c

+4 −4
Original line number Diff line number Diff line
@@ -2644,7 +2644,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		if (skb_headroom(skb) < padsize) {

			ATH5K_ERR(sc, "tx hdrlen not %%4: %d not enough"

				  " headroom to pad %d\n", hdrlen, padsize);

			return -1;

			return NETDEV_TX_BUSY;

		}

		skb_push(skb, padsize);

		memmove(skb->data, skb->data+padsize, hdrlen);
@@ -2655,7 +2655,7 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		ATH5K_ERR(sc, "no further txbuf available, dropping packet\n");

		spin_unlock_irqrestore(&sc->txbuflock, flags);

		ieee80211_stop_queue(hw, skb_get_queue_mapping(skb));

		return -1;

		return NETDEV_TX_BUSY;

	}

	bf = list_first_entry(&sc->txbuf, struct ath5k_buf, list);

	list_del(&bf->list);
@@ -2673,10 +2673,10 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb) 
		sc->txbuf_len++;

		spin_unlock_irqrestore(&sc->txbuflock, flags);

		dev_kfree_skb_any(skb);

		return 0;

		return NETDEV_TX_OK;

	}



	return 0;

	return NETDEV_TX_OK;

}



static int

drivers/net/wireless/ath5k/pcu.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah) 
		if (ah->ah_version == AR5K_AR5210)

			pcu_reg |= AR5K_STA_ID1_NO_PSPOLL;

		else

			AR5K_REG_DISABLE_BITS(ah, AR5K_CFG, AR5K_CFG_ADHOC);

			AR5K_REG_ENABLE_BITS(ah, AR5K_CFG, AR5K_CFG_IBSS);

		break;



	case NL80211_IFTYPE_AP:
@@ -75,7 +75,7 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah) 
		if (ah->ah_version == AR5K_AR5210)

			pcu_reg |= AR5K_STA_ID1_NO_PSPOLL;

		else

			AR5K_REG_ENABLE_BITS(ah, AR5K_CFG, AR5K_CFG_ADHOC);

			AR5K_REG_DISABLE_BITS(ah, AR5K_CFG, AR5K_CFG_IBSS);

		break;



	case NL80211_IFTYPE_STATION:

drivers/net/wireless/ath5k/reg.h

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
#define	AR5K_CFG_SWRD		0x00000004	/* Byte-swap RX descriptor */

#define	AR5K_CFG_SWRB		0x00000008	/* Byte-swap RX buffer */

#define	AR5K_CFG_SWRG		0x00000010	/* Byte-swap Register access */

#define AR5K_CFG_ADHOC		0x00000020 	/* AP/Adhoc indication [5211+] */

#define AR5K_CFG_IBSS		0x00000020 	/* 0-BSS, 1-IBSS [5211+] */

#define AR5K_CFG_PHY_OK		0x00000100	/* [5211+] */

#define AR5K_CFG_EEBS		0x00000200	/* EEPROM is busy */

#define	AR5K_CFG_CLKGD		0x00000400	/* Clock gated (Disable dynamic clock) */

drivers/net/wireless/ath9k/Kconfig

+1 −0
Original line number Diff line number Diff line 
config ATH9K

	tristate "Atheros 802.11n wireless cards support"

	depends on PCI && MAC80211 && WLAN_80211

	depends on RFKILL || RFKILL=n

	select MAC80211_LEDS

	select LEDS_CLASS

	select NEW_LEDS