mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

Revert "huitui"

Browse source 
This reverts commit 5d8b8466f8.
This commit is contained in:
suyuan 2020-12-24 15:26:24 +08:00
parent 4e3a116ce4
commit 088949347a
5 changed files with 0 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

6
root/package/firmware/ipq-wifi/Makefile
View file

@ -37,16 +37,10 @@ ALLWIFIBOARDS:= \
ezviz_cs-w3-wd1200g-eup \
glinet_gl-s1300 \
linksys_ea8300 \
<<<<<<< HEAD
<<<<<<< HEAD
pangu_l1000 \
p2w_r619ac \
mobipromo_cm520-79f \
=======
p2w_r619ac \
mobipromo_cm520-79f \
pangu_l1000 \
>>>>>>> parent of 602cd0b... fixomr
=======
p2w_r619ac \
mobipromo_cm520-79f \

11
root/target/linux/bcm27xx/patches-5.4/990-xhci-quirks-add-link-TRB-quirk-VL805.patch
View file

@ -58,19 +58,14 @@ index 2033bb8683033..90ccc71231c1a 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
<<<<<<< HEAD
<<<<<<< HEAD
@@ -1874,6 +1874,7 @@ struct xhci_hcd {
=======
@@ -1874,7 +1874,8 @@ struct xhci_hcd {
>>>>>>> parent of 602cd0b... fixomr
=======
@@ -1874,7 +1874,8 @@ struct xhci_hcd {
>>>>>>> parent of 602cd0b... fixomr
#define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34)
#define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35)
#define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(36)
+#define XHCI_AVOID_DQ_ON_LINK BIT_ULL(37)
<<<<<<< HEAD
<<<<<<< HEAD
unsigned int num_active_eps;
@ -81,9 +76,3 @@ index 2033bb8683033..90ccc71231c1a 100644
unsigned int num_active_eps;
unsigned int limit_active_eps;
>>>>>>> parent of 602cd0b... fixomr
=======
#define XHCI_DISABLE_SPARSE BIT_ULL(38)
unsigned int num_active_eps;
unsigned int limit_active_eps;
>>>>>>> parent of 602cd0b... fixomr

25
root/target/linux/generic/hack-5.4/690-mptcp_trunk.patch
View file

@ -3288,7 +3288,6 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
* the ACK carries the same options again (see RFC1122 4.2.3.8)
*/
@@ -387,15 +421,15 @@
<<<<<<< HEAD
<<<<<<< HEAD
/* Try to redo what tcp_v4_send_synack did. */
req->rsk_window_clamp = tp->window_clamp ? :dst_metric(&rt->dst, RTAX_WINDOW);
@ -3299,8 +3298,6 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
- dst_metric(&rt->dst, RTAX_INITRWND));
+ tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
=======
=======
>>>>>>> parent of 602cd0b... fixomr
(req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
req->rsk_window_clamp = full_space;
@ -3309,9 +3306,6 @@ diff -aurN linux-5.4.64/net/ipv4/syncookies.c linux-5.4.64.mptcp/net/ipv4/syncoo
- ireq->wscale_ok, &rcv_wscale,
- dst_metric(&rt->dst, RTAX_INITRWND));
+ tp->ops->select_initial_window(sk, full_space, req->mss,
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
+ &req->rsk_rcv_wnd, &req->rsk_window_clamp,
+ ireq->wscale_ok, &rcv_wscale,
@ -4046,7 +4040,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
case TCP_ZEROCOPY_RECEIVE: {
struct tcp_zerocopy_receive zc;
<<<<<<< HEAD
<<<<<<< HEAD
@@ -3862,7 +4143,9 @@
if (sk->sk_state == TCP_SYN_SENT || sk->sk_state == TCP_SYN_RECV)
TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS);
@ -4059,8 +4052,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp.c linux-5.4.64.mptcp/net/ipv4/tcp.c
reqsk_fastopen_remove(sk, req, false);
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
@@ -3878,6 +4161,8 @@
int tcp_abort(struct sock *sk, int err)
@ -4616,7 +4607,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
int eaten;
struct sk_buff *tail = skb_peek_tail(&sk->sk_receive_queue);
<<<<<<< HEAD
<<<<<<< HEAD
@@ -4774,7 +4838,7 @@
int avail = tp->rcv_nxt - tp->copied_seq;
@ -4624,8 +4614,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
- !sock_flag(sk, SOCK_DONE))
+ !sock_flag(sk, SOCK_DONE) && !mptcp(tp))
=======
=======
>>>>>>> parent of 602cd0b... fixomr
@@ -4774,8 +4838,8 @@
int avail = tp->rcv_nxt - tp->copied_seq;
@ -4633,9 +4621,6 @@ diff -aurN linux-5.4.64/net/ipv4/tcp_input.c linux-5.4.64.mptcp/net/ipv4/tcp_inp
- !sock_flag(sk, SOCK_DONE) &&
+ !sock_flag(sk, SOCK_DONE) && !mptcp(tp) &&
tcp_receive_window(tp) > inet_csk(sk)->icsk_ack.rcv_mss)
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
return;
@ -6753,7 +6738,6 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
goto out_free;
@@ -241,15 +259,15 @@
<<<<<<< HEAD
<<<<<<< HEAD
}
@ -6764,8 +6748,6 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
- dst_metric(dst, RTAX_INITRWND));
+ tp->ops->select_initial_window(sk, tcp_full_space(sk), req->mss,
=======
=======
>>>>>>> parent of 602cd0b... fixomr
(req->rsk_window_clamp > full_space || req->rsk_window_clamp == 0))
req->rsk_window_clamp = full_space;
@ -6774,9 +6756,6 @@ diff -aurN linux-5.4.64/net/ipv6/syncookies.c linux-5.4.64.mptcp/net/ipv6/syncoo
- ireq->wscale_ok, &rcv_wscale,
- dst_metric(dst, RTAX_INITRWND));
+ tp->ops->select_initial_window(sk, full_space, req->mss,
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
+ &req->rsk_rcv_wnd, &req->rsk_window_clamp,
+ ireq->wscale_ok, &rcv_wscale,
@ -23715,12 +23694,8 @@ diff -aurN linux-5.4.64/tools/include/uapi/linux/bpf.h linux-5.4.64.mptcp/tools/
+ BPF_TCP_RST_WAIT,
BPF_TCP_MAX_STATES /* Leave at the end! */
<<<<<<< HEAD
<<<<<<< HEAD
};
=======
};
>>>>>>> parent of 602cd0b... fixomr
=======
};
>>>>>>> parent of 602cd0b... fixomr

123
root/target/linux/mediatek/mt7623/config-4.19
View file

@ -1,16 +1,12 @@
# CONFIG_AIO is not set
CONFIG_ALIGNMENT_TRAP=y
<<<<<<< HEAD
<<<<<<< HEAD
# CONFIG_ARCH_AXXIA is not set
CONFIG_ARCH_CLOCKSOURCE_DATA=y
CONFIG_ARCH_DMA_ADDR_T_64BIT=y
=======
CONFIG_ARCH_CLOCKSOURCE_DATA=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_ARCH_CLOCKSOURCE_DATA=y
>>>>>>> parent of 602cd0b... fixomr
CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
@ -19,12 +15,9 @@ CONFIG_ARCH_HAS_KCOV=y
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
CONFIG_ARCH_HAS_PHYS_TO_DMA=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_ARCH_HAS_PTE_SPECIAL=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_ARCH_HAS_SET_MEMORY=y
CONFIG_ARCH_HAS_SG_CHAIN=y
CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@ -52,16 +45,12 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_ARM_ARCH_TIMER=y
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_ARM_ATAG_DTB_COMPAT=y
CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND=y
# CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER is not set
=======
# CONFIG_ARM_ATAG_DTB_COMPAT is not set
>>>>>>> parent of 602cd0b... fixomr
=======
# CONFIG_ARM_ATAG_DTB_COMPAT is not set
>>>>>>> parent of 602cd0b... fixomr
CONFIG_ARM_CPU_SUSPEND=y
# CONFIG_ARM_CPU_TOPOLOGY is not set
CONFIG_ARM_GIC=y
@ -69,14 +58,10 @@ CONFIG_ARM_HAS_SG_CHAIN=y
CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_L1_CACHE_SHIFT_6=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_ARM_LPAE=y
=======
# CONFIG_ARM_LPAE is not set
>>>>>>> parent of 602cd0b... fixomr
=======
# CONFIG_ARM_LPAE is not set
>>>>>>> parent of 602cd0b... fixomr
CONFIG_ARM_MEDIATEK_CPUFREQ=y
CONFIG_ARM_PATCH_IDIV=y
CONFIG_ARM_PATCH_PHYS_VIRT=y
@ -86,22 +71,15 @@ CONFIG_ARM_THUMBEE=y
CONFIG_ARM_UNWIND=y
CONFIG_ARM_VIRT_EXT=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_ASN1=y
CONFIG_ASSOCIATIVE_ARRAY=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_ATAGS=y
CONFIG_AUTO_ZRELADDR=y
# CONFIG_BCM84881_PHY is not set
CONFIG_BLK_MQ_PCI=y
<<<<<<< HEAD
<<<<<<< HEAD
=======
CONFIG_BOUNCE=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_BOUNCE=y
>>>>>>> parent of 602cd0b... fixomr
@ -111,7 +89,6 @@ CONFIG_CLKDEV_LOOKUP=y
CONFIG_CLKSRC_MMIO=y
CONFIG_CLONE_BACKWARDS=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_CLZ_TAB=y
CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 vmalloc=256M"
CONFIG_CMDLINE_EXTEND=y
@ -123,8 +100,6 @@ CONFIG_COMMON_CLK_MT2701_BDPSYS=y
CONFIG_COMMON_CLK_MT2701_ETHSYS=y
CONFIG_COMMON_CLK_MT2701_G3DSYS=y
=======
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_CMDLINE="earlyprintk console=ttyS0,115200 rootfstype=squashfs,jffs2"
CONFIG_CMDLINE_FROM_BOOTLOADER=y
CONFIG_COMMON_CLK=y
@ -134,9 +109,6 @@ CONFIG_COMMON_CLK_MT2701=y
CONFIG_COMMON_CLK_MT2701_BDPSYS=y
CONFIG_COMMON_CLK_MT2701_ETHSYS=y
# CONFIG_COMMON_CLK_MT2701_G3DSYS is not set
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_COMMON_CLK_MT2701_HIFSYS=y
CONFIG_COMMON_CLK_MT2701_IMGSYS=y
@ -144,16 +116,12 @@ CONFIG_COMMON_CLK_MT2701_MMSYS=y
CONFIG_COMMON_CLK_MT2701_VDECSYS=y
# CONFIG_COMMON_CLK_MT7622 is not set
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_COMMON_CLK_MT7629=y
# CONFIG_COMMON_CLK_MT7629_ETHSYS is not set
# CONFIG_COMMON_CLK_MT7629_HIFSYS is not set
=======
# CONFIG_COMMON_CLK_MT7629 is not set
>>>>>>> parent of 602cd0b... fixomr
=======
# CONFIG_COMMON_CLK_MT7629 is not set
>>>>>>> parent of 602cd0b... fixomr
# CONFIG_COMMON_CLK_MT8135 is not set
# CONFIG_COMMON_CLK_MT8173 is not set
CONFIG_COREDUMP=y
@ -189,12 +157,9 @@ CONFIG_CPU_THUMB_CAPABLE=y
CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_CRASH_CORE=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_CRC16=y
# CONFIG_CRC32_SARWATE is not set
CONFIG_CRC32_SLICEBY8=y
@ -203,22 +168,15 @@ CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEAD2=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_CRYPTO_AKCIPHER=y
CONFIG_CRYPTO_AKCIPHER2=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_CRYPTO_CRC32=y
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CTR=y
CONFIG_CRYPTO_DEFLATE=y
<<<<<<< HEAD
<<<<<<< HEAD
=======
CONFIG_CRYPTO_DEV_MEDIATEK=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_CRYPTO_DEV_MEDIATEK=y
>>>>>>> parent of 602cd0b... fixomr
@ -229,10 +187,6 @@ CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HMAC=y
<<<<<<< HEAD
<<<<<<< HEAD
=======
CONFIG_CRYPTO_HW=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_CRYPTO_HW=y
>>>>>>> parent of 602cd0b... fixomr
@ -246,12 +200,9 @@ CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_CRYPTO_RSA=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_CRYPTO_SEQIV=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=y
@ -277,14 +228,10 @@ CONFIG_DEBUG_UART_VIRT=0xf1004000
CONFIG_DEBUG_UNCOMPRESS=y
# CONFIG_DEBUG_USER is not set
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_DEFAULT_NETLINK=y
=======
CONFIG_DEFAULT_MPTCP_PM="fullmesh"
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_DEFAULT_MPTCP_PM="fullmesh"
>>>>>>> parent of 602cd0b... fixomr
CONFIG_DMADEVICES=y
CONFIG_DMA_ENGINE=y
CONFIG_DMA_OF=y
@ -333,14 +280,10 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPS is not set
CONFIG_HANDLE_DOMAIN_IRQ=y
<<<<<<< HEAD
<<<<<<< HEAD
# CONFIG_HARDEN_BRANCH_PREDICTOR is not set
=======
CONFIG_HARDEN_BRANCH_PREDICTOR=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_HARDEN_BRANCH_PREDICTOR=y
>>>>>>> parent of 602cd0b... fixomr
CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y
@ -354,12 +297,9 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_HAVE_ARM_SMCCC=y
CONFIG_HAVE_CLK=y
@ -377,12 +317,9 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_HAVE_GENERIC_GUP=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_HAVE_IDE=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y
@ -396,12 +333,9 @@ CONFIG_HAVE_PERF_REGS=y
CONFIG_HAVE_PERF_USER_STACK_DUMP=y
CONFIG_HAVE_PROC_CPU=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_HAVE_RCU_TABLE_FREE=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_RSEQ=y
CONFIG_HAVE_SMP=y
@ -409,7 +343,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_UID16=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_HOTPLUG_CPU=y
# CONFIG_HUGETLBFS is not set
=======
@ -417,22 +350,14 @@ CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
CONFIG_HOTPLUG_CPU=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
CONFIG_HOTPLUG_CPU=y
>>>>>>> parent of 602cd0b... fixomr
CONFIG_HWMON=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_MTK=y
CONFIG_HZ_FIXED=0
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_HZ_PERIODIC=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_I2C=y
CONFIG_I2C_BOARDINFO=y
CONFIG_I2C_CHARDEV=y
@ -442,7 +367,6 @@ CONFIG_IIO=y
# CONFIG_IIO_BUFFER is not set
# CONFIG_IIO_TRIGGER is not set
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_INITRAMFS_COMPRESSION=""
# CONFIG_INITRAMFS_FORCE is not set
CONFIG_INITRAMFS_ROOT_GID=1000
@ -451,9 +375,6 @@ CONFIG_INITRAMFS_SOURCE="/openwrt/trunk/build_dir/target-arm_cortex-a7_musl-1.1.
=======
CONFIG_INITRAMFS_SOURCE=""
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_INITRAMFS_SOURCE=""
>>>>>>> parent of 602cd0b... fixomr
# CONFIG_IOMMU_DEBUGFS is not set
# CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set
# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
@ -466,14 +387,11 @@ CONFIG_IRQ_WORK=y
CONFIG_JBD2=y
CONFIG_KALLSYMS=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_KEXEC=y
CONFIG_KEXEC_CORE=y
CONFIG_KEYS=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_LEDS_MT6323=y
CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y
@ -486,14 +404,10 @@ CONFIG_LZO_DECOMPRESS=y
# CONFIG_MACH_MT6592 is not set
CONFIG_MACH_MT7623=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_MACH_MT7629=y
=======
# CONFIG_MACH_MT7629 is not set
>>>>>>> parent of 602cd0b... fixomr
=======
# CONFIG_MACH_MT7629 is not set
>>>>>>> parent of 602cd0b... fixomr
# CONFIG_MACH_MT8127 is not set
# CONFIG_MACH_MT8135 is not set
CONFIG_MAGIC_SYSRQ=y
@ -519,7 +433,6 @@ CONFIG_MMC_SDHCI_PLTFM=y
# CONFIG_MMC_TIFM_SD is not set
CONFIG_MODULES_USE_ELF_REL=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_MPILIB=y
# CONFIG_MPTCP_BINDER is not set
# CONFIG_MPTCP_FULLMESH is not set
@ -528,8 +441,6 @@ CONFIG_MPILIB=y
# CONFIG_MPTCP_ROUNDROBIN is not set
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
# CONFIG_MT753X_GSW is not set
CONFIG_MTD_BLOCK2MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
@ -558,14 +469,10 @@ CONFIG_MTK_INFRACFG=y
# CONFIG_MTK_IOMMU is not set
# CONFIG_MTK_IOMMU_V1 is not set
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_MTK_PLATFORM="mt7623"
=======
CONFIG_MTK_PLATFORM=""
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_MTK_PLATFORM=""
>>>>>>> parent of 602cd0b... fixomr
CONFIG_MTK_PMIC_WRAP=y
CONFIG_MTK_SCPSYS=y
CONFIG_MTK_THERMAL=y
@ -575,12 +482,9 @@ CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NEON=y
CONFIG_NET_DSA=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_NET_DSA_LEGACY=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_NET_DSA_MT7530=y
CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_FLOW_LIMIT=y
@ -592,12 +496,6 @@ CONFIG_NET_VENDOR_MEDIATEK=y
CONFIG_NLS=y
CONFIG_NO_BOOTMEM=y
<<<<<<< HEAD
<<<<<<< HEAD
=======
CONFIG_NO_HZ=y
CONFIG_NO_HZ_COMMON=y
CONFIG_NO_HZ_IDLE=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_NO_HZ=y
CONFIG_NO_HZ_COMMON=y
@ -631,7 +529,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
# CONFIG_PCI_V3_SEMI is not set
CONFIG_PERF_USE_VMALLOC=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_PGTABLE_LEVELS=3
CONFIG_PGTABLE_MAPPING=y
CONFIG_PHYLIB=y
@ -642,11 +539,6 @@ CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
CONFIG_PHYLINK=y
>>>>>>> parent of 602cd0b... fixomr
=======
CONFIG_PGTABLE_LEVELS=2
CONFIG_PHYLIB=y
CONFIG_PHYLINK=y
>>>>>>> parent of 602cd0b... fixomr
CONFIG_PHY_MTK_TPHY=y
# CONFIG_PHY_MTK_XSPHY is not set
CONFIG_PINCTRL=y
@ -654,12 +546,9 @@ CONFIG_PINCTRL_MT2701=y
CONFIG_PINCTRL_MT6397=y
CONFIG_PINCTRL_MT7623=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_PINCTRL_MT7629=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_PINCTRL_MTK=y
CONFIG_PINCTRL_MTK_MOORE=y
CONFIG_PLUGIN_HOSTCC="g++"
@ -729,12 +618,9 @@ CONFIG_SPI_MT65XX=y
# CONFIG_SPI_MTK_SNFI is not set
CONFIG_SPMI=y
<<<<<<< HEAD
<<<<<<< HEAD
# CONFIG_SPS30 is not set
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_SRCU=y
CONFIG_STREAM_PARSER=y
# CONFIG_STRIP_ASM_SYMS is not set
@ -745,12 +631,9 @@ CONFIG_SWPHY=y
CONFIG_SWP_EMULATE=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_SYS_SUPPORTS_HUGETLBFS=y
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_TASKS_RCU=y
# CONFIG_TCP_CONG_NANQINLANG is not set
CONFIG_THERMAL=y
@ -783,13 +666,10 @@ CONFIG_VFPv3=y
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_WATCHDOG_CORE=y
<<<<<<< HEAD
<<<<<<< HEAD
# CONFIG_WIRELESS is not set
# CONFIG_WLAN is not set
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
CONFIG_XPS=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_BCJ=y
@ -798,10 +678,7 @@ CONFIG_ZBOOT_ROM_TEXT=0
CONFIG_ZLIB_DEFLATE=y
CONFIG_ZLIB_INFLATE=y
<<<<<<< HEAD
<<<<<<< HEAD
CONFIG_ZSMALLOC=y
# CONFIG_ZSMALLOC_STAT is not set
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr

9
root/target/linux/mediatek/patches-5.4/0999-lan-to-wan.patch
View file

@ -1,5 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2020-04-19 11:02:56.505715879 +0200
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2020-04-19 11:03:53.620780390 +0200
@@ -196,7 +196,7 @@
@ -18,27 +17,19 @@
-/* Disabled, is now handled by gmac1 (eth1/wan) via phy-handle!
+/* Disabled, is now handled by gmac1 (eth1/lan) via phy-handle!
=======
=======
>>>>>>> parent of 602cd0b... fixomr
--- a/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts.anc 2020-11-16 15:48:00.852410183 +0100
+++ b/arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts 2020-11-16 15:49:23.878965822 +0100
@@ -210,27 +210,27 @@
<<<<<<< HEAD
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
port@0 {
reg = <0>;
- label = "wan";
+ label = "lan";
};
<<<<<<< HEAD
<<<<<<< HEAD
*/
=======
>>>>>>> parent of 602cd0b... fixomr
=======
>>>>>>> parent of 602cd0b... fixomr
port@1 {