From 1d6a7492fe4e01e456f5d5d309b0d5508ca29248 Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Mon, 2 Jun 2025 23:55:04 -0400 Subject: [PATCH] wwan: quectel_QMI_WWAN: Refactor rmnet_nss macros Signed-off-by: Sean Khan --- wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c | 9 ++----- wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c | 15 +++-------- wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h | 27 +++++++++++++++++++ 3 files changed, 32 insertions(+), 19 deletions(-) create mode 100644 wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h diff --git a/wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c b/wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c index 4ea4bab..ef2a96d 100644 --- a/wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c +++ b/wwan/driver/quectel_QMI_WWAN/src/qmi_wwan_q.c @@ -33,6 +33,8 @@ #include #include +#include "rmnet_nss.h" + #ifndef ETH_P_MAP #define ETH_P_MAP 0xDA1A #endif @@ -51,13 +53,6 @@ //#define CONFIG_QCA_NSS_PACKET_FILTER #endif -#define _RMNET_NSS_H_ -#define _RMENT_NSS_H_ -struct rmnet_nss_cb { - int (*nss_create)(struct net_device *dev); - int (*nss_free)(struct net_device *dev); - 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 none, not effect for spf11.x diff --git a/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c b/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c index 134d005..1cbdcf1 100644 --- a/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c +++ b/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.c @@ -22,18 +22,7 @@ #include #include -#ifndef _RMNET_NSS_H_ -#define _RMENT_NSS_H_ - -struct rmnet_nss_cb { - int (*nss_create)(struct net_device *dev); - int (*nss_free)(struct net_device *dev); - int (*nss_tx)(struct sk_buff *skb); -}; - -extern struct rmnet_nss_cb *rmnet_nss_callbacks; - -#endif +#include "rmnet_nss.h" #define RMNET_NSS_HASH_BITS 8 #define hash_add_ptr(table, node, key) \ @@ -41,6 +30,8 @@ extern struct rmnet_nss_cb *rmnet_nss_callbacks; static DEFINE_HASHTABLE(rmnet_nss_ctx_hashtable, RMNET_NSS_HASH_BITS); +struct rmnet_nss_cb *rmnet_nss_callbacks; + struct rmnet_nss_ctx { struct hlist_node hnode; struct net_device *rmnet_dev; diff --git a/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h b/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h new file mode 100644 index 0000000..e12a334 --- /dev/null +++ b/wwan/driver/quectel_QMI_WWAN/src/rmnet_nss.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +#ifndef _RMNET_NSS_H_ +#define _RMNET_NSS_H_ + +#include +#include + +struct rmnet_nss_cb { + int (*nss_create)(struct net_device *dev); + int (*nss_free)(struct net_device *dev); + int (*nss_tx)(struct sk_buff *skb); +}; + +#endif