kernel: preserve oif of IPv6 link scope packets
[openwrt/staging/dedeckeh.git] / target / linux / generic / backport-4.9 / 075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch
1 From: Xo Wang <xow@google.com>
2 Date: Fri, 21 Oct 2016 10:20:12 -0700
3 Subject: [PATCH] net: phy: broadcom: Update Auxiliary Control Register macros
4
5 Add the RXD-to-RXC skew (delay) time bit in the Miscellaneous Control
6 shadow register and a mask for the shadow selector field.
7
8 Remove a re-definition of MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL.
9
10 Signed-off-by: Xo Wang <xow@google.com>
11 Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
12 Reviewed-by: Joel Stanley <joel@jms.id.au>
13 Signed-off-by: David S. Miller <davem@davemloft.net>
14 ---
15
16 --- a/include/linux/brcmphy.h
17 +++ b/include/linux/brcmphy.h
18 @@ -101,6 +101,7 @@
19 * AUXILIARY CONTROL SHADOW ACCESS REGISTERS. (PHY REG 0x18)
20 */
21 #define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000
22 +#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW 0x0100
23 #define MII_BCM54XX_AUXCTL_ACTL_TX_6DB 0x0400
24 #define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA 0x0800
25
26 @@ -109,7 +110,7 @@
27 #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000
28 #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007
29
30 -#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000
31 +#define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007
32
33 /*
34 * Broadcom LED source encodings. These are used in BCM5461, BCM5481,