Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 17 Dec 2011 10:32:31 +0000 (UTC)
From:      Bernhard Schmidt <bschmidt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r228622 - head/sys/net80211
Message-ID:  <201112171032.pBHAWVbt053647@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bschmidt
Date: Sat Dec 17 10:32:31 2011
New Revision: 228622
URL: http://svn.freebsd.org/changeset/base/228622

Log:
  Remove now redundant mac argument.
  
  Discussed with:	adrian@

Modified:
  head/sys/net80211/ieee80211_acl.c
  head/sys/net80211/ieee80211_hostap.c
  head/sys/net80211/ieee80211_mesh.c
  head/sys/net80211/ieee80211_proto.h

Modified: head/sys/net80211/ieee80211_acl.c
==============================================================================
--- head/sys/net80211/ieee80211_acl.c	Sat Dec 17 10:23:17 2011	(r228621)
+++ head/sys/net80211/ieee80211_acl.c	Sat Dec 17 10:32:31 2011	(r228622)
@@ -152,8 +152,7 @@ _acl_free(struct aclstate *as, struct ac
 }
 
 static int
-acl_check(struct ieee80211vap *vap, const struct ieee80211_frame *wh,
-    const uint8_t mac[IEEE80211_ADDR_LEN])
+acl_check(struct ieee80211vap *vap, const struct ieee80211_frame *wh)
 {
 	struct aclstate *as = vap->iv_as;
 
@@ -162,9 +161,9 @@ acl_check(struct ieee80211vap *vap, cons
 	case ACL_POLICY_RADIUS:
 		return 1;
 	case ACL_POLICY_ALLOW:
-		return _find_acl(as, mac) != NULL;
+		return _find_acl(as, wh->i_addr2) != NULL;
 	case ACL_POLICY_DENY:
-		return _find_acl(as, mac) == NULL;
+		return _find_acl(as, wh->i_addr2) == NULL;
 	}
 	return 0;		/* should not happen */
 }

Modified: head/sys/net80211/ieee80211_hostap.c
==============================================================================
--- head/sys/net80211/ieee80211_hostap.c	Sat Dec 17 10:23:17 2011	(r228621)
+++ head/sys/net80211/ieee80211_hostap.c	Sat Dec 17 10:32:31 2011	(r228622)
@@ -1797,8 +1797,7 @@ hostap_recv_mgmt(struct ieee80211_node *
 		/*
 		 * Consult the ACL policy module if setup.
 		 */
-		if (vap->iv_acl != NULL &&
-		    !vap->iv_acl->iac_check(vap, wh, wh->i_addr2)) {
+		if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 			    wh, NULL, "%s", "disallowed by ACL");
 			vap->iv_stats.is_rx_acl++;
@@ -1883,8 +1882,7 @@ hostap_recv_mgmt(struct ieee80211_node *
 		/*
 		 * Consult the ACL policy module if setup.
 		 */
-		if (vap->iv_acl != NULL &&
-		    !vap->iv_acl->iac_check(vap, wh, wh->i_addr2)) {
+		if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 			    wh, NULL, "%s", "disallowed by ACL");
 			vap->iv_stats.is_rx_acl++;

Modified: head/sys/net80211/ieee80211_mesh.c
==============================================================================
--- head/sys/net80211/ieee80211_mesh.c	Sat Dec 17 10:23:17 2011	(r228621)
+++ head/sys/net80211/ieee80211_mesh.c	Sat Dec 17 10:32:31 2011	(r228622)
@@ -1120,8 +1120,7 @@ mesh_input(struct ieee80211_node *ni, st
 	 *
 	 * NB: this check is also done upon peering link initiation.
 	 */
-	if (vap->iv_acl != NULL &&
-	    !vap->iv_acl->iac_check(vap, wh, wh->i_addr2)) {
+	if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 		IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 		    wh, NULL, "%s", "disallowed by ACL");
 		vap->iv_stats.is_rx_acl++;
@@ -1379,8 +1378,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
 		/*
 		 * Peer only based on the current ACL policy.
 		 */
-		if (vap->iv_acl != NULL &&
-		    !vap->iv_acl->iac_check(vap, wh, wh->i_addr2)) {
+		if (vap->iv_acl != NULL && !vap->iv_acl->iac_check(vap, wh)) {
 			IEEE80211_DISCARD(vap, IEEE80211_MSG_ACL,
 			    wh, NULL, "%s", "disallowed by ACL");
 			vap->iv_stats.is_rx_acl++;

Modified: head/sys/net80211/ieee80211_proto.h
==============================================================================
--- head/sys/net80211/ieee80211_proto.h	Sat Dec 17 10:23:17 2011	(r228621)
+++ head/sys/net80211/ieee80211_proto.h	Sat Dec 17 10:32:31 2011	(r228622)
@@ -215,8 +215,7 @@ struct ieee80211_aclator {
 	int	(*iac_attach)(struct ieee80211vap *);
 	void	(*iac_detach)(struct ieee80211vap *);
 	int	(*iac_check)(struct ieee80211vap *,
-			const struct ieee80211_frame *wh,
-			const uint8_t mac[IEEE80211_ADDR_LEN]);
+			const struct ieee80211_frame *wh);
 	int	(*iac_add)(struct ieee80211vap *,
 			const uint8_t mac[IEEE80211_ADDR_LEN]);
 	int	(*iac_remove)(struct ieee80211vap *,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201112171032.pBHAWVbt053647>