On 2 Feb 2011, at 16:55, Rolla Selbak wrote: > Hi, > I have made the following changes to ofono in project Trunk:Testing. Please > review and accept ASAP. > > Thank You, > Rolla Selbak > > [This message was auto-generated] > > --- > > Request #13240: > > submit: devel:connectivity/ofono(r4) -> Trunk:Testing/ofono > > > Message: > * Thu Jan 27 2011 Jouni Peltonen <[email protected]> - 0.39 > - Fixes BMC#12559. > - 0001-isimodem-Fix-race-condition-in-SIM-probe.patch upstream commit: > 9306837053cd6ce35e0fe02f03c3cd0eba443f6c. > - 0002-n900-Fix-online.patch upstream commit: > f6f0f4d12116cbf8787928146b3b97df21acb739 (forwarded request 12917 from > jouni.peltonen) > > State: new 2011-02-02T08:54:52 rolla > Comment: None > > > > changes files: > -------------- > --- ofono.changes > +++ ofono.changes > @@ -0,0 +1,5 @@ > +* Thu Jan 27 2011 Jouni Peltonen <[email protected]> - 0.39 > +- Fixes BMC#12559. > +- 0001-isimodem-Fix-race-condition-in-SIM-probe.patch upstream commit: > 9306837053cd6ce35e0fe02f03c3cd0eba443f6c. > +- 0002-n900-Fix-online.patch upstream commit: > f6f0f4d12116cbf8787928146b3b97df21acb739 > + This type of logs is really useless and does not tell me anything, can we agree to speak english in change logs and not in file names?
Anas > > new: > ---- > 0001-isimodem-Fix-race-condition-in-SIM-probe.patch > 0002-n900-Fix-online.patch > > spec files: > ----------- > --- ofono.spec > +++ ofono.spec > @@ -14,6 +14,8 @@ > URL: http://ofono.org > Source0: > http://www.kernel.org/pub/linux/network/ofono/ofono-%{version}.tar.gz > Source100: ofono.yaml > +Patch0: 0001-isimodem-Fix-race-condition-in-SIM-probe.patch > +Patch1: 0002-n900-Fix-online.patch > Requires: dbus > BuildRequires: pkgconfig(glib-2.0) > BuildRequires: pkgconfig(dbus-1) > @@ -48,6 +50,10 @@ > %prep > %setup -q -n %{name}-%{version} > > +# 0001-isimodem-Fix-race-condition-in-SIM-probe.patch > +%patch0 -p1 > +# 0002-n900-Fix-online.patch > +%patch1 -p1 > # >> setup > # << setup > > > other changes: > -------------- > > ++++++ 0001-isimodem-Fix-race-condition-in-SIM-probe.patch (new) > --- 0001-isimodem-Fix-race-condition-in-SIM-probe.patch > +++ 0001-isimodem-Fix-race-condition-in-SIM-probe.patch > +From 87618acda8510a608f53cf4f316d9e9568463198 Mon Sep 17 00:00:00 2001 > +From: Aki Niemi <[email protected]> > +Date: Thu, 27 Jan 2011 09:36:51 +0200 > +Subject: [PATCH] isimodem: Fix race condition in SIM probe > +Content-Type: text/plain; charset="utf-8" > +Content-Transfer-Encoding: 8bit > + > +Fix a potential race condition between HPLMN query and subscribing to > +SIM status indications. > +--- > + drivers/isimodem/sim.c | 4 +--- > + 1 files changed, 1 insertions(+), 3 deletions(-) > + > +diff --git a/drivers/isimodem/sim.c b/drivers/isimodem/sim.c > +index 991d8b7..bfecbc9 100644 > +--- a/drivers/isimodem/sim.c > ++++ b/drivers/isimodem/sim.c > +@@ -434,15 +434,12 @@ static void sim_ind_cb(const GIsiMessage *msg, void > *data) > + static void sim_reachable_cb(const GIsiMessage *msg, void *data) > + { > + struct ofono_sim *sim = data; > +- struct sim_data *sd = ofono_sim_get_data(sim); > + > + if (g_isi_msg_error(msg) < 0) > + return; > + > + ISI_VERSION_DBG(msg); > + > +- g_isi_client_ind_subscribe(sd->client, SIM_IND, sim_ind_cb, sim); > +- > + /* Check if SIM is ready by reading HPLMN */ > + isi_read_hplmn(sim); > + } > +@@ -465,6 +462,7 @@ static int isi_sim_probe(struct ofono_sim *sim, unsigned > int vendor, > + > + ofono_sim_set_data(sim, sd); > + > ++ g_isi_client_ind_subscribe(sd->client, SIM_IND, sim_ind_cb, sim); > + g_isi_client_verify(sd->client, sim_reachable_cb, sim, NULL); > + > + return 0; > +-- > +1.7.1 > + > > ++++++ 0002-n900-Fix-online.patch (new) > --- 0002-n900-Fix-online.patch > +++ 0002-n900-Fix-online.patch > +--- a/plugins/n900.c > ++++ b/plugins/n900.c > +@@ -448,7 +448,7 @@ > + struct isi_cb_data *cbd = isi_cb_data_new(modem, cb, data); > + const uint8_t req[] = { > + MTC_STATE_REQ, > +- online ? MTC_NORMAL : MTC_RF_INACTIVE, > ++ online ? MTC_NORMAL : MTC_RF_INACTIVE, 0 > + }; > + > + DBG("(%p) with %s", modem, isi->ifname); > > ++++++ ofono.yaml > --- ofono.yaml > +++ ofono.yaml > @@ -7,7 +7,9 @@ > URL: http://ofono.org > Sources: > - http://www.kernel.org/pub/linux/network/ofono/ofono-%{version}.tar.gz > - > +Patches: > + - 0001-isimodem-Fix-race-condition-in-SIM-probe.patch > + - 0002-n900-Fix-online.patch > Requires: > - dbus > PkgBR: > > _______________________________________________ > MeeGo-commits mailing list > [email protected] > http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
