fix: qmi_wwan_f compiling error, remove meig driver

Signed-off-by: sfwtw <wtw@cr.cx>

driver/fibocom_QMI_WWAN/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qmi_wwan_f
 PKG_VERSION:=1.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk

driver/fibocom_QMI_WWAN/src/qmi_wwan_f.c

@@ -688,6 +688,7 @@ static void rmnet_vnd_update_tx_stats(struct net_device *net,
 #endif
 }
 
+#if defined(MHI_NETDEV_STATUS64)
 static struct rtnl_link_stats64 *_rmnet_vnd_get_stats64(struct net_device *net, struct rtnl_link_stats64 *stats)
 {
     struct qmap_priv *dev = netdev_priv(net);
@@ -742,7 +743,6 @@ static struct rtnl_link_stats64 * _rmnet_vnd_get_stats64(struct net_device *net,
     return stats;
 }
 
-#if defined(MHI_NETDEV_STATUS64)
 #if (LINUX_VERSION_CODE > KERNEL_VERSION( 4,10,0 )) //bc1f44709cf27fb2a5766cadafe7e2ad5e9cb221
 static void rmnet_vnd_get_stats64(struct net_device *net, struct rtnl_link_stats64 *stats) {
     _rmnet_vnd_get_stats64(net, stats);
@@ -1195,7 +1195,11 @@ static int qmap_register_device(sQmiWwanQmap * pDev, u8 offset_id)
     priv->mux_id = FIBOCOM_QMAP_MUX_ID + offset_id;
     sprintf(qmap_net->name, "%s.%d", real_dev->name, offset_id + 1);
     qmap_net->netdev_ops = &qmap_netdev_ops;
-    ether_addr_copy(qmap_net->dev_addr, real_dev->dev_addr);
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,17,0)
+    memcpy(qmap_net->dev_addr, real_dev->dev_addr, ETH_ALEN);
+#else
+    __dev_addr_set(qmap_net, real_dev->dev_addr, ETH_ALEN);
+#endif
 
 #ifdef FIBOCOM_BRIDGE_MODE
     priv->bridge_mode = !!(pDev->bridge_mode & BIT(offset_id));

driver/meig_QMI_WWAN/Makefile

@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2015 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=qmi_wwan_m
-PKG_VERSION:=1.0
-PKG_RELEASE:=2
-
-include $(INCLUDE_DIR)/kernel.mk
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/qmi_wwan_m
-  SUBMENU:=WWAN Support
-  TITLE:=Meig Linux USB QMI WWAN Driver
-  DEPENDS:=+kmod-usb-net +kmod-usb-wdm
-  FILES:=$(PKG_BUILD_DIR)/qmi_wwan_m.ko
-  AUTOLOAD:=$(call AutoLoad,82,qmi_wwan_m)
-endef
-
-define KernelPackage/qmi_wwan_m/description
-  Meig Linux USB QMI WWAN Driver
-endef
-
-MAKE_OPTS:= \
-	ARCH="$(LINUX_KARCH)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	CXXFLAGS="$(TARGET_CXXFLAGS)" \
-	M="$(PKG_BUILD_DIR)" \
-	$(EXTRA_KCONFIG)
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
-		modules
-endef
-
-$(eval $(call KernelPackage,qmi_wwan_m))

driver/meig_QMI_WWAN/src/Makefile

@@ -1,35 +0,0 @@
-obj-m := qmi_wwan_m.o
-GobiNet-objs := qmi_wwan_m.o
-
-PWD := $(shell pwd)
-OUTPUTDIR=/lib/modules/`uname -r`/kernel/drivers/net/usb/
-
-ifeq ($(ARCH),)
-ARCH := $(shell uname -m)
-endif
-ifeq ($(CROSS_COMPILE),)
-CROSS_COMPILE :=
-endif
-ifeq ($(KDIR),)
-KDIR := /lib/modules/$(shell uname -r)/build
-ifeq ($(ARCH),i686)
-ifeq ($(wildcard $KDIR/arch/$ARCH),)
-ARCH=i386
-endif
-endif
-endif
-
-default:
-	ln -sf makefile Makefile
-	$(MAKE) ARCH=${ARCH} CROSS_COMPILE=${CROSS_COMPILE}  -C $(KDIR) M=$(PWD) modules
-
-install: default
-	mkdir -p $(OUTPUTDIR)
-	cp -f qmi_wwan_m.ko $(OUTPUTDIR)
-	depmod
-	modprobe -r qmi_wwan_m
-	modprobe qmi_wwan_m
-
-clean:
-	rm -rf Makefile
-	rm -rf *.o *~ core .depend .*.cmd *.ko *.mod.c .tmp_versions Module.* modules.order