]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
kernel: rt5572 patches part2.
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 7 Dec 2014 10:04:46 +0000 (11:04 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 7 Dec 2014 10:04:46 +0000 (11:04 +0100)
src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch [new file with mode: 0644]
src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch [new file with mode: 0644]

diff --git a/src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch b/src/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
new file mode 100644 (file)
index 0000000..fe30c9e
--- /dev/null
@@ -0,0 +1,13 @@
+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);
diff --git a/src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch b/src/patches/linux-3.14.25_rt2x00_fix_bss_bcn_num.patch
new file mode 100644 (file)
index 0000000..87ea39a
--- /dev/null
@@ -0,0 +1,12 @@
+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-12-03 11:30:58.000000000 +0100
++++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c      2014-12-03 12:15:45.743454351 +0100
+@@ -1557,7 +1557,7 @@
+               if (!is_zero_ether_addr((const u8 *)conf->bssid)) {
+                       reg = le32_to_cpu(conf->bssid[1]);
+                       rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_ID_MASK, 3);
+-                      rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 7);
++                      rt2x00_set_field32(&reg, MAC_BSSID_DW1_BSS_BCN_NUM, 0);
+                       conf->bssid[1] = cpu_to_le32(reg);
+               }