diff --git a/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch b/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch index f6f82266ba0d78f093853883cdebfcfb37aebc9a..eae45a12929e0b5f050626beafbd6c3a5c070225 100644 --- a/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch +++ b/linux-5.10/hispark_phoenix_patch/hispark_phoenix.patch @@ -1,7 +1,7 @@ diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 -index 35ca90776..bce2c3d76 +index 748961c35..8ac4d1508 --- a/Makefile +++ b/Makefile @@ -212,6 +212,15 @@ ifndef KBUILD_CHECKSRC @@ -39,7 +39,7 @@ index 35ca90776..bce2c3d76 ifdef need-config include include/config/auto.conf -@@ -1570,7 +1578,7 @@ distclean: mrproper +@@ -1579,7 +1587,7 @@ distclean: mrproper \( -name '*.orig' -o -name '*.rej' -o -name '*~' \ -o -name '*.bak' -o -name '#*#' -o -name '*%' \ -o -name 'core' \) \ @@ -69000,7 +69000,7 @@ index db7866b6f..30a26a6a9 100644 WARN(1, "called from state %s\n", phy_state_to_str(phydev->state)); diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c -index 85f3cde5f..c6914dda0 100644 +index d2f6d8107..a5495b6ed 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2451,6 +2451,49 @@ int genphy_soft_reset(struct phy_device *phydev) @@ -392843,7 +392843,7 @@ index 000000000..c3578e2fc +#endif /* __HAL_SDIO_H_ */ diff --git a/drivers/net/wireless/rtl/usb_rtl8723du/rtl8723DU_WiFi_linux_v5.6.5.3_35502.20191025_COEX20181130-2e2e/include/ieee80211.h b/drivers/net/wireless/rtl/usb_rtl8723du/rtl8723DU_WiFi_linux_v5.6.5.3_35502.20191025_COEX20181130-2e2e/include/ieee80211.h new file mode 100644 -index 000000000..60af1d772 +index 000000000..8070e6d13 --- /dev/null +++ b/drivers/net/wireless/rtl/usb_rtl8723du/rtl8723DU_WiFi_linux_v5.6.5.3_35502.20191025_COEX20181130-2e2e/include/ieee80211.h @@ -0,0 +1,2204 @@ @@ -394465,18 +394465,18 @@ index 000000000..60af1d772 + (((Addr[2]) & 0xff) == 0xff) && (((Addr[3]) & 0xff) == 0xff) && (((Addr[4]) & 0xff) == 0xff) && \ + (((Addr[5]) & 0xff) == 0xff)) +#else -+extern __inline int is_multicast_mac_addr(const u8 *addr) ++static __inline int is_multicast_mac_addr(const u8 *addr) +{ + return (addr[0] != 0xff) && (0x01 & addr[0]); +} + -+extern __inline int is_broadcast_mac_addr(const u8 *addr) ++static __inline int is_broadcast_mac_addr(const u8 *addr) +{ + return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) && \ + (addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff)); +} + -+extern __inline int is_zero_mac_addr(const u8 *addr) ++static __inline int is_zero_mac_addr(const u8 *addr) +{ + return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) && \ + (addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00)); @@ -490922,10 +490922,10 @@ index 40d7e98fc..0e3344cc7 struct mmc_cqe_ops { diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index a934282b1..384e38f0e 100644 +index c746566be..88014cc49 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -2028,6 +2028,7 @@ struct net_device { +@@ -2031,6 +2031,7 @@ struct net_device { /* * Cache lines mostly used on receive path (including eth_type_trans()) */ @@ -491131,7 +491131,7 @@ index dac65180c..8df9147d1 100644 diff --git a/scripts/Makefile.build b/scripts/Makefile.build old mode 100644 new mode 100755 -index d7cfd330a..fd4e50b46 +index 51aa32d58..f4a6959ef --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -111,7 +111,7 @@ endif @@ -491154,7 +491154,7 @@ index d7cfd330a..fd4e50b46 ifdef CONFIG_STACK_VALIDATION ifneq ($(SKIP_STACK_VALIDATION),1) -@@ -269,6 +273,7 @@ define rule_cc_o_c +@@ -275,6 +279,7 @@ define rule_cc_o_c $(call cmd_and_fixdep,cc_o_c) $(call cmd,gen_ksymdeps) $(call cmd,checksrc)