| Message ID | 20131122204149.2FC4113FABF@ushik.mtv.corp.google.com |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Nov 22, 2013 at 12:39:07PM -0800, Dmitry Shmidt wrote: > diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c > @@ -625,10 +625,7 @@ static int send_and_recv_msgs_global(struct nl80211_global *global, > -#ifndef ANDROID_P2P > -static > -#endif /* ANDROID_P2P */ > -int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, > +static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, > struct nl_msg *msg, > int (*valid_handler)(struct nl_msg *, void *), > void *valid_data) I would certainly like to drop this, but I see send_and_recv() still being used from hardware/ti/wlan/mac80211/wpa_supplicant_lib/driver_mac80211_nl.c in Android 4.3. Those uses seem to have disappeared in 4.4 which is quite welcome. My goal is to maintain build compatibility for the last two AOSP releases. Though, in this specific case, I just added that patch, so it is not like removing this today really would result in anything being worse than yesterday, so I think I'll go ahead and apply this.
On Fri, Nov 22, 2013 at 1:10 PM, Jouni Malinen <j@w1.fi> wrote: > On Fri, Nov 22, 2013 at 12:39:07PM -0800, Dmitry Shmidt wrote: >> diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c >> @@ -625,10 +625,7 @@ static int send_and_recv_msgs_global(struct nl80211_global *global, >> -#ifndef ANDROID_P2P >> -static >> -#endif /* ANDROID_P2P */ >> -int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, >> +static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, >> struct nl_msg *msg, >> int (*valid_handler)(struct nl_msg *, void *), >> void *valid_data) > > I would certainly like to drop this, but I see send_and_recv() still > being used from > hardware/ti/wlan/mac80211/wpa_supplicant_lib/driver_mac80211_nl.c in > Android 4.3. Those uses seem to have disappeared in 4.4 which is quite > welcome. > > My goal is to maintain build compatibility for the last two AOSP > releases. Though, in this specific case, I just added that patch, so it > is not like removing this today really would result in anything being > worse than yesterday, so I think I'll go ahead and apply this. There is no need for this command to be external - it is possible to remove it on 4.3 manually - as I did in 4.4. > > -- > Jouni Malinen PGP id EFC895FA > _______________________________________________ > HostAP mailing list > HostAP@lists.shmoo.com > http://lists.shmoo.com/mailman/listinfo/hostap
Thanks, applied.
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 9d4bcb8..0068e00 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -625,10 +625,7 @@ static int send_and_recv_msgs_global(struct nl80211_global *global, } -#ifndef ANDROID_P2P -static -#endif /* ANDROID_P2P */ -int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, +static int send_and_recv_msgs(struct wpa_driver_nl80211_data *drv, struct nl_msg *msg, int (*valid_handler)(struct nl_msg *, void *), void *valid_data)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> --- src/drivers/driver_nl80211.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)