From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 27 Sep 2013 16:18:24 +0000 (-0700)
Subject: 3.0-stable patches
X-Git-Tag: v3.0.98~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbd1cd7fbd93707f2825ed007d6df69a5cd09385;p=thirdparty%2Fkernel%2Fstable-queue.git

3.0-stable patches

added patches:
	net-usb-cdc_ether-use-wwan-interface-for-telit-modules.patch
	rt2800-fix-wrong-tx-power-compensation.patch
---

diff --git a/queue-3.0/net-usb-cdc_ether-use-wwan-interface-for-telit-modules.patch b/queue-3.0/net-usb-cdc_ether-use-wwan-interface-for-telit-modules.patch
new file mode 100644
index 00000000000..4ee36a0b780
--- /dev/null
+++ b/queue-3.0/net-usb-cdc_ether-use-wwan-interface-for-telit-modules.patch
@@ -0,0 +1,32 @@
+From 0092820407901a0b2c4e343e85f96bb7abfcded1 Mon Sep 17 00:00:00 2001
+From: Fabio Porcedda <fabio.porcedda@gmail.com>
+Date: Mon, 16 Sep 2013 11:47:50 +0200
+Subject: net: usb: cdc_ether: Use wwan interface for Telit modules
+
+From: Fabio Porcedda <fabio.porcedda@gmail.com>
+
+commit 0092820407901a0b2c4e343e85f96bb7abfcded1 upstream.
+
+Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com>
+Acked-by: Oliver Neukum <oliver@neukum.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/usb/cdc_ether.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/net/usb/cdc_ether.c
++++ b/drivers/net/usb/cdc_ether.c
+@@ -615,6 +615,11 @@ static const struct usb_device_id	produc
+ 	.bInterfaceProtocol	= USB_CDC_PROTO_NONE,
+ 	.driver_info = (unsigned long)&wwan_info,
+ }, {
++	/* Telit modules */
++	USB_VENDOR_AND_INTERFACE_INFO(0x1bc7, USB_CLASS_COMM,
++			USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE),
++	.driver_info = (kernel_ulong_t) &wwan_info,
++}, {
+ 	USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ETHERNET,
+ 			USB_CDC_PROTO_NONE),
+ 	.driver_info = (unsigned long) &cdc_info,
diff --git a/queue-3.0/rt2800-fix-wrong-tx-power-compensation.patch b/queue-3.0/rt2800-fix-wrong-tx-power-compensation.patch
new file mode 100644
index 00000000000..b2fc98578f3
--- /dev/null
+++ b/queue-3.0/rt2800-fix-wrong-tx-power-compensation.patch
@@ -0,0 +1,43 @@
+From 6e956da2027c767859128b9bfef085cf2a8e233b Mon Sep 17 00:00:00 2001
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Mon, 26 Aug 2013 15:18:53 +0200
+Subject: rt2800: fix wrong TX power compensation
+
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+
+commit 6e956da2027c767859128b9bfef085cf2a8e233b upstream.
+
+We should not do temperature compensation on devices without
+EXTERNAL_TX_ALC bit set (called DynamicTxAgcControl on vendor driver).
+Such devices can have totally bogus TSSI parameters on the EEPROM,
+but still threaded by us as valid and result doing wrong TX power
+calculations.
+
+This fix inability to connect to AP on slightly longer distance on
+some Ralink chips/devices.
+
+Reported-and-tested-by: Fabien ADAM <id2ndr@crocobox.org>
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+Signed-off-by: John W. Linville <linville@tuxdriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/wireless/rt2x00/rt2800lib.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/net/wireless/rt2x00/rt2800lib.c
++++ b/drivers/net/wireless/rt2x00/rt2800lib.c
+@@ -1861,6 +1861,13 @@ static int rt2800_get_gain_calibration_d
+ 	int i;
+ 
+ 	/*
++	 * First check if temperature compensation is supported.
++	 */
++	rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
++	if (!rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_EXTERNAL_TX_ALC))
++		return 0;
++
++	/*
+ 	 * Read TSSI boundaries for temperature compensation from
+ 	 * the EEPROM.
+ 	 *
diff --git a/queue-3.0/series b/queue-3.0/series
index 13558d1ee14..521cbcc1dd8 100644
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -1 +1,3 @@
 revert-sctp-fix-call-to-sctp_cmd_process_sack-in.patch
+net-usb-cdc_ether-use-wwan-interface-for-telit-modules.patch
+rt2800-fix-wrong-tx-power-compensation.patch