diff options
| -rw-r--r-- | drivers/isimodem/gprs-context.c | 6 | ||||
| -rw-r--r-- | drivers/isimodem/ussd.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/isimodem/gprs-context.c b/drivers/isimodem/gprs-context.c index ad250b24..9fdc677d 100644 --- a/drivers/isimodem/gprs-context.c +++ b/drivers/isimodem/gprs-context.c @@ -357,14 +357,14 @@ static void send_context_authenticate(GIsiClient *client, void *opaque) cd->handle, 2, /* sub blocks */ GPDS_USER_NAME_INFO, - (3 + username_len + 3) & ~3, + 3 + username_len + 3, username_len, /* Username goes here */ }; const unsigned char bottom[] = { GPDS_PASSWORD_INFO, - (3 + password_len + 3) & ~3, + 3 + password_len + 3, password_len, /* Password goes here */ }; @@ -417,7 +417,7 @@ static gboolean link_conf_cb(GIsiClient *client, 4, /* subblock length */ 0, 0, /* padding */ GPDS_APN_INFO, - (3 + apn_len + 3) & ~3, + 3 + apn_len + 3, apn_len, }; diff --git a/drivers/isimodem/ussd.c b/drivers/isimodem/ussd.c index 7002d099..d164d105 100644 --- a/drivers/isimodem/ussd.c +++ b/drivers/isimodem/ussd.c @@ -136,11 +136,11 @@ static GIsiRequest *ussd_send_make(GIsiClient *client, uint8_t *str, const uint8_t msg[] = { SS_GSM_USSD_SEND_REQ, SS_GSM_USSD_COMMAND, - 0x01, /* subblock count */ + 0x01, /* subblock count */ SS_GSM_USSD_STRING, - (4 + len + 3) & ~3, /* subblock length */ - 0x0f, /* DCS */ - len, /* string length */ + 4 + len + 3, /* subblock length */ + 0x0f, /* DCS */ + len, /* string length */ /* USSD string goes here */ }; @@ -196,7 +196,7 @@ static void isi_cancel(struct ofono_ussd *ussd, const unsigned char msg[] = { SS_GSM_USSD_SEND_REQ, SS_GSM_USSD_END, - 0x00 /* subblock count */ + 0x00 /* subblock count */ }; if (!cbd) |