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

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

Merge branch 'for-davem' of... 

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
parents 2c6607c6 06778b1c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5053,7 +5053,7 @@ L: linux-wireless@vger.kernel.org 
W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8180*

F:	drivers/net/wireless/rtl818x/rtl8180/



RTL8187 WIRELESS DRIVER

M:	Herton Ronaldo Krzesinski <herton@mandriva.com.br>
@@ -5063,7 +5063,7 @@ L: linux-wireless@vger.kernel.org 
W:	http://linuxwireless.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git

S:	Maintained

F:	drivers/net/wireless/rtl818x/rtl8187*

F:	drivers/net/wireless/rtl818x/rtl8187/



RTL8192CE WIRELESS DRIVER

M:	Larry Finger <Larry.Finger@lwfinger.net>

drivers/net/wireless/airo.c

+7 −13
Original line number Diff line number Diff line
@@ -4652,24 +4652,18 @@ static ssize_t proc_write( struct file *file, 
			   size_t len,

			   loff_t *offset )

{

	loff_t pos = *offset;

	ssize_t ret;

	struct proc_data *priv = file->private_data;



	if (!priv->wbuffer)

		return -EINVAL;



	if (pos < 0)

		return -EINVAL;

	if (pos >= priv->maxwritelen)

		return 0;

	if (len > priv->maxwritelen - pos)

		len = priv->maxwritelen - pos;

	if (copy_from_user(priv->wbuffer + pos, buffer, len))

		return -EFAULT;

	if ( pos + len > priv->writelen )

		priv->writelen = len + file->f_pos;

	*offset = pos + len;

	return len;

	ret = simple_write_to_buffer(priv->wbuffer, priv->maxwritelen, offset,

					buffer, len);

	if (ret > 0)

		priv->writelen = max_t(int, priv->writelen, *offset);



	return ret;

}



static int proc_status_open(struct inode *inode, struct file *file)

drivers/net/wireless/ath/ath5k/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ ath5k-y += led.o 
ath5k-y				+= rfkill.o

ath5k-y				+= ani.o

ath5k-y				+= sysfs.o

ath5k-y				+= mac80211-ops.o

ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o

ath5k-$(CONFIG_ATH5K_AHB)	+= ahb.o

ath5k-$(CONFIG_ATH5K_PCI)	+= pci.o

drivers/net/wireless/ath/ath5k/ath5k.h

+3 −5
Original line number Diff line number Diff line
@@ -154,10 +154,6 @@ 
		udelay(1);						\

} while (0)



/* Register dumps are done per operation mode */

#define AR5K_INI_RFGAIN_5GHZ		0

#define AR5K_INI_RFGAIN_2GHZ		1



/*

 * Some tuneable values (these should be changeable by the user)

 * TODO: Make use of them and add more options OR use debug/configfs
@@ -1107,12 +1103,14 @@ struct ath5k_hw { 
		/* Values in 0.25dB units */

		s16		txp_min_pwr;

		s16		txp_max_pwr;

		s16		txp_cur_pwr;

		/* Values in 0.5dB units */

		s16		txp_offset;

		s16		txp_ofdm;

		s16		txp_cck_ofdm_gainf_delta;

		/* Value in dB units */

		s16		txp_cck_ofdm_pwr_delta;

		bool		txp_setup;

	} ah_txpower;



	struct {
@@ -1320,7 +1318,7 @@ void ath5k_hw_set_antenna_switch(struct ath5k_hw *ah, u8 ee_mode); 
int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, u8 txpower);

/* Init function */

int ath5k_hw_phy_init(struct ath5k_hw *ah, struct ieee80211_channel *channel,

				u8 mode, u8 ee_mode, u8 freq, bool fast);

				u8 mode, bool fast);



/*

 * Functions used internaly

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

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ int ath5k_hw_init(struct ath5k_softc *sc) 
	/*

	 * Write PCI-E power save settings

	 */

	if ((ah->ah_version == AR5K_AR5212) && pdev && (pdev->is_pcie)) {

	if ((ah->ah_version == AR5K_AR5212) && pdev && (pci_is_pcie(pdev))) {

		ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES);

		ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES);