From owner-p4-projects@FreeBSD.ORG  Mon Dec  6 06:18:54 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CB50E16A4E5; Mon,  6 Dec 2004 06:18:53 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 695EB16A4CF
	for <perforce@freebsd.org>; Mon,  6 Dec 2004 06:18:53 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 577F143D39
	for <perforce@freebsd.org>; Mon,  6 Dec 2004 06:18:53 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iB66IrK7052570
	for <perforce@freebsd.org>; Mon, 6 Dec 2004 06:18:53 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iB66IrER052567
	for perforce@freebsd.org; Mon, 6 Dec 2004 06:18:53 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 6 Dec 2004 06:18:53 GMT
Message-Id: <200412060618.iB66IrER052567@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 66518 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Dec 2004 06:18:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=66518

Change 66518 by sam@sam_ebb on 2004/12/06 06:18:40

	filling+hookup mac acl stuff

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#26 edit
.. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#16 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#26 (text+ko) ====

@@ -1682,6 +1682,31 @@
 }
 
 static int
+ieee80211_ioctl_macmac(struct ieee80211com *ic, struct ieee80211req *ireq)
+{
+	u_int8_t mac[IEEE80211_ADDR_LEN];
+	const struct ieee80211_aclator *acl = ic->ic_acl;
+	int error;
+
+	if (ireq->i_len != sizeof(mac))
+		return EINVAL;
+	error = copyin(ireq->i_data, mac, ireq->i_len);
+	if (error)
+		return error;
+	if (acl == NULL) {
+		acl = ieee80211_aclator_get("mac");
+		if (acl == NULL || !acl->iac_attach(ic))
+			return EINVAL;
+		ic->ic_acl = acl;
+	}
+	if (ireq->i_type == IEEE80211_IOC_ADDMAC)
+		acl->iac_add(ic, mac);
+	else
+		acl->iac_remove(ic, mac);
+	return 0;
+}
+
+static int
 ieee80211_ioctl_maccmd(struct ieee80211com *ic, struct ieee80211req *ireq)
 {
 	const struct ieee80211_aclator *acl = ic->ic_acl;
@@ -2241,6 +2266,10 @@
 		if (error == 0)		/* XXX background scan */
 			error = ieee80211_new_state(ic, IEEE80211_S_SCAN, -1);
 		break;
+	case IEEE80211_IOC_ADDMAC:
+	case IEEE80211_IOC_DELMAC:
+		error = ieee80211_ioctl_macmac(ic, ireq);
+		break;
 	case IEEE80211_IOC_MACCMD:
 		error = ieee80211_ioctl_maccmd(ic, ireq);
 		break;

==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#16 (text+ko) ====

@@ -421,6 +421,8 @@
 #define	IEEE80211_IOC_WME_ACKPOLICY	51	/* WME: ACK policy (!bss only)*/
 #define	IEEE80211_IOC_DTIM_PERIOD	52	/* DTIM period (beacons) */
 #define	IEEE80211_IOC_BEACON_INTERVAL	53	/* beacon interval (ms) */
+#define	IEEE80211_IOC_ADDMAC		54	/* add sta to MAC ACL table */
+#define	IEEE80211_IOC_DELMAC		55	/* del sta from MAC ACL table */
 
 /*
  * Scan result data returned for IEEE80211_IOC_SCAN_RESULTS.