From patchwork Sat Nov 19 12:39:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 126573 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 4CC75B7232 for ; Sat, 19 Nov 2011 23:42:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 593049D1EA; Sat, 19 Nov 2011 07:42:53 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A52IK2ZO6oF6; Sat, 19 Nov 2011 07:42:53 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 5BA3F9D1EF; Sat, 19 Nov 2011 07:41:40 -0500 (EST) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 6C9B79D1DB for ; Sat, 19 Nov 2011 07:41:38 -0500 (EST) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PylZ7lCvriIM for ; Sat, 19 Nov 2011 07:41:34 -0500 (EST) Received: from sipsolutions.net (he.sipsolutions.net [78.46.109.217]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id D73F09C163 for ; Sat, 19 Nov 2011 07:41:14 -0500 (EST) Received: by sipsolutions.net with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.77) (envelope-from ) id 1RRkEL-0002cT-Qr for hostap@lists.shmoo.com; Sat, 19 Nov 2011 13:41:13 +0100 Message-Id: <20111119123951.516507439@sipsolutions.net> User-Agent: quilt/0.48-1 Date: Sat, 19 Nov 2011 13:39:17 +0100 From: Johannes Berg To: hostap@lists.shmoo.com Subject: [PATCH v3 07/15] driver_nl80211: pass cb to eloop function References: <20111119123910.783418920@sipsolutions.net> Content-Disposition: inline; filename=0007-driver_nl80211-pass-cb-to-eloop-function.patch Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com From: Johannes Berg By passing the nl_cb as the context to the eloop function we can (in the next patch) use the same eloop function for BSS events. Signed-hostap: Johannes Berg --- src/drivers/driver_nl80211.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index ca33f3a..507511f 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -1849,11 +1849,11 @@ static int process_event(struct nl_msg *msg, void *arg) static void wpa_driver_nl80211_event_receive(int sock, void *eloop_ctx, void *handle) { - struct wpa_driver_nl80211_data *drv = eloop_ctx; + struct nl_cb *cb = eloop_ctx; wpa_printf(MSG_DEBUG, "nl80211: Event message available"); - nl_recvmsgs(handle, drv->nl_cb); + nl_recvmsgs(handle, cb); } @@ -2233,7 +2233,7 @@ static int wpa_driver_nl80211_init_nl(struct wpa_driver_nl80211_data *drv) process_event, drv); eloop_register_read_sock(nl_socket_get_fd(drv->nl_event.handle), - wpa_driver_nl80211_event_receive, drv, + wpa_driver_nl80211_event_receive, drv->nl_cb, drv->nl_event.handle); return 0; @@ -7204,7 +7204,7 @@ static int wpa_driver_nl80211_probe_req_report(void *priv, int report) goto out_err; eloop_register_read_sock(nl_socket_get_fd(bss->nl_preq.handle), - wpa_driver_nl80211_event_receive, drv, + wpa_driver_nl80211_event_receive, drv->nl_cb, bss->nl_preq.handle); return 0;