From owner-svn-src-all@FreeBSD.ORG Sat Dec 18 20:04:48 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC10C1065679; Sat, 18 Dec 2010 20:04:47 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA5A68FC15; Sat, 18 Dec 2010 20:04:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBIK4ltu027224; Sat, 18 Dec 2010 20:04:47 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBIK4laH027222; Sat, 18 Dec 2010 20:04:47 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201012182004.oBIK4laH027222@svn.freebsd.org> From: Bernhard Schmidt Date: Sat, 18 Dec 2010 20:04:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r216530 - head/usr.sbin/wpa/hostapd X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Dec 2010 20:04:48 -0000 Author: bschmidt Date: Sat Dec 18 20:04:47 2010 New Revision: 216530 URL: http://svn.freebsd.org/changeset/base/216530 Log: Rename ioctl_sock to just sock to match the upstream code. While here remove the no longer used wext_sock and bsd_driver_ops variables. Modified: head/usr.sbin/wpa/hostapd/driver_freebsd.c Modified: head/usr.sbin/wpa/hostapd/driver_freebsd.c ============================================================================== --- head/usr.sbin/wpa/hostapd/driver_freebsd.c Sat Dec 18 20:00:28 2010 (r216529) +++ head/usr.sbin/wpa/hostapd/driver_freebsd.c Sat Dec 18 20:04:47 2010 (r216530) @@ -35,8 +35,7 @@ struct bsd_driver_data { struct hostapd_data *hapd; /* back pointer */ - int ioctl_sock; /* open socket for 802.11 ioctls */ - int wext_sock; + int sock; /* open socket for 802.11 ioctls */ struct l2_packet_data *sock_xmit;/* raw packet xmit socket */ int route; /* routing socket for events */ char iface[IFNAMSIZ+1]; /* interface name */ @@ -49,8 +48,6 @@ struct bsd_driver_data { int prev_wpa; /* wpa state to restore on deinit */ }; -static const struct wpa_driver_ops bsd_driver_ops; - static int bsd_set80211(void *priv, int op, int val, const void *arg, int arg_len) { @@ -64,7 +61,7 @@ bsd_set80211(void *priv, int op, int val ireq.i_data = (void *) arg; ireq.i_len = arg_len; - if (ioctl(drv->ioctl_sock, SIOCS80211, &ireq) < 0) { + if (ioctl(drv->sock, SIOCS80211, &ireq) < 0) { wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, val=%u, " "arg_len=%u]: %s", op, val, arg_len, strerror(errno)); @@ -85,7 +82,7 @@ bsd_get80211(void *priv, struct ieee8021 ireq->i_len = arg_len; ireq->i_data = arg; - if (ioctl(drv->ioctl_sock, SIOCG80211, ireq) < 0) { + if (ioctl(drv->sock, SIOCG80211, ireq) < 0) { wpa_printf(MSG_ERROR, "ioctl[SIOCS80211, op=%u, " "arg_len=%u]: %s", op, arg_len, strerror(errno)); return -1; @@ -178,13 +175,13 @@ bsd_set_iface_flags(void *priv, int flag wpa_printf(MSG_DEBUG, "%s: flags=0x%x\n", __func__, flags); - if (drv->ioctl_sock < 0) + if (drv->sock < 0) return -1; memset(&ifr, 0, sizeof(ifr)); snprintf(ifr.ifr_name, IFNAMSIZ, "%s", drv->iface); - if (ioctl(drv->ioctl_sock, SIOCGIFFLAGS, &ifr) != 0) { + if (ioctl(drv->sock, SIOCGIFFLAGS, &ifr) != 0) { perror("ioctl[SIOCGIFFLAGS]"); return -1; } @@ -200,7 +197,7 @@ bsd_set_iface_flags(void *priv, int flag ifr.ifr_flags |= flags; } - if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) { + if (ioctl(drv->sock, SIOCSIFFLAGS, &ifr) != 0) { perror("ioctl[SIOCSIFFLAGS]"); return -1; } @@ -712,8 +709,8 @@ bsd_init(struct hostapd_data *hapd, stru } drv->hapd = hapd; - drv->ioctl_sock = socket(PF_INET, SOCK_DGRAM, 0); - if (drv->ioctl_sock < 0) { + drv->sock = socket(PF_INET, SOCK_DGRAM, 0); + if (drv->sock < 0) { perror("socket[PF_INET,SOCK_DGRAM]"); goto bad; } @@ -755,8 +752,8 @@ bad: if (drv != NULL) { if (drv->sock_xmit != NULL) l2_packet_deinit(drv->sock_xmit); - if (drv->ioctl_sock >= 0) - close(drv->ioctl_sock); + if (drv->sock >= 0) + close(drv->sock); free(drv); } return NULL; @@ -773,8 +770,8 @@ bsd_deinit(void *priv) close(drv->route); } (void) bsd_set_iface_flags(drv, -IFF_UP); - if (drv->ioctl_sock >= 0) - close(drv->ioctl_sock); + if (drv->sock >= 0) + close(drv->sock); if (drv->sock_xmit != NULL) l2_packet_deinit(drv->sock_xmit); free(drv);