[kernel] sched_connmark depends on NF_CONNTRACK_MARK (#8976, #9423)

[openwrt.git] / target / linux / lantiq / patches-2.6.32 / 200-mach-arv45xx.patch

diff --git a/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch b/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch
index 26aa5fb..983fe71 100644 (file)
--- a/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch
+++ b/target/linux/lantiq/patches-2.6.32/200-mach-arv45xx.patch
@@ -276,7 +276,7 @@
 +arv45xx_register_ethernet(void)
 +{
 +#define ARV45XX_BRN_MAC                       0x3f0016
 +arv45xx_register_ethernet(void)
 +{
 +#define ARV45XX_BRN_MAC                       0x3f0016

-+      memcpy_fromio(&ltq_eth_data.mac,
++      memcpy_fromio(&ltq_eth_data.mac.sa_data,

 +              (void *)KSEG1ADDR(LTQ_FLASH_START + ARV45XX_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}
 +              (void *)KSEG1ADDR(LTQ_FLASH_START + ARV45XX_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}


@@ -285,7 +285,7 @@
 +arv75xx_register_ethernet(void)
 +{
 +#define ARV75XX_BRN_MAC                       0x7f0016
 +arv75xx_register_ethernet(void)
 +{
 +#define ARV75XX_BRN_MAC                       0x7f0016

-+      memcpy_fromio(&ltq_eth_data.mac,
++      memcpy_fromio(&ltq_eth_data.mac.sa_data,

 +              (void *)KSEG1ADDR(LTQ_FLASH_START + ARV75XX_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}
 +              (void *)KSEG1ADDR(LTQ_FLASH_START + ARV75XX_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}


@@ -294,7 +294,7 @@
 +bewan_register_ethernet(void)
 +{
 +#define BEWAN_BRN_MAC                 0x3f0014
 +bewan_register_ethernet(void)
 +{
 +#define BEWAN_BRN_MAC                 0x3f0014

-+      memcpy_fromio(&ltq_eth_data.mac,
++      memcpy_fromio(&ltq_eth_data.mac.sa_data,

 +              (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}
 +              (void *)KSEG1ADDR(LTQ_FLASH_START + BEWAN_BRN_MAC), 6);
 +      ltq_register_etop(&ltq_eth_data);
 +}