From: Álvaro Fernández Rojas Date: Mon, 24 Apr 2023 18:13:13 +0000 (+0200) Subject: kernel: ssb: fallback-sprom: drop mac leftovers X-Git-Tag: v23.05.0-rc1~424 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2c234474a2692980229c6accdf450cf07732a5c7;p=openwrt%2Fstaging%2Fhauke.git kernel: ssb: fallback-sprom: drop mac leftovers This was left behind when removing the MAC extractions from PCI SPROMs. Signed-off-by: Álvaro Fernández Rojas --- diff --git a/target/linux/generic/files/drivers/ssb/fallback-sprom.c b/target/linux/generic/files/drivers/ssb/fallback-sprom.c index f156522328..65436a42ec 100644 --- a/target/linux/generic/files/drivers/ssb/fallback-sprom.c +++ b/target/linux/generic/files/drivers/ssb/fallback-sprom.c @@ -118,16 +118,6 @@ static void sprom_extract_r23(struct ssb_sprom *out, const u16 *in) static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in) { - u16 loc[3]; - - if (out->revision == 3) /* rev 3 moved MAC */ - loc[0] = SSB_SPROM3_IL0MAC; - else { - loc[0] = SSB_SPROM1_IL0MAC; - loc[1] = SSB_SPROM1_ET0MAC; - loc[2] = SSB_SPROM1_ET1MAC; - } - SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0); SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A, SSB_SPROM1_ETHPHY_ET1A_SHIFT); @@ -556,8 +546,6 @@ static int sprom_extract(struct ssb_fbs *priv, const u16 *in, u16 size) memset(out, 0, sizeof(*out)); out->revision = in[size - 1] & 0x00FF; - memset(out->et0mac, 0xFF, 6); - memset(out->et1mac, 0xFF, 6); switch (out->revision) { case 1: