Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42683master
parent
54a18b3fe8
commit
8be721208d
@ -1,44 +0,0 @@ |
||||
From: Luis R. Rodriguez <mcgrof@do-not-panic.com>
|
||||
Date: Wed, 23 Oct 2013 14:55:36 -0400
|
||||
Subject: [RFC] cfg80211: make genregdb.awk skip antenna gain
|
||||
|
||||
Now that wireless-regdb doesn't include
|
||||
antenna gain lets skip parsing it completely
|
||||
for when CONFIG_CFG80211_INTERNAL_REGDB is
|
||||
enabled.
|
||||
|
||||
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
|
||||
---
|
||||
net/wireless/genregdb.awk | 11 ++++-------
|
||||
1 file changed, 4 insertions(+), 7 deletions(-)
|
||||
mode change 100644 => 100755 net/wireless/genregdb.awk
|
||||
|
||||
--- a/net/wireless/genregdb.awk
|
||||
+++ b/net/wireless/genregdb.awk
|
||||
@@ -56,14 +56,11 @@ function parse_reg_rule()
|
||||
end = $3
|
||||
bw = $5
|
||||
sub(/\),/, "", bw)
|
||||
- gain = $6
|
||||
- sub(/\(/, "", gain)
|
||||
- sub(/,/, "", gain)
|
||||
- power = $7
|
||||
- sub(/\)/, "", power)
|
||||
+ power = $6
|
||||
+ sub(/\(/, "", power)
|
||||
sub(/,/, "", power)
|
||||
# power might be in mW...
|
||||
- units = $8
|
||||
+ units = $7
|
||||
sub(/\)/, "", units)
|
||||
sub(/,/, "", units)
|
||||
dfs_cac = $9
|
||||
@@ -86,7 +83,7 @@ function parse_reg_rule()
|
||||
sub(/\(/, "", dfs_cac)
|
||||
sub(/\)/, "", dfs_cac)
|
||||
flagstr = ""
|
||||
- for (i=8; i<=NF; i++)
|
||||
+ for (i=7; i<=NF; i++)
|
||||
flagstr = flagstr $i
|
||||
split(flagstr, flagarray, ",")
|
||||
flags = ""
|
@ -1,11 +0,0 @@ |
||||
--- a/drivers/net/wireless/mwifiex/main.c
|
||||
+++ b/drivers/net/wireless/mwifiex/main.c
|
||||
@@ -745,7 +745,7 @@ static struct net_device_stats *mwifiex_
|
||||
return &priv->stats;
|
||||
}
|
||||
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)
|
||||
static u16
|
||||
mwifiex_netdev_select_wmm_queue(struct net_device *dev, struct sk_buff *skb,
|
||||
void *accel_priv, select_queue_fallback_t fallback)
|
@ -1,10 +0,0 @@ |
||||
--- a/compat/backport-3.15.c
|
||||
+++ b/compat/backport-3.15.c
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/of.h>
|
||||
+#include <linux/string.h>
|
||||
#include <net/net_namespace.h>
|
||||
|
||||
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0))
|
@ -1,27 +0,0 @@ |
||||
From 6e5603fa9e5b0d3c602eb1672473e81a1692f61e Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 31 May 2014 15:52:42 +0200
|
||||
Subject: [PATCH] backports: only add net_get_random_once() when not available
|
||||
|
||||
Upstream commit: d787b3dd3b4fcb5f40eb6532163dc3abdca4fd45
|
||||
|
||||
net_get_random_once() was added unconditionally also when the kernel we
|
||||
are compiling against already provided this function, this patch checks
|
||||
that first.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
backport/backport-include/linux/net.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/backport-include/linux/net.h
|
||||
+++ b/backport-include/linux/net.h
|
||||
@@ -64,7 +64,7 @@ do { \
|
||||
* may affect tracing. My recommendation is that if you have a need for
|
||||
* static keys you just require at least 3.5 to remain sane.
|
||||
*/
|
||||
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) && !defined(net_get_random_once)
|
||||
#define __BACKPORT_NET_GET_RANDOM_ONCE 1
|
||||
#endif
|
||||
#endif /* ___NET_RANDOM_STATIC_KEY_INIT */
|
@ -1,11 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath5k/Kconfig
|
||||
+++ b/drivers/net/wireless/ath/ath5k/Kconfig
|
||||
@@ -55,7 +55,7 @@ config ATH5K_TRACER
|
||||
|
||||
config ATH5K_AHB
|
||||
bool "Atheros 5xxx AHB bus support"
|
||||
- depends on (ATHEROS_AR231X && !PCI)
|
||||
+ depends on ATHEROS_AR231X
|
||||
---help---
|
||||
This adds support for WiSoC type chipsets of the 5xxx Atheros
|
||||
family.
|
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,10 @@ |
||||
--- a/drivers/net/wireless/ath/ath9k/init.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/init.c
|
||||
@@ -655,6 +655,7 @@ static const struct ieee80211_iface_limi
|
||||
@@ -670,6 +670,7 @@ static const struct ieee80211_iface_limi
|
||||
BIT(NL80211_IFTYPE_AP) },
|
||||
{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
|
||||
BIT(NL80211_IFTYPE_P2P_GO) },
|
||||
+ { .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },
|
||||
};
|
||||
|
||||
static const struct ieee80211_iface_limit if_dfs_limits[] = {
|
||||
static const struct ieee80211_iface_limit wds_limits[] = {
|
||||
|
@ -1,34 +0,0 @@ |
||||
--- a/drivers/net/wireless/ath/ath.h
|
||||
+++ b/drivers/net/wireless/ath/ath.h
|
||||
@@ -83,6 +83,7 @@ struct ath_regulatory {
|
||||
u16 max_power_level;
|
||||
u16 current_rd;
|
||||
int16_t power_limit;
|
||||
+ int16_t max_antenna_gain;
|
||||
struct reg_dmn_pair_mapping *regpair;
|
||||
};
|
||||
|
||||
--- a/drivers/net/wireless/ath/ath9k/hw.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/hw.c
|
||||
@@ -2724,7 +2724,7 @@ void ath9k_hw_apply_txpower(struct ath_h
|
||||
channel = chan->chan;
|
||||
chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
|
||||
new_pwr = min_t(int, chan_pwr, reg->power_limit);
|
||||
- max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
|
||||
+ max_gain = chan_pwr - new_pwr + reg->max_antenna_gain * 2;
|
||||
|
||||
ant_gain = get_antenna_gain(ah, chan);
|
||||
if (ant_gain > max_gain)
|
||||
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||||
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||||
@@ -1405,7 +1405,10 @@ static int ath9k_config(struct ieee80211
|
||||
}
|
||||
|
||||
if (changed & IEEE80211_CONF_CHANGE_POWER) {
|
||||
+ struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
|
||||
+
|
||||
ath_dbg(common, CONFIG, "Set power: %d\n", conf->power_level);
|
||||
+ reg->max_antenna_gain = conf->max_antenna_gain;
|
||||
sc->config.txpowlimit = 2 * conf->power_level;
|
||||
ath9k_cmn_update_txpow(ah, sc->curtxpow,
|
||||
sc->config.txpowlimit, &sc->curtxpow);
|
File diff suppressed because it is too large
Load Diff
@ -1,12 +0,0 @@ |
||||
--- a/drivers/net/wireless/b43/phy_n.c
|
||||
+++ b/drivers/net/wireless/b43/phy_n.c
|
||||
@@ -6217,6 +6217,9 @@ static void b43_nphy_channel_setup(struc
|
||||
u16 tmp16;
|
||||
|
||||
if (new_channel->band == IEEE80211_BAND_5GHZ) {
|
||||
+ /* Switch to 2 GHz for a moment to access B43_PHY_B_BBCFG */
|
||||
+ b43_phy_mask(dev, B43_NPHY_BANDCTL, ~B43_NPHY_BANDCTL_5GHZ);
|
||||
+
|
||||
tmp16 = b43_read16(dev, B43_MMIO_PSM_PHY_HDR);
|
||||
b43_write16(dev, B43_MMIO_PSM_PHY_HDR, tmp16 | 4);
|
||||
/* Put BPHY in the reset */
|
@ -1,256 +0,0 @@ |
||||
From 4f214b1ead0af7439921637645cb63f378516175 Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 21 Jan 2012 18:48:38 +0100
|
||||
Subject: [PATCH 33/34] b43: add workaround for b43 on pcie bus of bcm4716.
|
||||
|
||||
bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
|
||||
transactions. As a fix, a read after write is performed on certain
|
||||
places in the code. Older chips and the newer 5357 family don't require
|
||||
this fix.
|
||||
This code is based on the brcmsmac driver.
|
||||
|
||||
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/net/wireless/b43/b43.h | 26 ++++++++++++++++++++++++++
|
||||
drivers/net/wireless/b43/bus.h | 10 ++++++++++
|
||||
drivers/net/wireless/b43/phy_common.c | 6 ++++++
|
||||
drivers/net/wireless/b43/phy_n.c | 10 +++++-----
|
||||
4 files changed, 47 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/drivers/net/wireless/b43/b43.h
|
||||
+++ b/drivers/net/wireless/b43/b43.h
|
||||
@@ -1054,6 +1054,15 @@ static inline bool b43_using_pio_transfe
|
||||
return dev->__using_pio_transfers;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_BCM47XX_BCMA
|
||||
+void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value);
|
||||
+#else
|
||||
+static inline void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value)
|
||||
+{
|
||||
+ b43_write16(dev, offset, value);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/* Message printing */
|
||||
__printf(2, 3) void b43info(struct b43_wl *wl, const char *fmt, ...);
|
||||
__printf(2, 3) void b43err(struct b43_wl *wl, const char *fmt, ...);
|
||||
--- a/drivers/net/wireless/b43/bus.h
|
||||
+++ b/drivers/net/wireless/b43/bus.h
|
||||
@@ -70,6 +70,18 @@ static inline bool b43_bus_host_is_sdio(
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
+static inline bool b43_bus_host_is_pci(struct b43_bus_dev *dev)
|
||||
+{
|
||||
+#ifdef CPTCFG_B43_BCMA
|
||||
+ if (dev->bus_type == B43_BUS_BCMA)
|
||||
+ return (dev->bdev->bus->hosttype == BCMA_HOSTTYPE_PCI);
|
||||
+#endif
|
||||
+#ifdef CPTCFG_B43_SSB
|
||||
+ if (dev->bus_type == B43_BUS_SSB)
|
||||
+ return (dev->sdev->bus->bustype == SSB_BUSTYPE_PCI);
|
||||
+#endif
|
||||
+ return false;
|
||||
+}
|
||||
|
||||
struct b43_bus_dev *b43_bus_dev_bcma_init(struct bcma_device *core);
|
||||
struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev);
|
||||
--- a/drivers/net/wireless/b43/main.c
|
||||
+++ b/drivers/net/wireless/b43/main.c
|
||||
@@ -4481,7 +4481,7 @@ static int b43_phy_versioning(struct b43
|
||||
u16 radio24[3];
|
||||
|
||||
for (tmp = 0; tmp < 3; tmp++) {
|
||||
- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, tmp);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, tmp);
|
||||
radio24[tmp] = b43_read16(dev, B43_MMIO_RADIO24_DATA);
|
||||
}
|
||||
|
||||
@@ -4498,10 +4498,10 @@ static int b43_phy_versioning(struct b43
|
||||
else
|
||||
tmp = 0x5205017F;
|
||||
} else {
|
||||
- b43_write16(dev, B43_MMIO_RADIO_CONTROL,
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL,
|
||||
B43_RADIOCTL_ID);
|
||||
tmp = b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
|
||||
- b43_write16(dev, B43_MMIO_RADIO_CONTROL,
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL,
|
||||
B43_RADIOCTL_ID);
|
||||
tmp |= (u32)b43_read16(dev, B43_MMIO_RADIO_DATA_HIGH)
|
||||
<< 16;
|
||||
@@ -4576,6 +4576,26 @@ static int b43_phy_versioning(struct b43
|
||||
return 0;
|
||||
}
|
||||
|
||||
+/*
|
||||
+ * bcm4716 (which includes 4717 & 4718), plus 4706 on PCIe can reorder
|
||||
+ * transactions. As a fix, a read after write is performed on certain places
|
||||
+ * in the code. Older chips and the newer 5357 family don't require this fix.
|
||||
+ */
|
||||
+#ifdef CONFIG_BCM47XX_BCMA
|
||||
+#include <asm/mach-bcm47xx/bcm47xx.h>
|
||||
+void b43_wflush16(struct b43_wldev *dev, u16 offset, u16 value)
|
||||
+{
|
||||
+ if (b43_bus_host_is_pci(dev->dev) &&
|
||||
+ bcm47xx_bus_type == BCM47XX_BUS_TYPE_BCMA &&
|
||||
+ bcm47xx_bus.bcma.bus.chipinfo.id == BCMA_CHIP_ID_BCM4716) {
|
||||
+ b43_write16(dev, offset, value);
|
||||
+ b43_read16(dev, offset);
|
||||
+ } else {
|
||||
+ b43_write16(dev, offset, value);
|
||||
+ }
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static void setup_struct_phy_for_init(struct b43_wldev *dev,
|
||||
struct b43_phy *phy)
|
||||
{
|
||||
--- a/drivers/net/wireless/b43/phy_common.c
|
||||
+++ b/drivers/net/wireless/b43/phy_common.c
|
||||
@@ -275,6 +275,12 @@ void b43_phy_write(struct b43_wldev *dev
|
||||
{
|
||||
assert_mac_suspended(dev);
|
||||
dev->phy.ops->phy_write(dev, reg, value);
|
||||
+#ifdef CONFIG_BCM47XX
|
||||
+ if (b43_bus_host_is_pci(dev->dev) && reg == 0x72) {
|
||||
+ b43_read16(dev, B43_MMIO_PHY_VER);
|
||||
+ return;
|
||||
+ }
|
||||
+#endif
|
||||
if (++dev->phy.writes_counter == B43_MAX_WRITES_IN_ROW) {
|
||||
b43_read16(dev, B43_MMIO_PHY_VER);
|
||||
dev->phy.writes_counter = 0;
|
||||
--- a/drivers/net/wireless/b43/phy_ht.c
|
||||
+++ b/drivers/net/wireless/b43/phy_ht.c
|
||||
@@ -1073,20 +1073,20 @@ static unsigned int b43_phy_ht_op_get_de
|
||||
|
||||
static u16 b43_phy_ht_op_read(struct b43_wldev *dev, u16 reg)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
return b43_read16(dev, B43_MMIO_PHY_DATA);
|
||||
}
|
||||
|
||||
static void b43_phy_ht_op_write(struct b43_wldev *dev, u16 reg, u16 value)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_PHY_DATA, value);
|
||||
}
|
||||
|
||||
static void b43_phy_ht_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
|
||||
u16 set)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_PHY_DATA,
|
||||
(b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
|
||||
}
|
||||
@@ -1096,14 +1096,14 @@ static u16 b43_phy_ht_op_radio_read(stru
|
||||
/* HT-PHY needs 0x200 for read access */
|
||||
reg |= 0x200;
|
||||
|
||||
- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
return b43_read16(dev, B43_MMIO_RADIO24_DATA);
|
||||
}
|
||||
|
||||
static void b43_phy_ht_op_radio_write(struct b43_wldev *dev, u16 reg,
|
||||
u16 value)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_RADIO24_DATA, value);
|
||||
}
|
||||
|
||||
--- a/drivers/net/wireless/b43/phy_lcn.c
|
||||
+++ b/drivers/net/wireless/b43/phy_lcn.c
|
||||
@@ -812,20 +812,20 @@ static void b43_phy_lcn_op_adjust_txpowe
|
||||
|
||||
static u16 b43_phy_lcn_op_read(struct b43_wldev *dev, u16 reg)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
return b43_read16(dev, B43_MMIO_PHY_DATA);
|
||||
}
|
||||
|
||||
static void b43_phy_lcn_op_write(struct b43_wldev *dev, u16 reg, u16 value)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_PHY_DATA, value);
|
||||
}
|
||||
|
||||
static void b43_phy_lcn_op_maskset(struct b43_wldev *dev, u16 reg, u16 mask,
|
||||
u16 set)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_PHY_DATA,
|
||||
(b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
|
||||
}
|
||||
@@ -835,14 +835,14 @@ static u16 b43_phy_lcn_op_radio_read(str
|
||||
/* LCN-PHY needs 0x200 for read access */
|
||||
reg |= 0x200;
|
||||
|
||||
- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
return b43_read16(dev, B43_MMIO_RADIO24_DATA);
|
||||
}
|
||||
|
||||
static void b43_phy_lcn_op_radio_write(struct b43_wldev *dev, u16 reg,
|
||||
u16 value)
|
||||
{
|
||||
- b43_write16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO24_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_RADIO24_DATA, value);
|
||||
}
|
||||
|
||||
--- a/drivers/net/wireless/b43/phy_n.c
|
||||
+++ b/drivers/net/wireless/b43/phy_n.c
|
||||
@@ -6500,14 +6500,14 @@ static inline void check_phyreg(struct b
|
||||
static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
|
||||
{
|
||||
check_phyreg(dev, reg);
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
return b43_read16(dev, B43_MMIO_PHY_DATA);
|
||||
}
|
||||
|
||||
static void b43_nphy_op_write(struct b43_wldev *dev, u16 reg, u16 value)
|
||||
{
|
||||
check_phyreg(dev, reg);
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_PHY_DATA, value);
|
||||
}
|
||||
|
||||
@@ -6515,7 +6515,7 @@ static void b43_nphy_op_maskset(struct b
|
||||
u16 set)
|
||||
{
|
||||
check_phyreg(dev, reg);
|
||||
- b43_write16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_PHY_CONTROL, reg);
|
||||
b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
|
||||
}
|
||||
|
||||
@@ -6529,7 +6529,7 @@ static u16 b43_nphy_op_radio_read(struct
|
||||
else
|
||||
reg |= 0x100;
|
||||
|
||||
- b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL, reg);
|
||||
return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
|
||||
}
|
||||
|
||||
@@ -6538,7 +6538,7 @@ static void b43_nphy_op_radio_write(stru
|
||||
/* Register 1 is a 32-bit register. */
|
||||
B43_WARN_ON(dev->phy.rev < 7 && reg == 1);
|
||||
|
||||
- b43_write16(dev, B43_MMIO_RADIO_CONTROL, reg);
|
||||
+ b43_wflush16(dev, B43_MMIO_RADIO_CONTROL, reg);
|
||||
b43_write16(dev, B43_MMIO_RADIO_DATA_LOW, value);
|
||||
}
|
||||
|
@ -1,36 +0,0 @@ |
||||
From 4101e8dc540d19f1f6c24930629149191786e4cd Mon Sep 17 00:00:00 2001
|
||||
From: Arik Nemtsov <arik@wizery.com>
|
||||
Date: Mon, 9 Sep 2013 16:48:59 +0300
|
||||
Subject: [PATCH 27/75] wlcore: don't switch channels on disconnected STA vifs
|
||||
|
||||
Sending the FW a channel switch command on a disconnected vif may result
|
||||
in a beacon loss event. Avoid this edge case.
|
||||
|
||||
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
||||
---
|
||||
drivers/net/wireless/ti/wlcore/main.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
--- a/drivers/net/wireless/ti/wlcore/main.c
|
||||
+++ b/drivers/net/wireless/ti/wlcore/main.c
|
||||
@@ -5148,6 +5148,10 @@ static void wl12xx_op_channel_switch(str
|
||||
if (unlikely(wl->state == WLCORE_STATE_OFF)) {
|
||||
wl12xx_for_each_wlvif_sta(wl, wlvif) {
|
||||
struct ieee80211_vif *vif = wl12xx_wlvif_to_vif(wlvif);
|
||||
+
|
||||
+ if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
|
||||
+ continue;
|
||||
+
|
||||
ieee80211_chswitch_done(vif, false);
|
||||
}
|
||||
goto out;
|
||||
@@ -5163,6 +5167,9 @@ static void wl12xx_op_channel_switch(str
|
||||
wl12xx_for_each_wlvif_sta(wl, wlvif) {
|
||||
unsigned long delay_usec;
|
||||
|
||||
+ if (!test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags))
|
||||
+ continue;
|
||||
+
|
||||
ret = wl->ops->channel_switch(wl, wlvif, ch_switch);
|
||||
if (ret)
|
||||
goto out_sleep;
|
@ -1,14 +1,14 @@ |
||||
--- a/drivers/net/wireless/ath/ath10k/core.c
|
||||
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
||||
@@ -277,7 +277,10 @@ static int ath10k_download_and_run_otp(s
|
||||
@@ -250,7 +250,10 @@ static int ath10k_download_and_run_otp(s
|
||||
|
||||
ath10k_dbg(ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);
|
||||
ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);
|
||||
|
||||
- if (result != 0) {
|
||||
+ if (result == 2) {
|
||||
+ ath10k_warn("otp stream is empty, using board.bin contents");
|
||||
+ ath10k_warn(ar, "otp stream is empty, using board.bin contents");
|
||||
+ return 0;
|
||||
+ } else if (result != 0) {
|
||||
ath10k_err("otp calibration failed: %d", result);
|
||||
ath10k_err(ar, "otp calibration failed: %d", result);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
Loading…
Reference in new issue