bcm47xx: 6.6: refresh patches
CI tells us that we need to, so lets refresh them. Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com> Link: https://github.com/openwrt/openwrt/pull/15010 Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
parent
a82b2e79e3
commit
65f34e9928
2 changed files with 4 additions and 4 deletions
|
@ -19,7 +19,7 @@ Subject: [PATCH 210/210] b44: register adm switch
|
||||||
|
|
||||||
#include <linux/uaccess.h>
|
#include <linux/uaccess.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
@@ -2225,6 +2227,69 @@ static void b44_adjust_link(struct net_d
|
@@ -2227,6 +2229,69 @@ static void b44_adjust_link(struct net_d
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ Subject: [PATCH 210/210] b44: register adm switch
|
||||||
static int b44_register_phy_one(struct b44 *bp)
|
static int b44_register_phy_one(struct b44 *bp)
|
||||||
{
|
{
|
||||||
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
|
||||||
@@ -2261,6 +2326,9 @@ static int b44_register_phy_one(struct b
|
@@ -2263,6 +2328,9 @@ static int b44_register_phy_one(struct b
|
||||||
if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
|
if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
|
||||||
(sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
|
(sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
|
||||||
|
|
||||||
|
@ -99,7 +99,7 @@ Subject: [PATCH 210/210] b44: register adm switch
|
||||||
dev_info(sdev->dev,
|
dev_info(sdev->dev,
|
||||||
"could not find PHY at %i, use fixed one\n",
|
"could not find PHY at %i, use fixed one\n",
|
||||||
bp->phy_addr);
|
bp->phy_addr);
|
||||||
@@ -2455,6 +2523,7 @@ static void b44_remove_one(struct ssb_de
|
@@ -2457,6 +2525,7 @@ static void b44_remove_one(struct ssb_de
|
||||||
unregister_netdev(dev);
|
unregister_netdev(dev);
|
||||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
||||||
b44_unregister_phy_one(bp);
|
b44_unregister_phy_one(bp);
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
|
|
||||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
||||||
return 0;
|
return 0;
|
||||||
@@ -2155,6 +2180,8 @@ static int b44_get_invariants(struct b44
|
@@ -2157,6 +2182,8 @@ static int b44_get_invariants(struct b44
|
||||||
* valid PHY address. */
|
* valid PHY address. */
|
||||||
bp->phy_addr &= 0x1F;
|
bp->phy_addr &= 0x1F;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue