From 2dc0ff4f66479b33790c8ce89a77dd40f0d30d1d Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sun, 2 Mar 2025 15:28:19 +0800 Subject: [PATCH] quectel_MHI: fix complie with ipq807x --- package/wwan/driver/quectel_MHI/Makefile | 2 +- .../quectel_MHI/src/devices/mhi_netdev_quectel.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/package/wwan/driver/quectel_MHI/Makefile b/package/wwan/driver/quectel_MHI/Makefile index 22b314b77..f67e52702 100755 --- a/package/wwan/driver/quectel_MHI/Makefile +++ b/package/wwan/driver/quectel_MHI/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcie_mhi PKG_VERSION:=1.3.6 -PKG_RELEASE:=1 +PKG_RELEASE:=2 include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/wwan/driver/quectel_MHI/src/devices/mhi_netdev_quectel.c b/package/wwan/driver/quectel_MHI/src/devices/mhi_netdev_quectel.c index 1812c026c..484369b1a 100644 --- a/package/wwan/driver/quectel_MHI/src/devices/mhi_netdev_quectel.c +++ b/package/wwan/driver/quectel_MHI/src/devices/mhi_netdev_quectel.c @@ -68,15 +68,13 @@ struct rmnet_nss_cb { int (*nss_tx)(struct sk_buff *skb); }; static struct rmnet_nss_cb __read_mostly *nss_cb = NULL; -#if defined(CONFIG_PINCTRL_IPQ807x) || defined(CONFIG_PINCTRL_IPQ5018) || defined(CONFIG_PINCTRL_IPQ8074) -//#ifdef CONFIG_RMNET_DATA //spf12.x have no macro defined, just for spf11.x +#if defined(CONFIG_PINCTRL_IPQ807x) || defined(CONFIG_PINCTRL_IPQ5018) +#ifdef CONFIG_RMNET_DATA #define CONFIG_QCA_NSS_DRV -/* define at qsdk/qca/src/linux-4.4/net/rmnet_data/rmnet_data_main.c */ //for spf11.x -/* define at qsdk/qca/src/datarmnet/core/rmnet_config.c */ //for spf12.x +/* define at qsdk/qca/src/linux-4.4/net/rmnet_data/rmnet_data_main.c */ /* set at qsdk/qca/src/data-kernel/drivers/rmnet-nss/rmnet_nss.c */ -/* need add DEPENDS:= kmod-rmnet-core in feeds/makefile */ extern struct rmnet_nss_cb *rmnet_nss_callbacks __rcu __read_mostly; -//#endif +#endif #endif static const unsigned char node_id[ETH_ALEN] = {0x02, 0x50, 0xf4, 0x00, 0x00, 0x00};