| Message ID | 20240416151448.3359644-1-denkenz@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 417517a5849ec3076eed1c6b68f70eadd8d1a2f4 |
| Headers | show |
| Series | [1/7] qmimodem: wds: Introduce qmi_wds_ip_family enum | expand |
Hello: This series was applied to ofono.git (master) by Denis Kenzior <denkenz@gmail.com>: On Tue, 16 Apr 2024 10:14:28 -0500 you wrote: > --- > drivers/qmimodem/gprs-context.c | 4 ++-- > drivers/qmimodem/wds.h | 7 +++++++ > 2 files changed, 9 insertions(+), 2 deletions(-) Here is the summary with links: - [1/7] qmimodem: wds: Introduce qmi_wds_ip_family enum https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=417517a5849e - [2/7] qmi: gprs-context: Do not free/alloc unnecessarily https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=844b488b2919 - [3/7] qmi: gprs-context: Move singleton defines to call site https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=72d9244b091d - [4/7] qmi: gprs-context: Convert QMI_WDS_AUTHENTICATION to an enum https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=acb8d77ba97b - [5/7] qmi: wds: Convert defines to enums https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=ecd6933d5f32 - [6/7] qmi: gprs-context: Remove single-use structure definition https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=93395363f1cb - [7/7] qmi: gprs-context: Request certain TLVs to be included (no matching commit) You are awesome, thank you!
diff --git a/drivers/qmimodem/gprs-context.c b/drivers/qmimodem/gprs-context.c index 33565252028c..cbe33861968b 100644 --- a/drivers/qmimodem/gprs-context.c +++ b/drivers/qmimodem/gprs-context.c @@ -247,10 +247,10 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc, switch (ctx->proto) { case OFONO_GPRS_PROTO_IP: - ip_family = 4; + ip_family = QMI_WDS_IP_FAMILY_IPV4; break; case OFONO_GPRS_PROTO_IPV6: - ip_family = 6; + ip_family = QMI_WDS_IP_FAMILY_IPV6; break; default: goto error; diff --git a/drivers/qmimodem/wds.h b/drivers/qmimodem/wds.h index ffbebaffe32d..6213f75231db 100644 --- a/drivers/qmimodem/wds.h +++ b/drivers/qmimodem/wds.h @@ -63,6 +63,13 @@ struct qmi_wds_notify_conn_status { #define QMI_WDS_PDP_TYPE_IPV6 0x02 #define QMI_WDS_PDP_TYPE_IPV4V6 0x03 +enum qmi_wds_ip_family { + QMI_WDS_IP_FAMILY_UNKNOWN = 0, + QMI_WDS_IP_FAMILY_IPV4 = 4, + QMI_WDS_IP_FAMILY_IPV6 = 6, + QMI_WDS_IP_FAMILY_UNSPECIFIED = 8, +}; + enum qmi_wds_client_type { QMI_WDS_CLIENT_TYPE_TETHERED = 0x01, };