[PATCH 05/18] driver_nl80211: pass bss struct to event callbacks

Johannes Berg johannes at sipsolutions.net
Sat Nov 19 06:45:46 EST 2011


On Sat, 2011-11-19 at 12:10 +0100, Johannes Berg wrote:
> On Sat, 2011-11-19 at 12:23 +0200, Jouni Malinen wrote:
> > On Fri, Nov 04, 2011 at 11:37:54AM +0100, Johannes Berg wrote:
> > > -static int process_event(struct nl_msg *msg, void *arg)
> > > +static int process_drv_event(struct nl_msg *msg, void *arg)
> > > -static void wpa_driver_nl80211_event_receive(int sock, void *eloop_ctx,
> > > +static void wpa_driver_nl80211_drv_event_receive(int sock, void *eloop_ctx,
> > > -	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, process_event, drv);
> > > +	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, process_drv_event, drv);
> > > -				 wpa_driver_nl80211_event_receive, drv,
> > > +				 wpa_driver_nl80211_drv_event_receive, drv,
> > > -				 wpa_driver_nl80211_event_receive, drv,
> > > +				 wpa_driver_nl80211_drv_event_receive, drv,
> > 
> > All this patch seems to be doing is to rename couple of functions which
> > does not match with the "pass bss struct to event callbacks"
> > description... Was there supposed to be something else here?
> > 
> > To make things even more confusing, patch 12/18 reverts part of these
> > changes.. Should 5 and 12 be merged together?
> 
> Humm, I must have gotten this messed up during the various rebases on
> top of Ben's patches. I'll take a look later.

Ok I got rid of most of this patch, it now only does the process_event
-> process_drv_event rename and I also moved it right before where that
is needed (before adding process_bss_event). It'd be easy to squash them
together if you prefer.

I also updated over your merges from just now and pushed it all out to
http://git.sipsolutions.net/?p=hostap.git;a=shortlog;h=refs/heads/work

I'll repost but wanted to ask you if you wanted it squashed first.

johannes



More information about the HostAP mailing list