[ipfire-2.x.git] / src / patches / linux-3.14.25-rt5592_no_special_txop_init.patch

diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
--- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c	2014-11-21 18:23:44.000000000 +0100
+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c	2014-12-03 11:30:58.813355413 +0100
@@ -4847,7 +4847,8 @@
 	rt2x00_set_field32(&reg, TXOP_CTRL_CFG_EXT_CWMIN, 0);
 	rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
 
-	reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
+//	reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
+	reg = 0x00000002;
 	rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
 
 	rt2800_register_read(rt2x00dev, TX_RTS_CFG, &reg);
Commit	Line	Data
e71475c1 AF	1	diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
	2	--- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c 2014-11-21 18:23:44.000000000 +0100
	3	+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c 2014-12-03 11:30:58.813355413 +0100
	4	@@ -4847,7 +4847,8 @@
	5	rt2x00_set_field32(&reg, TXOP_CTRL_CFG_EXT_CWMIN, 0);
	6	rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
	7
	8	- reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
	9	+// reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
	10	+ reg = 0x00000002;
	11	rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
	12
	13	rt2800_register_read(rt2x00dev, TX_RTS_CFG, &reg);