38c38
< __FBSDID("$FreeBSD: head/sys/security/mac/mac_inet.c 166531 2007-02-06 10:59:23Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/security/mac/mac_inet.c 168955 2007-04-22 19:55:56Z rwatson $");
166c166
< mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *datagram)
---
> mac_create_datagram_from_ipq(struct ipq *ipq, struct mbuf *m)
170c170
< label = mac_mbuf_to_label(datagram);
---
> label = mac_mbuf_to_label(m);
172,173c172
< MAC_PERFORM(create_datagram_from_ipq, ipq, ipq->ipq_label,
< datagram, label);
---
> MAC_PERFORM(create_datagram_from_ipq, ipq, ipq->ipq_label, m, label);
177c176
< mac_create_fragment(struct mbuf *datagram, struct mbuf *fragment)
---
> mac_create_fragment(struct mbuf *m, struct mbuf *frag)
179c178
< struct label *datagramlabel, *fragmentlabel;
---
> struct label *mlabel, *fraglabel;
181,182c180,181
< datagramlabel = mac_mbuf_to_label(datagram);
< fragmentlabel = mac_mbuf_to_label(fragment);
---
> mlabel = mac_mbuf_to_label(m);
> fraglabel = mac_mbuf_to_label(frag);
184,185c183
< MAC_PERFORM(create_fragment, datagram, datagramlabel, fragment,
< fragmentlabel);
---
> MAC_PERFORM(create_fragment, m, mlabel, frag, fraglabel);
189c187
< mac_create_ipq(struct mbuf *fragment, struct ipq *ipq)
---
> mac_create_ipq(struct mbuf *m, struct ipq *ipq)
193c191
< label = mac_mbuf_to_label(fragment);
---
> label = mac_mbuf_to_label(m);
195c193
< MAC_PERFORM(create_ipq, fragment, label, ipq, ipq->ipq_label);
---
> MAC_PERFORM(create_ipq, m, label, ipq, ipq->ipq_label);
210c208
< mac_fragment_match(struct mbuf *fragment, struct ipq *ipq)
---
> mac_fragment_match(struct mbuf *m, struct ipq *ipq)
215c213
< label = mac_mbuf_to_label(fragment);
---
> label = mac_mbuf_to_label(m);
218,219c216
< MAC_BOOLEAN(fragment_match, &&, fragment, label, ipq,
< ipq->ipq_label);
---
> MAC_BOOLEAN(fragment_match, &&, m, label, ipq, ipq->ipq_label);
232a230
>
244c242
< mac_update_ipq(struct mbuf *fragment, struct ipq *ipq)
---
> mac_update_ipq(struct mbuf *m, struct ipq *ipq)
248c246
< label = mac_mbuf_to_label(fragment);
---
> label = mac_mbuf_to_label(m);
250c248
< MAC_PERFORM(update_ipq, fragment, label, ipq, ipq->ipq_label);
---
> MAC_PERFORM(update_ipq, m, label, ipq, ipq->ipq_label);
334c332
< struct label *mbuf_label;
---
> struct label *mlabel;
337,338c335,336
< mbuf_label = mac_mbuf_to_label(m);
< MAC_PERFORM(create_mbuf_from_syncache, sc_label, m, mbuf_label);
---
> mlabel = mac_mbuf_to_label(m);
> MAC_PERFORM(create_mbuf_from_syncache, sc_label, m, mlabel);