42c42
< __FBSDID("$FreeBSD: head/sys/security/mac/mac_inet.c 179359 2008-05-27 14:18:02Z csjp $");
---
> __FBSDID("$FreeBSD: head/sys/security/mac/mac_inet.c 179781 2008-06-13 22:14:15Z rwatson $");
120c120
< mac_ipq_init(struct ipq *ipq, int flag)
---
> mac_ipq_init(struct ipq *q, int flag)
123,124c123,124
< ipq->ipq_label = mac_ipq_label_alloc(flag);
< if (ipq->ipq_label == NULL)
---
> q->ipq_label = mac_ipq_label_alloc(flag);
> if (q->ipq_label == NULL)
154c154
< mac_ipq_destroy(struct ipq *ipq)
---
> mac_ipq_destroy(struct ipq *q)
157,158c157,158
< mac_ipq_label_free(ipq->ipq_label);
< ipq->ipq_label = NULL;
---
> mac_ipq_label_free(q->ipq_label);
> q->ipq_label = NULL;
169c169
< mac_ipq_reassemble(struct ipq *ipq, struct mbuf *m)
---
> mac_ipq_reassemble(struct ipq *q, struct mbuf *m)
175c175
< MAC_PERFORM(ipq_reassemble, ipq, ipq->ipq_label, m, label);
---
> MAC_PERFORM(ipq_reassemble, q, q->ipq_label, m, label);
190c190
< mac_ipq_create(struct mbuf *m, struct ipq *ipq)
---
> mac_ipq_create(struct mbuf *m, struct ipq *q)
196c196
< MAC_PERFORM(ipq_create, m, label, ipq, ipq->ipq_label);
---
> MAC_PERFORM(ipq_create, m, label, q, q->ipq_label);
211c211
< mac_ipq_match(struct mbuf *m, struct ipq *ipq)
---
> mac_ipq_match(struct mbuf *m, struct ipq *q)
219c219
< MAC_BOOLEAN(ipq_match, &&, m, label, ipq, ipq->ipq_label);
---
> MAC_BOOLEAN(ipq_match, &&, m, label, q, q->ipq_label);
281c281
< mac_ipq_update(struct mbuf *m, struct ipq *ipq)
---
> mac_ipq_update(struct mbuf *m, struct ipq *q)
287c287
< MAC_PERFORM(ipq_update, m, label, ipq, ipq->ipq_label);
---
> MAC_PERFORM(ipq_update, m, label, q, q->ipq_label);