aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2011-03-16 18:29:25 -0500
committerLinus Torvalds2011-03-16 18:29:25 -0500
commit7a6362800cb7d1d618a697a650c7aaed3eb39320 (patch)
tree087f9bc6c13ef1fad4b392c5cf9325cd28fa8523 /security/security.c
parent6445ced8670f37cfc2c5e24a9de9b413dbfc788d (diff)
parentceda86a108671294052cbf51660097b6534672f5 (diff)
downloadkernel-common-7a6362800cb7d1d618a697a650c7aaed3eb39320.tar.gz
kernel-common-7a6362800cb7d1d618a697a650c7aaed3eb39320.tar.xz
kernel-common-7a6362800cb7d1d618a697a650c7aaed3eb39320.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits) bonding: enable netpoll without checking link status xfrm: Refcount destination entry on xfrm_lookup net: introduce rx_handler results and logic around that bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag bonding: wrap slave state work net: get rid of multiple bond-related netdevice->priv_flags bonding: register slave pointer for rx_handler be2net: Bump up the version number be2net: Copyright notice change. Update to Emulex instead of ServerEngines e1000e: fix kconfig for crc32 dependency netfilter ebtables: fix xt_AUDIT to work with ebtables xen network backend driver bonding: Improve syslog message at device creation time bonding: Call netif_carrier_off after register_netdevice bonding: Incorrect TX queue offset net_sched: fix ip_tos2prio xfrm: fix __xfrm_route_forward() be2net: Fix UDP packet detected status in RX compl Phonet: fix aligned-mode pipe socket buffer header reserve netxen: support for GbE port settings ... Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c with the staging updates.
Diffstat (limited to 'security/security.c')
-rw-r--r--security/security.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/security/security.c b/security/security.c
index bab9b23c3ff..9187665a3fd 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1105,7 +1105,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk)
1105 1105
1106void security_sk_classify_flow(struct sock *sk, struct flowi *fl) 1106void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
1107{ 1107{
1108 security_ops->sk_getsecid(sk, &fl->secid); 1108 security_ops->sk_getsecid(sk, &fl->flowi_secid);
1109} 1109}
1110EXPORT_SYMBOL(security_sk_classify_flow); 1110EXPORT_SYMBOL(security_sk_classify_flow);
1111 1111
@@ -1238,7 +1238,8 @@ int security_xfrm_policy_lookup(struct xfrm_sec_ctx *ctx, u32 fl_secid, u8 dir)
1238} 1238}
1239 1239
1240int security_xfrm_state_pol_flow_match(struct xfrm_state *x, 1240int security_xfrm_state_pol_flow_match(struct xfrm_state *x,
1241 struct xfrm_policy *xp, struct flowi *fl) 1241 struct xfrm_policy *xp,
1242 const struct flowi *fl)
1242{ 1243{
1243 return security_ops->xfrm_state_pol_flow_match(x, xp, fl); 1244 return security_ops->xfrm_state_pol_flow_match(x, xp, fl);
1244} 1245}
@@ -1250,7 +1251,7 @@ int security_xfrm_decode_session(struct sk_buff *skb, u32 *secid)
1250 1251
1251void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl) 1252void security_skb_classify_flow(struct sk_buff *skb, struct flowi *fl)
1252{ 1253{
1253 int rc = security_ops->xfrm_decode_session(skb, &fl->secid, 0); 1254 int rc = security_ops->xfrm_decode_session(skb, &fl->flowi_secid, 0);
1254 1255
1255 BUG_ON(rc); 1256 BUG_ON(rc);
1256} 1257}