diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2024-04-15 18:00:47 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2024-04-16 15:33:24 -0500 |
| commit | acb8d77ba97bb3133ae21a0deea91f8f0888edcf (patch) | |
| tree | e1c01b64da5a3a18eee4194afb4c234f284719f0 | |
| parent | 72d9244b091dcfdedb1369474bd7624923403311 (diff) | |
| download | ofono-acb8d77ba97bb3133ae21a0deea91f8f0888edcf.tar.gz | |
qmi: gprs-context: Convert QMI_WDS_AUTHENTICATION to an enum
QMI uses authentication type as a bitmap, with both PAP and CHAP support
being selectable independently. Convert QMI_WDS_AUTHENTICATION* defines
to an enumeration, removing QMI_WDS_AUTHENTICATION_NONE.
| -rw-r--r-- | drivers/qmimodem/gprs-context.c | 9 | ||||
| -rw-r--r-- | drivers/qmimodem/wds.h | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/drivers/qmimodem/gprs-context.c b/drivers/qmimodem/gprs-context.c index ef49e1bcf..e726382a2 100644 --- a/drivers/qmimodem/gprs-context.c +++ b/drivers/qmimodem/gprs-context.c @@ -220,16 +220,17 @@ static void qmi_gprs_read_settings(struct ofono_gprs_context* gc, static uint8_t auth_method_to_qmi_auth(enum ofono_gprs_auth_method method) { + /* QMI uses a bitmap */ switch (method) { case OFONO_GPRS_AUTH_METHOD_CHAP: return QMI_WDS_AUTHENTICATION_CHAP; case OFONO_GPRS_AUTH_METHOD_PAP: return QMI_WDS_AUTHENTICATION_PAP; case OFONO_GPRS_AUTH_METHOD_NONE: - return QMI_WDS_AUTHENTICATION_NONE; + return 0; } - return QMI_WDS_AUTHENTICATION_NONE; + return 0; } static void qmi_activate_primary(struct ofono_gprs_context *gc, @@ -271,11 +272,11 @@ static void qmi_activate_primary(struct ofono_gprs_context *gc, qmi_param_append_uint8(param, QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE, auth); - if (auth != QMI_WDS_AUTHENTICATION_NONE && ctx->username[0] != '\0') + if (auth && ctx->username[0] != '\0') qmi_param_append(param, QMI_WDS_PARAM_USERNAME, strlen(ctx->username), ctx->username); - if (auth != QMI_WDS_AUTHENTICATION_NONE && ctx->password[0] != '\0') + if (auth && ctx->password[0] != '\0') qmi_param_append(param, QMI_WDS_PARAM_PASSWORD, strlen(ctx->password), ctx->password); diff --git a/drivers/qmimodem/wds.h b/drivers/qmimodem/wds.h index 398f77c74..0e30a0cca 100644 --- a/drivers/qmimodem/wds.h +++ b/drivers/qmimodem/wds.h @@ -26,9 +26,11 @@ #define QMI_WDS_PARAM_PASSWORD 0x18 /* string */ #define QMI_WDS_PARAM_AUTHENTICATION_PREFERENCE 0x16 /* uint8 */ -#define QMI_WDS_AUTHENTICATION_NONE 0x0 -#define QMI_WDS_AUTHENTICATION_PAP 0x1 -#define QMI_WDS_AUTHENTICATION_CHAP 0x2 + +enum qmi_wds_authentication { + QMI_WDS_AUTHENTICATION_PAP = 0x1, + QMI_WDS_AUTHENTICATION_CHAP = 0x2, +}; /* Packet data connection status indication */ struct qmi_wds_notify_conn_status { |