From owner-svn-src-head@FreeBSD.ORG Sat Dec 18 20:13:43 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2047C106566C; Sat, 18 Dec 2010 20:13:43 +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 0E3AB8FC1C; Sat, 18 Dec 2010 20:13:43 +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 oBIKDg8k027682; Sat, 18 Dec 2010 20:13:42 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBIKDgsl027680; Sat, 18 Dec 2010 20:13:42 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201012182013.oBIKDgsl027680@svn.freebsd.org> From: Bernhard Schmidt Date: Sat, 18 Dec 2010 20:13:42 +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: r216533 - head/usr.sbin/wpa/hostapd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Dec 2010 20:13:43 -0000 Author: bschmidt Date: Sat Dec 18 20:13:42 2010 New Revision: 216533 URL: http://svn.freebsd.org/changeset/base/216533 Log: Remove some unused variables and unnecessary casts. 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:11:09 2010 (r216532) +++ head/usr.sbin/wpa/hostapd/driver_freebsd.c Sat Dec 18 20:13:42 2010 (r216533) @@ -113,22 +113,19 @@ set80211param(struct bsd_driver_data *dr } static int -bsd_get_ssid(void *priv, u8 *buf, int len) +bsd_get_ssid(void *priv, u8 *ssid, int len) { struct bsd_driver_data *drv = priv; - int ssid_len = get80211var(priv, IEEE80211_IOC_SSID, buf, len); - - return ssid_len; + return get80211var(drv, IEEE80211_IOC_SSID, ssid, IEEE80211_NWID_LEN); } static int -bsd_set_ssid(void *priv, const u8 *buf, int len) +bsd_set_ssid(void *priv, const u8 *ssid, int ssid_len) { struct bsd_driver_data *drv = priv; - struct hostapd_data *hapd = drv->hapd; - return set80211var(priv, IEEE80211_IOC_SSID, buf, len); + return set80211var(drv, IEEE80211_IOC_SSID, ssid, ssid_len); } static int @@ -166,7 +163,6 @@ static int bsd_set_iface_flags(void *priv, int flags) { struct bsd_driver_data *drv = priv; - struct hostapd_data *hapd = drv->hapd; struct ifreq ifr; if (drv->sock < 0) @@ -350,7 +346,6 @@ bsd_send_eapol(void *priv, const u8 *add { struct bsd_driver_data *drv = priv; - struct hostapd_data *hapd = drv->hapd; unsigned char buf[3000]; unsigned char *bp = buf; struct l2_ethhdr *eth; @@ -428,8 +423,6 @@ static int bsd_get_seqnum(const char *ifname, void *priv, const u8 *addr, int idx, u8 *seq) { - struct bsd_driver_data *drv = priv; - struct hostapd_data *hapd = drv->hapd; struct ieee80211req_key wk; wpa_printf(MSG_DEBUG, "%s: addr=%s idx=%d", @@ -442,7 +435,7 @@ bsd_get_seqnum(const char *ifname, void memcpy(wk.ik_macaddr, addr, IEEE80211_ADDR_LEN); wk.ik_keyix = idx; - if (get80211var(drv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk)) < 0) { + if (get80211var(priv, IEEE80211_IOC_WPAKEY, &wk, sizeof(wk)) < 0) { printf("Failed to get encryption.\n"); return -1; } else { @@ -468,11 +461,11 @@ static int bsd_read_sta_driver_data(void *priv, struct hostap_sta_driver_data *data, const u8 *addr) { - struct bsd_driver_data *drv = priv; struct ieee80211req_sta_stats stats; memcpy(stats.is_u.macaddr, addr, IEEE80211_ADDR_LEN); - if (get80211var(drv, IEEE80211_IOC_STA_STATS, &stats, sizeof(stats)) > 0) { + if (get80211var(priv, IEEE80211_IOC_STA_STATS, &stats, sizeof(stats)) + > 0) { /* XXX? do packets counts include non-data frames? */ data->rx_packets = stats.is_stats.ns_rx_data; data->rx_bytes = stats.is_stats.ns_rx_bytes; @@ -485,8 +478,6 @@ bsd_read_sta_driver_data(void *priv, str static int bsd_sta_clear_stats(void *priv, const u8 *addr) { - struct bsd_driver_data *drv = priv; - struct hostapd_data *hapd = drv->hapd; struct ieee80211req_sta_stats stats; wpa_printf(MSG_DEBUG, "%s: addr=%s", __func__, ether_sprintf(addr)); @@ -494,7 +485,8 @@ bsd_sta_clear_stats(void *priv, const u8 /* zero station statistics */ memset(&stats, 0, sizeof(stats)); memcpy(stats.is_u.macaddr, addr, IEEE80211_ADDR_LEN); - return set80211var(drv, IEEE80211_IOC_STA_STATS, &stats, sizeof(stats)); + return set80211var(priv, IEEE80211_IOC_STA_STATS, &stats, + sizeof(stats)); } static int @@ -516,7 +508,6 @@ static void bsd_wireless_event_receive(int sock, void *ctx, void *sock_ctx) { struct bsd_driver_data *drv = ctx; - struct hostapd_data *hapd = drv->hapd; char buf[2048]; struct if_announcemsghdr *ifan; struct rt_msghdr *rtm; @@ -588,12 +579,12 @@ bsd_wireless_event_receive(int sock, voi auth = (struct ieee80211_auth_event *) &ifan[1]; wpa_printf(MSG_DEBUG, "802.11 AUTH, STA = " MACSTR, MAC2STR(auth->iev_addr)); - n = hostapd_allowed_address(hapd, auth->iev_addr, + n = hostapd_allowed_address(drv->hapd, auth->iev_addr, NULL, 0, NULL, NULL, NULL); switch (n) { case HOSTAPD_ACL_ACCEPT: case HOSTAPD_ACL_REJECT: - hostapd_set_radius_acl_auth(hapd, + hostapd_set_radius_acl_auth(drv->hapd, auth->iev_addr, n, 0); wpa_printf(MSG_DEBUG, "802.11 AUTH, STA = " MACSTR " hostapd says: %s", @@ -624,10 +615,8 @@ handle_read(void *ctx, const u8 *src_add static int bsd_set_countermeasures(void *priv, int enabled) { - struct bsd_driver_data *drv = priv; - wpa_printf(MSG_DEBUG, "%s: enabled=%d", __FUNCTION__, enabled); - return set80211param(drv, IEEE80211_IOC_COUNTERMEASURES, enabled); + return set80211param(priv, IEEE80211_IOC_COUNTERMEASURES, enabled); } #ifdef CONFIG_DRIVER_RADIUS_ACL_NOT_YET