PERFORCE change 100745 for review

[Robert Watson]

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

Change 100745 by rwatson at rwatson_zoo on 2006/07/06 13:19:22

	Rename.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/net/bpf.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/net/if.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#3 edit
.. //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/net/bpf.c#3 (text+ko) ====

@@ -375,8 +375,8 @@
 	d->bd_seesent = 1;
 	d->bd_pid = td->td_proc->p_pid;
 #ifdef MAC
-	mac_init_bpfdesc(d);
-	mac_create_bpfdesc(td->td_ucred, d);
+	mac_bpfdesc_init(d);
+	mac_bpfdesc_create(td->td_ucred, d);
 #endif
 	mtx_init(&d->bd_mtx, devtoname(dev), "bpf cdev lock", MTX_DEF);
 	callout_init(&d->bd_callout, NET_CALLOUT_MPSAFE);
@@ -407,7 +407,7 @@
 	mtx_unlock(&bpf_mtx);
 	selwakeuppri(&d->bd_sel, PRINET);
 #ifdef MAC
-	mac_destroy_bpfdesc(d);
+	mac_bpfdesc_destroy(d);
 #endif /* MAC */
 	knlist_destroy(&d->bd_sel.si_note);
 	bpf_freed(d);
@@ -597,7 +597,7 @@
 
 #ifdef MAC
 	BPFD_LOCK(d);
-	mac_create_mbuf_from_bpfdesc(d, m);
+	mac_bpfdesc_create_mbuf(d, m);
 	BPFD_UNLOCK(d);
 #endif
 	NET_LOCK_GIANT();
@@ -1213,7 +1213,7 @@
 		if (slen != 0) {
 			d->bd_fcount++;
 #ifdef MAC
-			if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0)
+			if (mac_bpfdesc_check_receive(d, bp->bif_ifp) == 0)
 #endif
 				catchpacket(d, pkt, pktlen, slen, bcopy);
 		}
@@ -1275,7 +1275,7 @@
 		if (slen != 0) {
 			d->bd_fcount++;
 #ifdef MAC
-			if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0)
+			if (mac_bpfdesc_check_receive(d, bp->bif_ifp) == 0)
 #endif
 				catchpacket(d, (u_char *)m, pktlen, slen,
 				    bpf_mcopy);
@@ -1317,7 +1317,7 @@
 		if (slen != 0) {
 			d->bd_fcount++;
 #ifdef MAC
-			if (mac_check_bpfdesc_receive(d, bp->bif_ifp) == 0)
+			if (mac_bpfdesc_check_receive(d, bp->bif_ifp) == 0)
 #endif
 				catchpacket(d, (u_char *)&mb, pktlen, slen,
 				    bpf_mcopy);

==== //depot/projects/trustedbsd/mac2/sys/net/if.c#3 (text+ko) ====

@@ -452,8 +452,8 @@
 	ifp->if_data.ifi_datalen = sizeof(struct if_data);
 
 #ifdef MAC
-	mac_init_ifnet(ifp);
-	mac_create_ifnet(ifp);
+	mac_ifnet_init(ifp);
+	mac_ifnet_create(ifp);
 #endif
 
 	ifdev_byindex(ifp->if_index) = make_dev(&net_cdevsw,
@@ -713,7 +713,7 @@
 	IF_AFDATA_UNLOCK(ifp);
 
 #ifdef MAC
-	mac_destroy_ifnet(ifp);
+	mac_ifnet_destroy(ifp);
 #endif /* MAC */
 	KNOTE_UNLOCKED(&ifp->if_klist, NOTE_EXIT);
 	knlist_clear(&ifp->if_klist, 0);
@@ -1444,7 +1444,7 @@
 
 #ifdef MAC
 	case SIOCGIFMAC:
-		error = mac_ioctl_ifnet_get(td->td_ucred, ifr, ifp);
+		error = mac_ifnet_ioctl_get(td->td_ucred, ifr, ifp);
 		break;
 #endif
 
@@ -1520,7 +1520,7 @@
 
 #ifdef MAC
 	case SIOCSIFMAC:
-		error = mac_ioctl_ifnet_set(td->td_ucred, ifr, ifp);
+		error = mac_ifnet_ioctl_set(td->td_ucred, ifr, ifp);
 		break;
 #endif
 

==== //depot/projects/trustedbsd/mac2/sys/net/if_ethersubr.c#3 (text+ko) ====

@@ -148,7 +148,7 @@
 	int hlen;	/* link layer header length */
 
 #ifdef MAC
-	error = mac_check_ifnet_transmit(ifp, m);
+	error = mac_ifnet_check_transmit(ifp, m);
 	if (error)
 		senderr(error);
 #endif
@@ -541,7 +541,7 @@
 	 * Tag the mbuf with an appropriate MAC label before any other
 	 * consumers can get to it.
 	 */
-	mac_create_mbuf_from_ifnet(ifp, m);
+	mac_ifnet_create_mbuf(ifp, m);
 #endif
 
 	/*

==== //depot/projects/trustedbsd/mac2/sys/net/if_gif.c#3 (text+ko) ====

@@ -360,7 +360,7 @@
 	u_int32_t af;
 
 #ifdef MAC
-	error = mac_check_ifnet_transmit(ifp, m);
+	error = mac_ifnet_check_transmit(ifp, m);
 	if (error) {
 		m_freem(m);
 		goto end;
@@ -479,7 +479,7 @@
 	m->m_pkthdr.rcvif = ifp;
 
 #ifdef MAC
-	mac_create_mbuf_from_ifnet(ifp, m);
+	mac_ifnet_create_mbuf(ifp, m);
 #endif
 
 	if (bpf_peers_present(ifp->if_bpf)) {

==== //depot/projects/trustedbsd/mac2/sys/net/if_ppp.c#3 (text+ko) ====

@@ -785,7 +785,7 @@
     int len;
 
 #ifdef MAC
-    error = mac_check_ifnet_transmit(ifp, m0);
+    error = mac_ifnet_check_transmit(ifp, m0);
     if (error)
 	goto bad;
 #endif
@@ -1180,7 +1180,7 @@
 	    if (m == NULL)
 		break;
 #ifdef MAC
-	    mac_create_mbuf_from_ifnet(PPP2IFP(sc), m);
+	    mac_ifnet_create_mbuf(PPP2IFP(sc), m);
 #endif
 	    ppp_inproc(sc, m);
 	}
@@ -1458,7 +1458,7 @@
 	    }
 	}
 #ifdef MAC
-	mac_copy_mbuf(m, mp);
+	mac_mbuf_copy(m, mp);
 #endif
 	cp = mtod(mp, u_char *);
 	cp[0] = adrs;
@@ -1512,7 +1512,7 @@
 	MGETHDR(mp, M_DONTWAIT, MT_DATA);
 	if (mp != NULL) {
 #ifdef MAC
-	    mac_copy_mbuf(m, mp);
+	    mac_mbuf_copy(m, mp);
 #endif
 	    m_copydata(m, 0, ilen, mtod(mp, caddr_t));
 	    m_freem(m);

==== //depot/projects/trustedbsd/mac2/sys/net/if_tun.c#3 (text+ko) ====

@@ -475,7 +475,7 @@
 	TUNDEBUG (ifp, "tunoutput\n");
 
 #ifdef MAC
-	error = mac_check_ifnet_transmit(ifp, m0);
+	error = mac_ifnet_check_transmit(ifp, m0);
 	if (error) {
 		m_freem(m0);
 		return (error);
@@ -769,7 +769,7 @@
 
 	m->m_pkthdr.rcvif = ifp;
 #ifdef MAC
-	mac_create_mbuf_from_ifnet(ifp, m);
+	mac_ifnet_create_mbuf(ifp, m);
 #endif
 
 	/* Could be unlocked read? */