diff options
author | rwatson <rwatson@FreeBSD.org> | 2008-06-13 22:14:15 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2008-06-13 22:14:15 +0000 |
commit | f07c38e84aa87001718dc3e4625bc30c9af3be89 (patch) | |
tree | 73b558170fb5c7801f3fea0db4e1007d0362a79d /sys/security/mac_stub | |
parent | 0dd1763fd61cb2c8ebe8fb606c1b6ee159ffd6e3 (diff) | |
download | FreeBSD-src-f07c38e84aa87001718dc3e4625bc30c9af3be89.zip FreeBSD-src-f07c38e84aa87001718dc3e4625bc30c9af3be89.tar.gz |
The TrustedBSD MAC Framework named struct ipq instances 'ipq', which is the
same as the global variable defined in ip_input.c. Instead, adopt the name
'q' as found in about 1/2 of uses in ip_input.c, preventing a collision on
the name. This is non-harmful, but means that search and replace on the
global works less well (as in the virtualization work), as well as indexing
tools.
MFC after: 1 week
Reported by: julian
Diffstat (limited to 'sys/security/mac_stub')
-rw-r--r-- | sys/security/mac_stub/mac_stub.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index 165e7bb..6c8f2f5 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -307,30 +307,30 @@ stub_inpcb_sosetlabel(struct socket *so, struct label *solabel, } static void -stub_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +stub_ipq_create(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { } static int -stub_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +stub_ipq_match(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { return (1); } static void -stub_ipq_reassemble(struct ipq *ipq, struct label *ipqlabel, - struct mbuf *m, struct label *mlabel) +stub_ipq_reassemble(struct ipq *q, struct label *qlabel, struct mbuf *m, + struct label *mlabel) { } static void -stub_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *ipq, - struct label *ipqlabel) +stub_ipq_update(struct mbuf *m, struct label *mlabel, struct ipq *q, + struct label *qlabel) { } |