diff --git a/ddns-go/Makefile b/ddns-go/Makefile index 28ce7c1b..7638da5c 100644 --- a/ddns-go/Makefile +++ b/ddns-go/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-go -PKG_VERSION:=6.17.2 -PKG_RELEASE:=14 +PKG_VERSION:=6.17.1 +PKG_RELEASE:=15 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)? diff --git a/gecoosac/Makefile b/gecoosac/Makefile index 4143689f..f6366f21 100644 --- a/gecoosac/Makefile +++ b/gecoosac/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gecoosac PKG_VERSION:=2.2.20251015 -PKG_RELEASE:=4 +PKG_RELEASE:=5 ifeq ($(ARCH),aarch64) PKG_ARCH:=ac_linux_arm64 @@ -41,7 +41,7 @@ define Package/$(PKG_NAME) CATEGORY:=Network TITLE:=gecoosac server (version $(PKG_VERSION)) URL:=http://www.cnrouter.com/ - DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) +px5g-mbedtls + DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) +openssl-util endef define Package/$(PKG_NAME)/conffiles diff --git a/gecoosac/files/etc/init.d/gecoosac b/gecoosac/files/etc/init.d/gecoosac index 1b678d74..5f06895c 100644 --- a/gecoosac/files/etc/init.d/gecoosac +++ b/gecoosac/files/etc/init.d/gecoosac @@ -16,6 +16,7 @@ DEFAULT_CRT_FILE=/etc/gecoosac/tls/gecoosac.crt DEFAULT_KEY_FILE=/etc/gecoosac/tls/gecoosac.key DEFAULT_PID_DIR=/var/run/ DEFAULT_LANG=zh +CERT_TIMEOUT=60 init_conf() { config_load "gecoosac" @@ -50,6 +51,122 @@ is_port() { [ "$1" -ge 1 ] 2>/dev/null && [ "$1" -le 65535 ] } +run_with_timeout() { + local timeout pid i + + timeout="$1" + shift + + "$@" >/dev/null 2>&1 & + pid="$!" + i=0 + + while kill -0 "$pid" >/dev/null 2>&1; do + if [ "$i" -ge "$timeout" ]; then + kill "$pid" >/dev/null 2>&1 + sleep 1 + kill -9 "$pid" >/dev/null 2>&1 + wait "$pid" 2>/dev/null + return 1 + fi + sleep 1 + i=$((i + 1)) + done + + wait "$pid" +} + +is_ipv4() { + local old_ifs part + + old_ifs="$IFS" + IFS=. + set -- $1 + IFS="$old_ifs" + + [ "$#" -eq 4 ] || return 1 + for part in "$@"; do + case "$part" in + ""|*[!0-9]*) return 1 ;; + esac + [ "$part" -le 255 ] 2>/dev/null || return 1 + done + + return 0 +} + +cert_matches_san() { + local cert_file="$1" + local cert_host="$2" + local cert_ip="$3" + local san + + [ -s "$cert_file" ] || return 1 + san="$(openssl x509 -in "$cert_file" -noout -ext subjectAltName 2>/dev/null)" || return 1 + echo "$san" | grep -F -q "DNS:${cert_host}" || return 1 + [ -z "$cert_ip" ] || echo "$san" | grep -F -q "IP Address:${cert_ip}" || return 1 + + return 0 +} + +generate_default_cert() { + local cert_host cert_ip cert_cn cert_san tmp_crt tmp_key + + if ! command -v openssl >/dev/null 2>&1; then + logger -t gecoosac "openssl is required to generate the default HTTPS certificate" + return 1 + fi + + cert_host="$(uci -q get system.@system[0].hostname)" + case "$cert_host" in + ""|*[!A-Za-z0-9.-]*) cert_host="GecoosAC" ;; + esac + + cert_ip="$(uci -q get network.lan.ipaddr)" + is_ipv4 "$cert_ip" || cert_ip="" + + if [ -s "$DEFAULT_KEY_FILE" ] && cert_matches_san "$DEFAULT_CRT_FILE" "$cert_host" "$cert_ip"; then + return 0 + fi + + mkdir -p /etc/gecoosac/tls + + cert_cn="${cert_ip:-$cert_host}" + cert_san="DNS:$cert_host" + [ -n "$cert_ip" ] && cert_san="${cert_san},IP:${cert_ip}" + tmp_crt="${DEFAULT_CRT_FILE}.tmp" + tmp_key="${DEFAULT_KEY_FILE}.tmp" + + rm -f "$tmp_crt" "$tmp_key" + run_with_timeout "$CERT_TIMEOUT" openssl req \ + -x509 \ + -nodes \ + -newkey ec \ + -pkeyopt ec_paramgen_curve:prime256v1 \ + -pkeyopt ec_param_enc:named_curve \ + -sha256 \ + -days 3650 \ + -keyout "$tmp_key" \ + -out "$tmp_crt" \ + -subj "/CN=$cert_cn" \ + -addext "basicConstraints=critical,CA:FALSE" \ + -addext "keyUsage=digitalSignature" \ + -addext "extendedKeyUsage=serverAuth" \ + -addext "subjectAltName=$cert_san" + + if [ -s "$tmp_crt" ] && [ -s "$tmp_key" ] && cert_matches_san "$tmp_crt" "$cert_host" "$cert_ip"; then + mv "$tmp_key" "$DEFAULT_KEY_FILE" + mv "$tmp_crt" "$DEFAULT_CRT_FILE" + chmod 600 "$DEFAULT_KEY_FILE" + chmod 644 "$DEFAULT_CRT_FILE" + return 0 + fi + + rm -f "$tmp_crt" "$tmp_key" + logger -t gecoosac "failed to generate default HTTPS certificate" + return 1 +} + normalize_conf() { is_abs_path "$upload_dir" || upload_dir="$DEFAULT_UPLOAD_DIR" is_abs_path "$db_dir" || db_dir="$DEFAULT_DB_DIR" @@ -75,81 +192,6 @@ ensure_dirs() { mkdir -p "$upload_dir" "$db_dir" "$piddir" /etc/gecoosac/tls } -generate_default_cert() { - local cert_host cert_ip cert_cn cert_san tmp_crt tmp_key - - [ "$crt_file" = "$DEFAULT_CRT_FILE" ] || return 1 - [ "$key_file" = "$DEFAULT_KEY_FILE" ] || return 1 - - if ! command -v px5g >/dev/null 2>&1; then - logger -t gecoosac "px5g is required to generate the default HTTPS certificate" - return 1 - fi - - cert_host="$(uci -q get system.@system[0].hostname)" - case "$cert_host" in - ""|*[!A-Za-z0-9._-]*) cert_host="GecoosAC" ;; - esac - - cert_ip="$(uci -q get network.lan.ipaddr)" - case "$cert_ip" in - ""|*[!0-9.]*) cert_ip="" ;; - esac - - cert_cn="${cert_ip:-$cert_host}" - cert_san="DNS:$cert_host" - [ -n "$cert_ip" ] && cert_san="${cert_san},IP:${cert_ip}" - tmp_crt="${crt_file}.tmp" - tmp_key="${key_file}.tmp" - - rm -f "$tmp_crt" "$tmp_key" - px5g selfsigned \ - -days 3650 \ - -newkey rsa:2048 \ - -keyout "$tmp_key" \ - -out "$tmp_crt" \ - -subj "/CN=$cert_cn" \ - -addext "subjectAltName=$cert_san" \ - -addext "extendedKeyUsage=serverAuth" >/dev/null 2>&1 - - if [ ! -r "$tmp_crt" ] || [ ! -r "$tmp_key" ]; then - rm -f "$tmp_crt" "$tmp_key" - px5g selfsigned \ - -days 3650 \ - -newkey rsa:2048 \ - -keyout "$tmp_key" \ - -out "$tmp_crt" \ - -subj "/CN=$cert_cn" >/dev/null 2>&1 - fi - - if [ -r "$tmp_crt" ] && [ -r "$tmp_key" ]; then - mv "$tmp_key" "$key_file" - mv "$tmp_crt" "$crt_file" - else - rm -f "$tmp_crt" "$tmp_key" - fi - - if [ ! -r "$crt_file" ] || [ ! -r "$key_file" ]; then - # Some older px5g builds only support writing directly to final paths. - rm -f "$crt_file" "$key_file" - px5g selfsigned \ - -days 3650 \ - -newkey rsa:2048 \ - -keyout "$key_file" \ - -out "$crt_file" \ - -subj "/CN=$cert_cn" >/dev/null 2>&1 - - if [ ! -r "$crt_file" ] || [ ! -r "$key_file" ]; then - logger -t gecoosac "failed to generate default HTTPS certificate" - return 1 - fi - fi - - chmod 600 "$key_file" - chmod 644 "$crt_file" - return 0 -} - start_service() { init_conf normalize_conf @@ -163,11 +205,13 @@ start_service() { ensure_dirs if [ "$isonlyoneprot" = "0" ] && [ "$https" = "1" ]; then + if [ "$crt_file" = "$DEFAULT_CRT_FILE" ] && [ "$key_file" = "$DEFAULT_KEY_FILE" ]; then + generate_default_cert || return 1 + fi + if [ ! -r "$crt_file" ] || [ ! -r "$key_file" ]; then - generate_default_cert || { - logger -t gecoosac "HTTPS is enabled but certificate or key file is missing" - return 1 - } + logger -t gecoosac "HTTPS is enabled but certificate or key file is missing" + return 1 fi fi diff --git a/gecoosac/files/etc/uci-defaults/gecoosac b/gecoosac/files/etc/uci-defaults/gecoosac index 692f578a..e41dd478 100644 --- a/gecoosac/files/etc/uci-defaults/gecoosac +++ b/gecoosac/files/etc/uci-defaults/gecoosac @@ -1,6 +1,10 @@ #!/bin/sh changed=0 +DEFAULT_CRT_FILE=/etc/gecoosac/tls/gecoosac.crt +DEFAULT_KEY_FILE=/etc/gecoosac/tls/gecoosac.key +OLD_CRT_FILE=/etc/gecoosac/tls/1.crt +OLD_KEY_FILE=/etc/gecoosac/tls/1.key ensure_section() { uci -q get gecoosac.config >/dev/null && return 0 @@ -17,14 +21,32 @@ set_default() { changed=1 } +migrate_legacy_cert_paths() { + local crt_file key_file + + crt_file="$(uci -q get gecoosac.config.crt_file)" + key_file="$(uci -q get gecoosac.config.key_file)" + + if [ "$crt_file" = "$OLD_CRT_FILE" ]; then + uci -q set "gecoosac.config.crt_file=${DEFAULT_CRT_FILE}" + changed=1 + fi + + if [ "$key_file" = "$OLD_KEY_FILE" ]; then + uci -q set "gecoosac.config.key_file=${DEFAULT_KEY_FILE}" + changed=1 + fi +} + ensure_section +migrate_legacy_cert_paths set_default enabled 0 set_default port 60650 set_default isonlyoneprot 1 set_default m_port 8080 set_default https 0 -set_default crt_file /etc/gecoosac/tls/gecoosac.crt -set_default key_file /etc/gecoosac/tls/gecoosac.key +set_default crt_file "$DEFAULT_CRT_FILE" +set_default key_file "$DEFAULT_KEY_FILE" set_default upload_dir /tmp/gecoosac/upload/ set_default db_dir /etc/gecoosac/ set_default piddir /var/run/ diff --git a/luci-app-gecoosac/Makefile b/luci-app-gecoosac/Makefile index 05ae6c1b..2915b155 100644 --- a/luci-app-gecoosac/Makefile +++ b/luci-app-gecoosac/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-gecoosac PKG_VERSION:=2.2 -PKG_RELEASE:=4 +PKG_RELEASE:=5 LUCI_TITLE:=LuCI Support for gecoosac LUCI_DEPENDS:=+luci-compat +gecoosac diff --git a/luci-app-gecoosac/luasrc/model/cbi/gecoosac.lua b/luci-app-gecoosac/luasrc/model/cbi/gecoosac.lua index 8c5bc252..b02c7b73 100644 --- a/luci-app-gecoosac/luasrc/model/cbi/gecoosac.lua +++ b/luci-app-gecoosac/luasrc/model/cbi/gecoosac.lua @@ -113,7 +113,7 @@ o.default = 8080 o.datatype = "port" o:depends("isonlyoneprot", false) -o = s:option(Flag, "https", translate("Enable HTTPS service"), translate("A certificate file must be specified, otherwise it will fail to start.")) +o = s:option(Flag, "https", translate("Enable HTTPS service"), translate("Default certificate files are generated when HTTPS starts; custom paths must point to readable files.")) o.default = 0 o:depends("isonlyoneprot", false) diff --git a/luci-app-gecoosac/po/zh-cn/gecoosac.po b/luci-app-gecoosac/po/zh-cn/gecoosac.po index b0956b89..004cade7 100644 --- a/luci-app-gecoosac/po/zh-cn/gecoosac.po +++ b/luci-app-gecoosac/po/zh-cn/gecoosac.po @@ -1,6 +1,9 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8" +msgid "Default certificate files are generated when HTTPS starts; custom paths must point to readable files." +msgstr "默认证书文件会在 HTTPS 启动时生成;自定义路径必须指向可读取的文件。" + msgid "Gecoos AC" msgstr "集客AC控制器" diff --git a/meig_QMI_WWAN/Makefile b/meig_QMI_WWAN/Makefile deleted file mode 100644 index b3fb78c7..00000000 --- a/meig_QMI_WWAN/Makefile +++ /dev/null @@ -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:=3 - -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)) diff --git a/meig_QMI_WWAN/src/Makefile b/meig_QMI_WWAN/src/Makefile deleted file mode 100644 index 5691ebc6..00000000 --- a/meig_QMI_WWAN/src/Makefile +++ /dev/null @@ -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 diff --git a/meig_QMI_WWAN/src/qmi_wwan_m.c b/meig_QMI_WWAN/src/qmi_wwan_m.c deleted file mode 100644 index 4a9876cb..00000000 --- a/meig_QMI_WWAN/src/qmi_wwan_m.c +++ /dev/null @@ -1,1000 +0,0 @@ -/* - * Copyright (c) 2012 Bjørn Mork - * - * The probing code is heavily inspired by cdc_ether, which is: - * Copyright (C) 2003-2005 by David Brownell - * Copyright (C) 2006 by Ole Andre Vadla Ravnas (ActiveSync) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* This driver supports wwan (3G/LTE/?) devices using a vendor - * specific management protocol called Qualcomm MSM Interface (QMI) - - * in addition to the more common AT commands over serial interface - * management - * - * QMI is wrapped in CDC, using CDC encapsulated commands on the - * control ("master") interface of a two-interface CDC Union - * resembling standard CDC ECM. The devices do not use the control - * interface for any other CDC messages. Most likely because the - * management protocol is used in place of the standard CDC - * notifications NOTIFY_NETWORK_CONNECTION and NOTIFY_SPEED_CHANGE - * - * Alternatively, control and data functions can be combined in a - * single USB interface. - * - * Handling a protocol like QMI is out of the scope for any driver. - * It is exported as a character device using the cdc-wdm driver as - * a subdriver, enabling userspace applications ("modem managers") to - * handle it. - * - * These devices may alternatively/additionally be configured using AT - * commands on a serial interface - */ - - #if 1 -//Added by zhangqingyun@meigsmart.com always need if not dhcp can't get ip address -struct sk_buff *qmi_wwan_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) -{ - if (dev->udev->descriptor.idVendor != cpu_to_le16(0x2C7C) && - dev->udev->descriptor.idVendor != cpu_to_le16(0x05c6) && - dev->udev->descriptor.idVendor != cpu_to_le16(0x2dee)){ - // dev_err(&dev->intf->dev,"zhangqingyun test 1"); - return skb; - } - - // Skip Ethernet header from message - if (skb_pull(skb, ETH_HLEN)) { - // dev_err(&dev->intf->dev, "zhangqingyu test 2"); - return skb; - } else { - dev_err(&dev->intf->dev, "Packet Dropped "); - } - - // Filter the packet out, release it - dev_kfree_skb_any(skb); - return NULL; -} -#endif -#include - -#define VERSION_NUMBER "V1.0.1" -#define MEIG_WWAN_VERSION "Meig_QMI_WWAN_Driver_"VERSION_NUMBER - -/* driver specific data */ -struct qmi_wwan_state { - struct usb_driver *subdriver; - atomic_t pmcount; - unsigned long unused; - struct usb_interface *control; - struct usb_interface *data; -}; - -/* default ethernet address used by the modem */ -static const u8 default_modem_addr[ETH_ALEN] = {0x02, 0x50, 0xf3}; - -#define QUEC_NET_MSG_SPEC (0x80) - -#define QUEC_NET_MSG_ID_IP_DATA (0x00) - -struct quec_net_package_header { - unsigned char msg_spec; - unsigned char msg_id; - unsigned short payload_len; - unsigned char reserve[16]; -} __packed; - - -static int qmi_wwan_rx_fixup(struct usbnet *dev, struct sk_buff *skb) { - - __be16 proto; - - //this check is no longer done by usbnet - if (skb->len < dev->net->hard_header_len) { - return 0; - } - - - switch (skb->data[0] & 0xf0) { - case 0x40: - proto = htons(ETH_P_IP); - break; - case 0x60: - proto = htons(ETH_P_IPV6); - break; - case 0x00: - if (is_multicast_ether_addr(skb->data)) { - return 1; - } - skb_reset_mac_header(skb); - goto fix_dest; - - default: - return 1; - } - - if (skb_headroom(skb) < ETH_HLEN) { - return 0; - } - - skb_push(skb, ETH_HLEN); - skb_reset_mac_header(skb); - eth_hdr(skb)->h_proto = proto; - memset(eth_hdr(skb)->h_source, 0, ETH_ALEN); - //add by zhangqingyun@meigsmart.com - memcpy(eth_hdr(skb)->h_source, "\x00\x11\x22\x33\x44\x55", ETH_ALEN); -fix_dest: - memcpy(eth_hdr(skb)->h_dest, dev->net->dev_addr, ETH_ALEN); - - return 1; -} - -/* very simplistic detection of IPv4 or IPv6 headers */ -static bool possibly_iphdr(const char *data) -{ - return (data[0] & 0xd0) == 0x40; -} - -/* disallow addresses which may be confused with IP headers */ -static int qmi_wwan_mac_addr(struct net_device *dev, void *p) -{ - int ret; - struct sockaddr *addr = p; - - ret = eth_prepare_mac_addr_change(dev, p); - if (ret < 0) - return ret; - if (possibly_iphdr(addr->sa_data)) - return -EADDRNOTAVAIL; - eth_commit_mac_addr_change(dev, p); - return 0; -} - -static const struct net_device_ops qmi_wwan_netdev_ops = { - .ndo_open = usbnet_open, - .ndo_stop = usbnet_stop, - .ndo_start_xmit = usbnet_start_xmit, - .ndo_tx_timeout = usbnet_tx_timeout, - .ndo_change_mtu = usbnet_change_mtu, -// .ndo_get_stats64 = usbnet_get_stats64, - .ndo_set_mac_address = qmi_wwan_mac_addr, - .ndo_validate_addr = eth_validate_addr, -}; - -/* using a counter to merge subdriver requests with our own into a - * combined state - */ -static int qmi_wwan_manage_power(struct usbnet *dev, int on) -{ - struct qmi_wwan_state *info = (void *)&dev->data; - int rv; - - dev_dbg(&dev->intf->dev, "%s() pmcount=%d, on=%d\n", __func__, - atomic_read(&info->pmcount), on); - - if ((on && atomic_add_return(1, &info->pmcount) == 1) || - (!on && atomic_dec_and_test(&info->pmcount))) { - /* need autopm_get/put here to ensure the usbcore sees - * the new value - */ - rv = usb_autopm_get_interface(dev->intf); - dev->intf->needs_remote_wakeup = on; - if (!rv) - usb_autopm_put_interface(dev->intf); - } - return 0; -} - -static int qmi_wwan_cdc_wdm_manage_power(struct usb_interface *intf, int on) -{ - struct usbnet *dev = usb_get_intfdata(intf); - - /* can be called while disconnecting */ - if (!dev) - return 0; - return qmi_wwan_manage_power(dev, on); -} - -/* collect all three endpoints and register subdriver */ -static int qmi_wwan_register_subdriver(struct usbnet *dev) -{ - int rv; - struct usb_driver *subdriver = NULL; - struct qmi_wwan_state *info = (void *)&dev->data; - - /* collect bulk endpoints */ - rv = usbnet_get_endpoints(dev, info->data); - if (rv < 0) - goto err; - - /* update status endpoint if separate control interface */ - if (info->control != info->data) - dev->status = &info->control->cur_altsetting->endpoint[0]; - - /* require interrupt endpoint for subdriver */ - if (!dev->status) { - rv = -EINVAL; - goto err; - } - - /* for subdriver power management */ - atomic_set(&info->pmcount, 0); - - /* register subdriver */ - subdriver = usb_cdc_wdm_register(info->control, &dev->status->desc, - 4096, &qmi_wwan_cdc_wdm_manage_power); - if (IS_ERR(subdriver)) { - dev_err(&info->control->dev, "subdriver registration failed\n"); - rv = PTR_ERR(subdriver); - goto err; - } - - /* prevent usbnet from using status endpoint */ - dev->status = NULL; - - /* save subdriver struct for suspend/resume wrappers */ - info->subdriver = subdriver; - -err: - return rv; -} - -static int qmi_wwan_bind(struct usbnet *dev, struct usb_interface *intf) -{ - int status = -1; - u8 *buf = intf->cur_altsetting->extra; - int len = intf->cur_altsetting->extralen; - struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; - struct usb_cdc_union_desc *cdc_union = NULL; - struct usb_cdc_ether_desc *cdc_ether = NULL; - u32 found = 0; - struct usb_driver *driver = driver_of(intf); - struct qmi_wwan_state *info = (void *)&dev->data; - - BUILD_BUG_ON((sizeof(((struct usbnet *)0)->data) < - sizeof(struct qmi_wwan_state))); - - /* set up initial state */ - info->control = intf; - info->data = intf; - /*add by zhangqingyun@meigsmart.com begain - /* and a number of CDC descriptors */ - while (len > 3) { - struct usb_descriptor_header *h = (void *)buf; - - /* ignore any misplaced descriptors */ - if (h->bDescriptorType != USB_DT_CS_INTERFACE) - goto next_desc; - - /* buf[2] is CDC descriptor subtype */ - switch (buf[2]) { - case USB_CDC_HEADER_TYPE: - if (found & 1 << USB_CDC_HEADER_TYPE) { - dev_dbg(&intf->dev, "extra CDC header\n"); - goto err; - } - if (h->bLength != sizeof(struct usb_cdc_header_desc)) { - dev_dbg(&intf->dev, "CDC header len %u\n", - h->bLength); - goto err; - } - break; - case USB_CDC_UNION_TYPE: - if (found & 1 << USB_CDC_UNION_TYPE) { - dev_dbg(&intf->dev, "extra CDC union\n"); - goto err; - } - if (h->bLength != sizeof(struct usb_cdc_union_desc)) { - dev_dbg(&intf->dev, "CDC union len %u\n", - h->bLength); - goto err; - } - cdc_union = (struct usb_cdc_union_desc *)buf; - break; - case USB_CDC_ETHERNET_TYPE: - if (found & 1 << USB_CDC_ETHERNET_TYPE) { - dev_dbg(&intf->dev, "extra CDC ether\n"); - goto err; - } - if (h->bLength != sizeof(struct usb_cdc_ether_desc)) { - dev_dbg(&intf->dev, "CDC ether len %u\n", - h->bLength); - goto err; - } - cdc_ether = (struct usb_cdc_ether_desc *)buf; - break; - } - - /* Remember which CDC functional descriptors we've seen. Works - * for all types we care about, of which USB_CDC_ETHERNET_TYPE - * (0x0f) is the highest numbered - */ - if (buf[2] < 32) - found |= 1 << buf[2]; - -next_desc: - len -= h->bLength; - buf += h->bLength; - } - /*add by zhangqingyun@meigsmart.com end*/ - /* Use separate control and data interfaces if we found a CDC Union */ - if (cdc_union) { - info->data = usb_ifnum_to_if(dev->udev, - cdc_union->bSlaveInterface0); - if (desc->bInterfaceNumber != cdc_union->bMasterInterface0 || - !info->data) { - dev_err(&intf->dev, - "bogus CDC Union: master=%u, slave=%u\n", - cdc_union->bMasterInterface0, - cdc_union->bSlaveInterface0); - goto err; - } - } - - /* errors aren't fatal - we can live with the dynamic address */ - if (cdc_ether) { - dev->hard_mtu = le16_to_cpu(cdc_ether->wMaxSegmentSize); - usbnet_get_ethernet_addr(dev, cdc_ether->iMACAddress); - } - - /* claim data interface and set it up */ - if (info->control != info->data) { - status = usb_driver_claim_interface(driver, info->data, dev); - if (status < 0) - goto err; - } - - status = qmi_wwan_register_subdriver(dev); - if (status < 0 && info->control != info->data) { - usb_set_intfdata(info->data, NULL); - usb_driver_release_interface(driver, info->data); - } - - /* Never use the same address on both ends of the link, even - * if the buggy firmware told us to. - */ - if (ether_addr_equal(dev->net->dev_addr, default_modem_addr)) - eth_hw_addr_random(dev->net); - - /* make MAC addr easily distinguishable from an IP header */ - if (possibly_iphdr(dev->net->dev_addr)) { - dev->net->dev_addr[0] |= 0x02; /* set local assignment bit */ - dev->net->dev_addr[0] &= 0xbf; /* clear "IP" bit */ - } - dev->net->netdev_ops = &qmi_wwan_netdev_ops; - - //dev->rx_urb_size = 7600; - -#if 1 //Added by zhangqingyun@meigsmart.com - if (dev->udev->descriptor.idVendor == cpu_to_le16(0x2C7C) || - dev->udev->descriptor.idVendor == cpu_to_le16(0x05c6) || - dev->udev->descriptor.idVendor == cpu_to_le16(0x2dee)) { - dev_info(&intf->dev, "MeigSmart slm750 slm730 srm815 work on RawIP mode\n"); - dev->net->flags |= IFF_NOARP; - /* make MAC addr easily distinguishable from an IP header */ - usb_control_msg(interface_to_usbdev(intf), - usb_sndctrlpipe(interface_to_usbdev(intf), 0), - 0x22, //USB_CDC_REQ_SET_CONTROL_LINE_STATE - 0x21, //USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE - 1, //active CDC DTR - intf->cur_altsetting->desc.bInterfaceNumber, - NULL, 0, 100); - } -#endif - -err: - return status; -} - -static void qmi_wwan_unbind(struct usbnet *dev, struct usb_interface *intf) -{ - struct qmi_wwan_state *info = (void *)&dev->data; - struct usb_driver *driver = driver_of(intf); - struct usb_interface *other; - - if (info->subdriver && info->subdriver->disconnect) - info->subdriver->disconnect(info->control); - - /* allow user to unbind using either control or data */ - if (intf == info->control) - other = info->data; - else - other = info->control; - - /* only if not shared */ - if (other && intf != other) { - usb_set_intfdata(other, NULL); - usb_driver_release_interface(driver, other); - } - - info->subdriver = NULL; - info->data = NULL; - info->control = NULL; -} - -/* suspend/resume wrappers calling both usbnet and the cdc-wdm - * subdriver if present. - * - * NOTE: cdc-wdm also supports pre/post_reset, but we cannot provide - * wrappers for those without adding usbnet reset support first. - */ -static int qmi_wwan_suspend(struct usb_interface *intf, pm_message_t message) -{ - struct usbnet *dev = usb_get_intfdata(intf); - struct qmi_wwan_state *info = (void *)&dev->data; - int ret; - - /* Both usbnet_suspend() and subdriver->suspend() MUST return 0 - * in system sleep context, otherwise, the resume callback has - * to recover device from previous suspend failure. - */ - ret = usbnet_suspend(intf, message); - if (ret < 0) - goto err; - - if (intf == info->control && info->subdriver && - info->subdriver->suspend) - ret = info->subdriver->suspend(intf, message); - if (ret < 0) - usbnet_resume(intf); -err: - return ret; -} - -static int qmi_wwan_resume(struct usb_interface *intf) -{ - struct usbnet *dev = usb_get_intfdata(intf); - struct qmi_wwan_state *info = (void *)&dev->data; - int ret = 0; - bool callsub = (intf == info->control && info->subdriver && - info->subdriver->resume); - - if (callsub) - ret = info->subdriver->resume(intf); - if (ret < 0) - goto err; - ret = usbnet_resume(intf); - if (ret < 0 && callsub) - info->subdriver->suspend(intf, PMSG_SUSPEND); -err: - return ret; -} - -static const struct driver_info qmi_wwan_info = { - .description = "WWAN/QMI device", - .flags = FLAG_WWAN | FLAG_SEND_ZLP, - .bind = qmi_wwan_bind, - .unbind = qmi_wwan_unbind, - .manage_power = qmi_wwan_manage_power, - .rx_fixup = qmi_wwan_rx_fixup, -#if 1 //Added by zhangqingyun@meigsmart.com - .tx_fixup = qmi_wwan_tx_fixup, -#endif -}; - -#define HUAWEI_VENDOR_ID 0x12D1 - -/* map QMI/wwan function by a fixed interface number */ -#define QMI_FIXED_INTF(vend, prod, num) \ - USB_DEVICE_INTERFACE_NUMBER(vend, prod, num), \ - .driver_info = (unsigned long)&qmi_wwan_info - -/* Gobi 1000 QMI/wwan interface number is 3 according to qcserial */ -#define QMI_GOBI1K_DEVICE(vend, prod) \ - QMI_FIXED_INTF(vend, prod, 3) - -/* Gobi 2000/3000 QMI/wwan interface number is 0 according to qcserial */ -#define QMI_GOBI_DEVICE(vend, prod) \ - QMI_FIXED_INTF(vend, prod, 0) - -static const struct usb_device_id products[] = { -#if 1 //Added by Quectel -#ifndef QMI_FIXED_INTF -/* map QMI/wwan function by a fixed interface number */ -#define QMI_FIXED_INTF(vend, prod, num) \ - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO, \ - .idVendor = vend, \ - .idProduct = prod, \ - .bInterfaceClass = 0xff, \ - .bInterfaceSubClass = 0xff, \ - .bInterfaceProtocol = 0xff, \ - .driver_info = (unsigned long)&qmi_wwan_force_int##num, -#endif - { QMI_FIXED_INTF(0x2C7C, 0x0125, 4) }, /* Quectel EC25/EC20 R2.0 */ - { QMI_FIXED_INTF(0x2C7C, 0x0121, 4) }, /* Quectel EC21 */ - { QMI_FIXED_INTF(0x05c6, 0xf601, 5) }, /* MeigLink SLM750 SLM730 SLM750VR2.0*/ - { QMI_FIXED_INTF(0x2dee, 0x4d22, 5) }, /*MeigLink SRM815*/ -#endif - /* 1. CDC ECM like devices match on the control interface */ - { /* Huawei E392, E398 and possibly others sharing both device id and more... */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 9), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 57), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* HUAWEI_INTERFACE_NDIS_CONTROL_QUALCOMM */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 0x01, 0x69), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - - /* 2. Combined interface devices matching on class+protocol */ - { /* Huawei E367 and possibly others in "Windows mode" */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 7), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Huawei E392, E398 and possibly others in "Windows mode" */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 1, 17), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* HUAWEI_NDIS_SINGLE_INTERFACE_VDF */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 0x01, 0x37), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* HUAWEI_INTERFACE_NDIS_HW_QUALCOMM */ - USB_VENDOR_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, USB_CLASS_VENDOR_SPEC, 0x01, 0x67), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Pantech UML290, P4200 and more */ - USB_VENDOR_AND_INTERFACE_INFO(0x106c, USB_CLASS_VENDOR_SPEC, 0xf0, 0xff), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Pantech UML290 - newer firmware */ - USB_VENDOR_AND_INTERFACE_INFO(0x106c, USB_CLASS_VENDOR_SPEC, 0xf1, 0xff), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Novatel USB551L and MC551 */ - USB_DEVICE_AND_INTERFACE_INFO(0x1410, 0xb001, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Novatel E362 */ - USB_DEVICE_AND_INTERFACE_INFO(0x1410, 0x9010, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Novatel Expedite E371 */ - USB_DEVICE_AND_INTERFACE_INFO(0x1410, 0x9011, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Dell Wireless 5800 (Novatel E362) */ - USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8195, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Dell Wireless 5800 V2 (Novatel E362) */ - USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x8196, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* Dell Wireless 5804 (Novatel E371) */ - USB_DEVICE_AND_INTERFACE_INFO(0x413C, 0x819b, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* ADU960S */ - USB_DEVICE_AND_INTERFACE_INFO(0x16d5, 0x650a, - USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, - USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - { /* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */ - USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7), - .driver_info = (unsigned long)&qmi_wwan_info, - }, - - /* 3. Combined interface devices matching on interface number */ - {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ - {QMI_FIXED_INTF(0x05c6, 0x7000, 0)}, - {QMI_FIXED_INTF(0x05c6, 0x7001, 1)}, - {QMI_FIXED_INTF(0x05c6, 0x7002, 1)}, - {QMI_FIXED_INTF(0x05c6, 0x7101, 1)}, - {QMI_FIXED_INTF(0x05c6, 0x7101, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x7101, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x7102, 1)}, - {QMI_FIXED_INTF(0x05c6, 0x7102, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x7102, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x8000, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x8001, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9000, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9003, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9005, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x900a, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x900b, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x900c, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x900c, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x900c, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x900d, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x900f, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x900f, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x900f, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9010, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9010, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9011, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9011, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9021, 1)}, - {QMI_FIXED_INTF(0x05c6, 0x9022, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x9025, 4)}, /* Alcatel-sbell ASB TL131 TDD LTE (China Mobile) */ - {QMI_FIXED_INTF(0x05c6, 0x9026, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x902e, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9031, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9032, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9033, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9033, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9033, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9033, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9034, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9034, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9034, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9034, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9034, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9035, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9036, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9037, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9038, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x903b, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x903c, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x903d, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x903e, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9043, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9046, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9046, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9046, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9047, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x9047, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9047, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9048, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9048, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9048, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9048, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9048, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x904c, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x904c, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x904c, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x904c, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x9050, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9052, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9053, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9053, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9054, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9054, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9055, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9055, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9055, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9055, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9055, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9056, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x9062, 9)}, - {QMI_FIXED_INTF(0x05c6, 0x9064, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9065, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9065, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9066, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9066, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9067, 1)}, - {QMI_FIXED_INTF(0x05c6, 0x9068, 2)}, - {QMI_FIXED_INTF(0x05c6, 0x9068, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9068, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9068, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9068, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9068, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9069, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9069, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9069, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9069, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x9070, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9070, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9075, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9076, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9076, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9076, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9076, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9076, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x9077, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9077, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9077, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9077, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9078, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9079, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x9079, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9079, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9079, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9079, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x9080, 5)}, - {QMI_FIXED_INTF(0x05c6, 0x9080, 6)}, - {QMI_FIXED_INTF(0x05c6, 0x9080, 7)}, - {QMI_FIXED_INTF(0x05c6, 0x9080, 8)}, - {QMI_FIXED_INTF(0x05c6, 0x9083, 3)}, - {QMI_FIXED_INTF(0x05c6, 0x9084, 4)}, - {QMI_FIXED_INTF(0x05c6, 0x920d, 0)}, - {QMI_FIXED_INTF(0x05c6, 0x920d, 5)}, - {QMI_FIXED_INTF(0x0846, 0x68a2, 8)}, - {QMI_FIXED_INTF(0x12d1, 0x140c, 1)}, /* Huawei E173 */ - {QMI_FIXED_INTF(0x12d1, 0x14ac, 1)}, /* Huawei E1820 */ - {QMI_FIXED_INTF(0x16d8, 0x6003, 0)}, /* CMOTech 6003 */ - {QMI_FIXED_INTF(0x16d8, 0x6007, 0)}, /* CMOTech CHE-628S */ - {QMI_FIXED_INTF(0x16d8, 0x6008, 0)}, /* CMOTech CMU-301 */ - {QMI_FIXED_INTF(0x16d8, 0x6280, 0)}, /* CMOTech CHU-628 */ - {QMI_FIXED_INTF(0x16d8, 0x7001, 0)}, /* CMOTech CHU-720S */ - {QMI_FIXED_INTF(0x16d8, 0x7002, 0)}, /* CMOTech 7002 */ - {QMI_FIXED_INTF(0x16d8, 0x7003, 4)}, /* CMOTech CHU-629K */ - {QMI_FIXED_INTF(0x16d8, 0x7004, 3)}, /* CMOTech 7004 */ - {QMI_FIXED_INTF(0x16d8, 0x7006, 5)}, /* CMOTech CGU-629 */ - {QMI_FIXED_INTF(0x16d8, 0x700a, 4)}, /* CMOTech CHU-629S */ - {QMI_FIXED_INTF(0x16d8, 0x7211, 0)}, /* CMOTech CHU-720I */ - {QMI_FIXED_INTF(0x16d8, 0x7212, 0)}, /* CMOTech 7212 */ - {QMI_FIXED_INTF(0x16d8, 0x7213, 0)}, /* CMOTech 7213 */ - {QMI_FIXED_INTF(0x16d8, 0x7251, 1)}, /* CMOTech 7251 */ - {QMI_FIXED_INTF(0x16d8, 0x7252, 1)}, /* CMOTech 7252 */ - {QMI_FIXED_INTF(0x16d8, 0x7253, 1)}, /* CMOTech 7253 */ - {QMI_FIXED_INTF(0x19d2, 0x0002, 1)}, - {QMI_FIXED_INTF(0x19d2, 0x0012, 1)}, - {QMI_FIXED_INTF(0x19d2, 0x0017, 3)}, - {QMI_FIXED_INTF(0x19d2, 0x0019, 3)}, /* ONDA MT689DC */ - {QMI_FIXED_INTF(0x19d2, 0x0021, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0025, 1)}, - {QMI_FIXED_INTF(0x19d2, 0x0031, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0042, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0049, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0052, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0055, 1)}, /* ZTE (Vodafone) K3520-Z */ - {QMI_FIXED_INTF(0x19d2, 0x0058, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0063, 4)}, /* ZTE (Vodafone) K3565-Z */ - {QMI_FIXED_INTF(0x19d2, 0x0104, 4)}, /* ZTE (Vodafone) K4505-Z */ - {QMI_FIXED_INTF(0x19d2, 0x0113, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0118, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0121, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0123, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0124, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0125, 6)}, - {QMI_FIXED_INTF(0x19d2, 0x0126, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0130, 1)}, - {QMI_FIXED_INTF(0x19d2, 0x0133, 3)}, - {QMI_FIXED_INTF(0x19d2, 0x0141, 5)}, - {QMI_FIXED_INTF(0x19d2, 0x0157, 5)}, /* ZTE MF683 */ - {QMI_FIXED_INTF(0x19d2, 0x0158, 3)}, - {QMI_FIXED_INTF(0x19d2, 0x0167, 4)}, /* ZTE MF820D */ - {QMI_FIXED_INTF(0x19d2, 0x0168, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x0176, 3)}, - {QMI_FIXED_INTF(0x19d2, 0x0178, 3)}, - {QMI_FIXED_INTF(0x19d2, 0x0191, 4)}, /* ZTE EuFi890 */ - {QMI_FIXED_INTF(0x19d2, 0x0199, 1)}, /* ZTE MF820S */ - {QMI_FIXED_INTF(0x19d2, 0x0200, 1)}, - {QMI_FIXED_INTF(0x19d2, 0x0257, 3)}, /* ZTE MF821 */ - {QMI_FIXED_INTF(0x19d2, 0x0265, 4)}, /* ONDA MT8205 4G LTE */ - {QMI_FIXED_INTF(0x19d2, 0x0284, 4)}, /* ZTE MF880 */ - {QMI_FIXED_INTF(0x19d2, 0x0326, 4)}, /* ZTE MF821D */ - {QMI_FIXED_INTF(0x19d2, 0x0412, 4)}, /* Telewell TW-LTE 4G */ - {QMI_FIXED_INTF(0x19d2, 0x1008, 4)}, /* ZTE (Vodafone) K3570-Z */ - {QMI_FIXED_INTF(0x19d2, 0x1010, 4)}, /* ZTE (Vodafone) K3571-Z */ - {QMI_FIXED_INTF(0x19d2, 0x1012, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1018, 3)}, /* ZTE (Vodafone) K5006-Z */ - {QMI_FIXED_INTF(0x19d2, 0x1021, 2)}, - {QMI_FIXED_INTF(0x19d2, 0x1245, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1247, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1252, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1254, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1255, 3)}, - {QMI_FIXED_INTF(0x19d2, 0x1255, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1256, 4)}, - {QMI_FIXED_INTF(0x19d2, 0x1270, 5)}, /* ZTE MF667 */ - {QMI_FIXED_INTF(0x19d2, 0x1401, 2)}, - {QMI_FIXED_INTF(0x19d2, 0x1402, 2)}, /* ZTE MF60 */ - {QMI_FIXED_INTF(0x19d2, 0x1424, 2)}, - {QMI_FIXED_INTF(0x19d2, 0x1425, 2)}, - {QMI_FIXED_INTF(0x19d2, 0x1426, 2)}, /* ZTE MF91 */ - {QMI_FIXED_INTF(0x19d2, 0x1428, 2)}, /* Telewell TW-LTE 4G v2 */ - {QMI_FIXED_INTF(0x19d2, 0x2002, 4)}, /* ZTE (Vodafone) K3765-Z */ - {QMI_FIXED_INTF(0x2001, 0x7e19, 4)}, /* D-Link DWM-221 B1 */ - {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)}, /* Sierra Wireless MC7700 */ - {QMI_FIXED_INTF(0x114f, 0x68a2, 8)}, /* Sierra Wireless MC7750 */ - {QMI_FIXED_INTF(0x1199, 0x68a2, 8)}, /* Sierra Wireless MC7710 in QMI mode */ - {QMI_FIXED_INTF(0x1199, 0x68a2, 19)}, /* Sierra Wireless MC7710 in QMI mode */ - {QMI_FIXED_INTF(0x1199, 0x68c0, 8)}, /* Sierra Wireless MC73xx */ - {QMI_FIXED_INTF(0x1199, 0x68c0, 10)}, /* Sierra Wireless MC73xx */ - {QMI_FIXED_INTF(0x1199, 0x901c, 8)}, /* Sierra Wireless EM7700 */ - {QMI_FIXED_INTF(0x1199, 0x901f, 8)}, /* Sierra Wireless EM7355 */ - {QMI_FIXED_INTF(0x1199, 0x9041, 8)}, /* Sierra Wireless MC7305/MC7355 */ - {QMI_FIXED_INTF(0x1199, 0x9051, 8)}, /* Netgear AirCard 340U */ - {QMI_FIXED_INTF(0x1199, 0x9053, 8)}, /* Sierra Wireless Modem */ - {QMI_FIXED_INTF(0x1199, 0x9054, 8)}, /* Sierra Wireless Modem */ - {QMI_FIXED_INTF(0x1199, 0x9055, 8)}, /* Netgear AirCard 341U */ - {QMI_FIXED_INTF(0x1199, 0x9056, 8)}, /* Sierra Wireless Modem */ - {QMI_FIXED_INTF(0x1199, 0x9057, 8)}, - {QMI_FIXED_INTF(0x1199, 0x9061, 8)}, /* Sierra Wireless Modem */ - {QMI_FIXED_INTF(0x1199, 0x9070, 8)}, /* Sierra Wireless MC74xx/EM74xx */ - {QMI_FIXED_INTF(0x1199, 0x9070, 10)}, /* Sierra Wireless MC74xx/EM74xx */ - {QMI_FIXED_INTF(0x1199, 0x9071, 8)}, /* Sierra Wireless MC74xx */ - {QMI_FIXED_INTF(0x1199, 0x9071, 10)}, /* Sierra Wireless MC74xx */ - {QMI_FIXED_INTF(0x1199, 0x9079, 8)}, /* Sierra Wireless EM74xx */ - {QMI_FIXED_INTF(0x1199, 0x9079, 10)}, /* Sierra Wireless EM74xx */ - {QMI_FIXED_INTF(0x1bbb, 0x011e, 4)}, /* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */ - {QMI_FIXED_INTF(0x1bbb, 0x0203, 2)}, /* Alcatel L800MA */ - {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ - {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ - {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ - {QMI_FIXED_INTF(0x1bc7, 0x1201, 2)}, /* Telit LE920 */ - {QMI_FIXED_INTF(0x1c9e, 0x9b01, 3)}, /* XS Stick W100-2 from 4G Systems */ - {QMI_FIXED_INTF(0x0b3c, 0xc000, 4)}, /* Olivetti Olicard 100 */ - {QMI_FIXED_INTF(0x0b3c, 0xc001, 4)}, /* Olivetti Olicard 120 */ - {QMI_FIXED_INTF(0x0b3c, 0xc002, 4)}, /* Olivetti Olicard 140 */ - {QMI_FIXED_INTF(0x0b3c, 0xc004, 6)}, /* Olivetti Olicard 155 */ - {QMI_FIXED_INTF(0x0b3c, 0xc005, 6)}, /* Olivetti Olicard 200 */ - {QMI_FIXED_INTF(0x0b3c, 0xc00a, 6)}, /* Olivetti Olicard 160 */ - {QMI_FIXED_INTF(0x0b3c, 0xc00b, 4)}, /* Olivetti Olicard 500 */ - {QMI_FIXED_INTF(0x1e2d, 0x0060, 4)}, /* Cinterion PLxx */ - {QMI_FIXED_INTF(0x1e2d, 0x0053, 4)}, /* Cinterion PHxx,PXxx */ - {QMI_FIXED_INTF(0x413c, 0x81a2, 8)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a3, 8)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a4, 8)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a8, 8)}, /* Dell Wireless 5808 Gobi(TM) 4G LTE Mobile Broadband Card */ - {QMI_FIXED_INTF(0x413c, 0x81a9, 8)}, /* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */ - - /* 4. Gobi 1000 devices */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ - {QMI_GOBI1K_DEVICE(0x03f0, 0x1f1d)}, /* HP un2400 Gobi Modem Device */ - {QMI_GOBI1K_DEVICE(0x04da, 0x250d)}, /* Panasonic Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x413c, 0x8172)}, /* Dell Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa001)}, /* Novatel/Verizon USB-1000 */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa002)}, /* Novatel Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa003)}, /* Novatel Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa004)}, /* Novatel Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa005)}, /* Novatel Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa006)}, /* Novatel Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x1410, 0xa007)}, /* Novatel Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x0b05, 0x1776)}, /* Asus Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x19d2, 0xfff3)}, /* ONDA Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9001)}, /* Generic Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9002)}, /* Generic Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9202)}, /* Generic Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9203)}, /* Generic Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9222)}, /* Generic Gobi Modem device */ - {QMI_GOBI1K_DEVICE(0x05c6, 0x9009)}, /* Generic Gobi Modem device */ - - /* 5. Gobi 2000 and 3000 devices */ - {QMI_GOBI_DEVICE(0x413c, 0x8186)}, /* Dell Gobi 2000 Modem device (N0218, VU936) */ - {QMI_GOBI_DEVICE(0x413c, 0x8194)}, /* Dell Gobi 3000 Composite */ - {QMI_GOBI_DEVICE(0x05c6, 0x920b)}, /* Generic Gobi 2000 Modem device */ - {QMI_GOBI_DEVICE(0x05c6, 0x9225)}, /* Sony Gobi 2000 Modem device (N0279, VU730) */ - {QMI_GOBI_DEVICE(0x05c6, 0x9245)}, /* Samsung Gobi 2000 Modem device (VL176) */ - {QMI_GOBI_DEVICE(0x03f0, 0x251d)}, /* HP Gobi 2000 Modem device (VP412) */ - {QMI_GOBI_DEVICE(0x05c6, 0x9215)}, /* Acer Gobi 2000 Modem device (VP413) */ - {QMI_FIXED_INTF(0x05c6, 0x9003, 4)}, /* Quectel UC20 */ - {QMI_FIXED_INTF(0x05c6, 0x9215, 4)}, /* Quectel EC20 */ - {QMI_GOBI_DEVICE(0x05c6, 0x9265)}, /* Asus Gobi 2000 Modem device (VR305) */ - {QMI_GOBI_DEVICE(0x05c6, 0x9235)}, /* Top Global Gobi 2000 Modem device (VR306) */ - {QMI_GOBI_DEVICE(0x05c6, 0x9275)}, /* iRex Technologies Gobi 2000 Modem device (VR307) */ - {QMI_GOBI_DEVICE(0x0af0, 0x8120)}, /* Option GTM681W */ - {QMI_GOBI_DEVICE(0x1199, 0x68a5)}, /* Sierra Wireless Modem */ - {QMI_GOBI_DEVICE(0x1199, 0x68a9)}, /* Sierra Wireless Modem */ - {QMI_GOBI_DEVICE(0x1199, 0x9001)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9002)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9003)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9004)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9005)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9006)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9007)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9008)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9009)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x900a)}, /* Sierra Wireless Gobi 2000 Modem device (VT773) */ - {QMI_GOBI_DEVICE(0x1199, 0x9011)}, /* Sierra Wireless Gobi 2000 Modem device (MC8305) */ - {QMI_GOBI_DEVICE(0x16d8, 0x8002)}, /* CMDTech Gobi 2000 Modem device (VU922) */ - {QMI_GOBI_DEVICE(0x05c6, 0x9205)}, /* Gobi 2000 Modem device */ - {QMI_GOBI_DEVICE(0x1199, 0x9013)}, /* Sierra Wireless Gobi 3000 Modem device (MC8355) */ - {QMI_GOBI_DEVICE(0x03f0, 0x371d)}, /* HP un2430 Mobile Broadband Module */ - {QMI_GOBI_DEVICE(0x1199, 0x9015)}, /* Sierra Wireless Gobi 3000 Modem device */ - {QMI_GOBI_DEVICE(0x1199, 0x9019)}, /* Sierra Wireless Gobi 3000 Modem device */ - {QMI_GOBI_DEVICE(0x1199, 0x901b)}, /* Sierra Wireless MC7770 */ - {QMI_GOBI_DEVICE(0x12d1, 0x14f1)}, /* Sony Gobi 3000 Composite */ - {QMI_GOBI_DEVICE(0x1410, 0xa021)}, /* Foxconn Gobi 3000 Modem device (Novatel E396) */ - - { } /* END */ -}; -MODULE_DEVICE_TABLE(usb, products); -//zhangqingyun add pid+vid+interfacenumber determine is ndis port or not -static bool ndis_detected(struct usb_interface *intf) -{ - struct usb_device *dev = interface_to_usbdev(intf); - - if (dev->actconfig && - le16_to_cpu(dev->descriptor.idVendor) == 0x05c6 && - le16_to_cpu(dev->descriptor.idProduct) == 0x9215 && - dev->actconfig->desc.bNumInterfaces == 5) { - return true; - } - /*zhangqingyun add start */ - if (dev->actconfig && - le16_to_cpu(dev->descriptor.idVendor) == 0x05c6 && - le16_to_cpu(dev->descriptor.idProduct) == 0xf601 && - dev->actconfig->desc.bNumInterfaces == 5) { - dev_dbg(&intf->dev, "zhangqingyun detemine interface 5 is ndis port"); - return true; - } - if (dev->actconfig && - le16_to_cpu(dev->descriptor.idVendor) == 0x2dee && - le16_to_cpu(dev->descriptor.idProduct) == 0x4d22 && - dev->actconfig->desc.bNumInterfaces == 5){ - dev_dbg(&intf->dev, "zhangqingyun detemine interface 5 is ndis port"); - return true; - } - /*zhangqingyun add end*/ - return false; -} - -static int qmi_wwan_probe(struct usb_interface *intf, - const struct usb_device_id *prod) -{ - struct usb_device_id *id = (struct usb_device_id *)prod; - struct usb_interface_descriptor *desc = &intf->cur_altsetting->desc; - - /* Workaround to enable dynamic IDs. This disables usbnet - * blacklisting functionality. Which, if required, can be - * reimplemented here by using a magic "blacklist" value - * instead of 0 in the static device id table - */ - if (!id->driver_info) { - dev_dbg(&intf->dev, "setting defaults for dynamic device id\n"); - id->driver_info = (unsigned long)&qmi_wwan_info; - } - - /* where we've QMI on interface 5 instead of 0 */ - if (ndis_detected(intf) && desc->bInterfaceNumber == 0) { - dev_dbg(&intf->dev, "skipping interface 0\n"); - return -ENODEV; - } - - return usbnet_probe(intf, id); -} - -static struct usb_driver qmi_wwan_driver = { - .name = "qmi_wwan_m", - .id_table = products, - .probe = qmi_wwan_probe, - .disconnect = usbnet_disconnect, - .suspend = qmi_wwan_suspend, - .resume = qmi_wwan_resume, - .reset_resume = qmi_wwan_resume, - .supports_autosuspend = 1, - .disable_hub_initiated_lpm = 1, -}; - -module_usb_driver(qmi_wwan_driver); - -MODULE_AUTHOR("Bjørn Mork "); -MODULE_DESCRIPTION("Qualcomm MSM Interface (QMI) WWAN driver"); -MODULE_LICENSE("GPL"); -MODULE_VERSION(MEIG_WWAN_VERSION); diff --git a/ookla-speedtest/Makefile b/ookla-speedtest/Makefile index 3f8e07d4..7d7c7d1b 100644 --- a/ookla-speedtest/Makefile +++ b/ookla-speedtest/Makefile @@ -1,41 +1,65 @@ +# +# Copyright (C) 2024 sbwml +# Copyright (c) 2025-2026 sirpdboy +# +# This is free software, licensed under the GPL-3.0 License. +# + include $(TOPDIR)/rules.mk PKG_NAME:=ookla-speedtest PKG_VERSION:=1.2.0 -PKG_RELEASE:=16 -PKG_MAINTAINER:=Konstantine Shevlakov +PKG_RELEASE:=17 +ifeq ($(ARCH),aarch64) + PKG_ARCH_SUFFIX:=aarch64 + PKG_HASH:=skip +else ifeq ($(ARCH),arm) + ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) + ifeq ($(ARM_CPU_FEATURES),) + PKG_ARCH_SUFFIX:=armel + PKG_HASH:=skip + else + PKG_ARCH_SUFFIX:=armhf + PKG_HASH:=skip + endif +else ifeq ($(ARCH),i386) + PKG_ARCH_SUFFIX:=i386 + PKG_HASH:=skip +else ifeq ($(ARCH),x86_64) + PKG_ARCH_SUFFIX:=x86_64 + PKG_HASH:=skip +endif + +PKG_SOURCE:=ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz +PKG_SOURCE_URL:=https://install.speedtest.net/app/cli +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_ARCH_SUFFIX) + +PKG_MAINTAINER:=sbwml include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - TITLE:=Speedtest from Ookla - SECTION:=net - CATEGORY:=Network + SECTION:=net + CATEGORY:=Network + SUBMENU:=Speed Test + TITLE:=Speedtest CLI by Ookla + URL:=https://www.speedtest.net/ + DEPENDS:=@(aarch64||arm||i386||x86_64) +ca-certificates + URL:=https://www.speedtest.net/ endef -ifeq ($(ARCH),x86_64) - BIN_PATH:=./files/x86_64 -endif -ifeq ($(ARCH),i386) - BIN_PATH:=./files/i386 -endif -ifeq ($(ARCH),arm) - BIN_PATH:=./files/armhf -endif -ifeq ($(ARCH),aarch64) - BIN_PATH:=./files/aarch64 -endif - define Package/$(PKG_NAME)/description - Speedtest CLI brings the trusted technology and global server network behind Speedtest to the command line. - Built for software developers, system administrators and computer enthusiasts alike, - Speedtest CLI is the first official Linux-native Speedtest application backed by Ookla®. + Speedtest CLI by Ookla is the official command line client + for testing internet bandwidth using speedtest.net servers. endef + define Build/Prepare -endef - -define Build/Configure + ( \ + pushd $(PKG_BUILD_DIR) ; \ + $(TAR) -zxf $(DL_DIR)/ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz -C . ; \ + popd ; \ + ) endef define Build/Compile @@ -43,9 +67,7 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(BIN_PATH)/speedtest $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/speedtest $(1)/usr/bin/ookla-speedtest endef -ifeq ($(ARCH),$(filter $(ARCH), x86_64 i386 arm aarch64)) - $(eval $(call BuildPackage,$(PKG_NAME))) -endif +$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file diff --git a/ookla-speedtest/files/aarch64/speedtest b/ookla-speedtest/files/aarch64/speedtest deleted file mode 100755 index 677c6e78..00000000 Binary files a/ookla-speedtest/files/aarch64/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/armhf/speedtest b/ookla-speedtest/files/armhf/speedtest deleted file mode 100755 index 0b01c45b..00000000 Binary files a/ookla-speedtest/files/armhf/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/i386/speedtest b/ookla-speedtest/files/i386/speedtest deleted file mode 100755 index 6a6854e5..00000000 Binary files a/ookla-speedtest/files/i386/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/x86_64/speedtest b/ookla-speedtest/files/x86_64/speedtest deleted file mode 100755 index 44c03da4..00000000 Binary files a/ookla-speedtest/files/x86_64/speedtest and /dev/null differ diff --git a/quectel_MHI/Makefile b/quectel_MHI/Makefile old mode 100644 new mode 100755 index 90dc6bb9..751be353 --- a/quectel_MHI/Makefile +++ b/quectel_MHI/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcie_mhi PKG_VERSION:=1.3.8 -PKG_RELEASE:=7 +PKG_RELEASE:=8 include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk