aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller2011-03-11 23:29:39 -0600
committerDavid S. Miller2011-03-12 17:08:44 -0600
commit1d28f42c1bd4bb2363d88df74d0128b4da135b4a (patch)
treecb2e652fe79a2bc307e871bc2d3fa51cc8051e45 /security/security.c
parentca116922afa8cc5ad46b00c0a637b1cde5ca478a (diff)
downloadkernel-common-1d28f42c1bd4bb2363d88df74d0128b4da135b4a.tar.gz
kernel-common-1d28f42c1bd4bb2363d88df74d0128b4da135b4a.tar.xz
kernel-common-1d28f42c1bd4bb2363d88df74d0128b4da135b4a.zip
net: Put flowi_* prefix on AF independent members of struct flowi
I intend to turn struct flowi into a union of AF specific flowi structs. There will be a common structure that each variant includes first, much like struct sock_common. This is the first step to move in that direction. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/security.c b/security/security.c
index 8ef1f7dff27..bae843c8a13 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1100,7 +1100,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk)
1100 1100
1101void security_sk_classify_flow(struct sock *sk, struct flowi *fl) 1101void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
1102{ 1102{
1103 security_ops->sk_getsecid(sk, &fl->secid); 1103 security_ops->sk_getsecid(sk, &fl->flowi_secid);
1104} 1104}
1105EXPORT_SYMBOL(security_sk_classify_flow); 1105EXPORT_SYMBOL(security_sk_classify_flow);
1106 1106
@@ -1246,7 +1246,7 @@ int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
1246 1246
1247void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl) 1247void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl)
1248{ 1248{
1249 int rc = security_ops->xfrm_decode_session(skb, &fl->secid, 0); 1249 int rc = security_ops->xfrm_decode_session(skb, &fl->flowi_secid, 0);
1250 1250
1251 BUG_ON(rc); 1251 BUG_ON(rc);
1252} 1252}