diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-02-20 12:29:27 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-06-13 11:30:49 -0500 |
| commit | e9395d83e388aba8b46f2fbe371c247c42bd6452 (patch) | |
| tree | 423811bedbf56989e187fa7dd508f99988ac49c9 | |
| parent | 502a5dbaf5555515cf6a81d69403aaf6aa6ea656 (diff) | |
broadband-bearer: pass the IP family to subclasses when getting IP config
Subclasses may need to know which IP families were used for the setup
so they can return the correct IP configuration. We can't just use
the MMBearer default_ip_family becuase that isn't the family that
was actually used during the connection.
| -rw-r--r-- | plugins/icera/mm-broadband-bearer-icera.c | 1 | ||||
| -rw-r--r-- | plugins/option/mm-broadband-bearer-hso.c | 1 | ||||
| -rw-r--r-- | src/mm-broadband-bearer.c | 1 | ||||
| -rw-r--r-- | src/mm-broadband-bearer.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c index 4507a611..128b20e8 100644 --- a/plugins/icera/mm-broadband-bearer-icera.c +++ b/plugins/icera/mm-broadband-bearer-icera.c @@ -269,6 +269,7 @@ get_ip_config_3gpp (MMBroadbandBearer *self, MMPortSerialAt *secondary, MMPort *data, guint cid, + MMBearerIpFamily ip_family, GAsyncReadyCallback callback, gpointer user_data) { diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c index 15d9551b..c7c0e372 100644 --- a/plugins/option/mm-broadband-bearer-hso.c +++ b/plugins/option/mm-broadband-bearer-hso.c @@ -187,6 +187,7 @@ get_ip_config_3gpp (MMBroadbandBearer *self, MMPortSerialAt *secondary, MMPort *data, guint cid, + MMBearerIpFamily ip_family, GAsyncReadyCallback callback, gpointer user_data) { diff --git a/src/mm-broadband-bearer.c b/src/mm-broadband-bearer.c index de762d76..dce13f44 100644 --- a/src/mm-broadband-bearer.c +++ b/src/mm-broadband-bearer.c @@ -701,6 +701,7 @@ dial_3gpp_ready (MMBroadbandModem *modem, ctx->secondary, ctx->data, ctx->cid, + ctx->ip_family, (GAsyncReadyCallback)get_ip_config_3gpp_ready, ctx); return; diff --git a/src/mm-broadband-bearer.h b/src/mm-broadband-bearer.h index 4a008cd1..f3869120 100644 --- a/src/mm-broadband-bearer.h +++ b/src/mm-broadband-bearer.h @@ -79,6 +79,7 @@ struct _MMBroadbandBearerClass { MMPortSerialAt *secondary, MMPort *data, guint cid, + MMBearerIpFamily ip_family, GAsyncReadyCallback callback, gpointer user_data); gboolean (* get_ip_config_3gpp_finish) (MMBroadbandBearer *self, |