From: David S. Miller <davem@davemloft.net>
Date: Tue, 23 Mar 2010 01:15:15 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33e2bf6aa16061bae1253514e7c32af27d2b4b31;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
---

33e2bf6aa16061bae1253514e7c32af27d2b4b31
diff --cc Documentation/feature-removal-schedule.txt
index ed511af0f79a,a841e79dfac6..267e90582d20
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -520,29 -520,24 +520,48 @@@ Who:	Hans de Goede <hdegoede@redhat.com
  
  ----------------------------
  
++
 +What:	corgikbd, spitzkbd, tosakbd driver
 +When:	2.6.35
 +Files:	drivers/input/keyboard/{corgi,spitz,tosa}kbd.c
 +Why:	We now have a generic GPIO based matrix keyboard driver that
 +	are fully capable of handling all the keys on these devices.
 +	The original drivers manipulate the GPIO registers directly
 +	and so are difficult to maintain.
 +Who:	Eric Miao <eric.y.miao@gmail.com>
 +
 +----------------------------
 +
 +What:	corgi_ssp and corgi_ts driver
 +When:	2.6.35
 +Files:	arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c
 +Why:	The corgi touchscreen is now deprecated in favour of the generic
 +	ads7846.c driver. The noise reduction technique used in corgi_ts.c,
 +	that's to wait till vsync before ADC sampling, is also integrated into
 +	ads7846 driver now. Provided that the original driver is not generic
 +	and is difficult to maintain, it will be removed later.
 +Who:	Eric Miao <eric.y.miao@gmail.com>
 +
 +----------------------------
 +
+ What:	sysfs-class-rfkill state file
+ When:	Feb 2014
+ Files:	net/rfkill/core.c
+ Why: 	Documented as obsolete since Feb 2010. This file is limited to 3
+ 	states while the rfkill drivers can have 4 states.
+ Who: 	anybody or Florian Mickler <florian@mickler.org>
+ 
+ ----------------------------
+ 
+ What: 	sysfs-class-rfkill claim file
+ When:	Feb 2012
+ Files:	net/rfkill/core.c
+ Why:	It is not possible to claim an rfkill driver since 2007. This is
+ 	Documented as obsolete since Feb 2010.
+ Who: 	anybody or Florian Mickler <florian@mickler.org>
+ 
+ ----------------------------
+ 
  What:	capifs
  When:	February 2011
  Files:	drivers/isdn/capi/capifs.*
diff --cc drivers/net/wireless/ath/ath5k/phy.c
index eff3323efb4b,384347b0c9f0..a8adca62e527
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@@ -1399,26 -1391,38 +1397,30 @@@ static int ath5k_hw_rf511x_calibrate(st
  	}
  
  	i_coffd = ((i_pwr >> 1) + (q_pwr >> 1)) >> 7;
- 	q_coffd = q_pwr >> 7;
+ 
+ 	if (ah->ah_version == AR5K_AR5211)
+ 		q_coffd = q_pwr >> 6;
+ 	else
+ 		q_coffd = q_pwr >> 7;
  
 -	/* No correction */
 -	if (i_coffd == 0 || q_coffd == 0)
 +	/* protect against divide by 0 and loss of sign bits */
 +	if (i_coffd == 0 || q_coffd < 2)
  		goto done;
  
 -	i_coff = ((-iq_corr) / i_coffd);
 +	i_coff = (-iq_corr) / i_coffd;
 +	i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */
  
 -	/* Boundary check */
 -	if (i_coff > 31)
 -		i_coff = 31;
 -	if (i_coff < -32)
 -		i_coff = -32;
 -
 -	if (ah->ah_version == AR5K_AR5211)
 -		q_coff = (i_pwr / q_coffd) - 64;
 -	else
 -		q_coff = (i_pwr / q_coffd) - 128;
 +	q_coff = (i_pwr / q_coffd) - 128;
 +	q_coff = clamp(q_coff, -16, 15); /* signed 5 bit */
  
 -	/* Boundary check */
 -	if (q_coff > 15)
 -		q_coff = 15;
 -	if (q_coff < -16)
 -		q_coff = -16;
 +	ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_CALIBRATE,
 +			"new I:%d Q:%d (i_coffd:%x q_coffd:%x)",
 +			i_coff, q_coff, i_coffd, q_coffd);
  
 -	/* Commit new I/Q value */
 -	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_ENABLE |
 -		((u32)q_coff) | ((u32)i_coff << AR5K_PHY_IQ_CORR_Q_I_COFF_S));
 +	/* Commit new I/Q values (set enable bit last to match HAL sources) */
 +	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_Q_I_COFF, i_coff);
 +	AR5K_REG_WRITE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_Q_Q_COFF, q_coff);
 +	AR5K_REG_ENABLE_BITS(ah, AR5K_PHY_IQ, AR5K_PHY_IQ_CORR_ENABLE);
  
  	/* Re-enable calibration -if we don't we'll commit
  	 * the same values again and again */
diff --cc drivers/net/wireless/ath/ath5k/reset.c
index cbf28e379843,4120068792ec..44bbbf2a6edd
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@@ -1382,11 -1393,10 +1396,9 @@@ int ath5k_hw_reset(struct ath5k_hw *ah
  		ath5k_hw_set_sleep_clock(ah, true);
  
  	/*
 -	 * Disable beacons and reset the register
 +	 * Disable beacons and reset the TSF
  	 */
 -	AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE |
 -			AR5K_BEACON_RESET_TSF);
 -
 +	AR5K_REG_DISABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_ENABLE);
 +	ath5k_hw_reset_tsf(ah);
  	return 0;
  }
- 
- #undef _ATH5K_RESET