mac80211: merge a few WDS-AP related fixes (#14756, #16802)

[openwrt.git] / package / kernel / mac80211 / patches / 830-b43-workaround-pcie-bcm4716.patch

diff --git a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
index 49b2468..5c50bbc 100644 (file)
--- a/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
+++ b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
@@ -53,18 +53,20 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  __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,16 @@ static inline bool b43_bus_host_is_sdio(
+@@ -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)
 +{
-+      if (dev->bus_type == B43_BUS_SSB)
-+              return (dev->sdev->bus->bustype == SSB_BUSTYPE_PCI);
 +#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;
 +}
  
@@ -72,7 +74,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  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
-@@ -4380,7 +4380,7 @@ static int b43_phy_versioning(struct b43
+@@ -4464,7 +4464,7 @@ static int b43_phy_versioning(struct b43
                u16 radio24[3];
  
                for (tmp = 0; tmp < 3; tmp++) {
@@ -81,7 +83,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                        radio24[tmp] = b43_read16(dev, B43_MMIO_RADIO24_DATA);
                }
  
-@@ -4399,10 +4399,10 @@ static int b43_phy_versioning(struct b43
+@@ -4481,10 +4481,10 @@ static int b43_phy_versioning(struct b43
                        else
                                tmp = 0x5205017F;
                } else {
@@ -96,7 +98,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
                                << 16;
 --- a/drivers/net/wireless/b43/phy_common.c
 +++ b/drivers/net/wireless/b43/phy_common.c
-@@ -267,6 +267,12 @@ void b43_phy_write(struct b43_wldev *dev
+@@ -275,6 +275,12 @@ void b43_phy_write(struct b43_wldev *dev
  {
        assert_mac_suspended(dev);
        dev->phy.ops->phy_write(dev, reg, value);
@@ -154,7 +156,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
 --- a/drivers/net/wireless/b43/phy_lcn.c
 +++ b/drivers/net/wireless/b43/phy_lcn.c
-@@ -845,20 +845,20 @@ static void b43_phy_lcn_op_adjust_txpowe
+@@ -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)
  {
@@ -178,7 +180,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        b43_write16(dev, B43_MMIO_PHY_DATA,
                    (b43_read16(dev, B43_MMIO_PHY_DATA) & mask) | set);
  }
-@@ -868,14 +868,14 @@ static u16 b43_phy_lcn_op_radio_read(str
+@@ -835,14 +835,14 @@ static u16 b43_phy_lcn_op_radio_read(str
        /* LCN-PHY needs 0x200 for read access */
        reg |= 0x200;
  
@@ -197,7 +199,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  
 --- a/drivers/net/wireless/b43/phy_n.c
 +++ b/drivers/net/wireless/b43/phy_n.c
-@@ -5641,14 +5641,14 @@ static inline void check_phyreg(struct b
+@@ -6494,14 +6494,14 @@ static inline void check_phyreg(struct b
  static u16 b43_nphy_op_read(struct b43_wldev *dev, u16 reg)
  {
        check_phyreg(dev, reg);
@@ -214,7 +216,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        b43_write16(dev, B43_MMIO_PHY_DATA, value);
  }
  
-@@ -5656,7 +5656,7 @@ static void b43_nphy_op_maskset(struct b
+@@ -6509,7 +6509,7 @@ static void b43_nphy_op_maskset(struct b
                                 u16 set)
  {
        check_phyreg(dev, reg);
@@ -223,7 +225,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        b43_maskset16(dev, B43_MMIO_PHY_DATA, mask, set);
  }
  
-@@ -5670,7 +5670,7 @@ static u16 b43_nphy_op_radio_read(struct
+@@ -6523,7 +6523,7 @@ static u16 b43_nphy_op_radio_read(struct
        else
                reg |= 0x100;
  
@@ -232,9 +234,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
        return b43_read16(dev, B43_MMIO_RADIO_DATA_LOW);
  }
  
-@@ -5679,7 +5679,7 @@ static void b43_nphy_op_radio_write(stru
+@@ -6532,7 +6532,7 @@ static void b43_nphy_op_radio_write(stru
        /* Register 1 is a 32-bit register. */
-       B43_WARN_ON(reg == 1);
+       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);