diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-18 12:14:55 +0200 |
| commit | 1111b680d34bc19190f02a1b4479c3fcc592c22e (patch) | |
| tree | 9d45ad88b9354205a2d1fd76a338ab8693a16d86 /net/ipv4/xfrm4_output.c | |
| parent | 37b6cb475a6d74bc047c53bc323d6eb3113e27a4 (diff) | |
| parent | 24223657806a0ebd0ae5c9caaf7b021091889cf2 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up PMU driver fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/ipv4/xfrm4_output.c')
| -rw-r--r-- | net/ipv4/xfrm4_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index baa0f63731f..40e701f2e1e 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -86,7 +86,7 @@ int xfrm4_output_finish(struct sk_buff *skb) return xfrm_output(skb); } -int xfrm4_output(struct sk_buff *skb) +int xfrm4_output(struct sock *sk, struct sk_buff *skb) { struct dst_entry *dst = skb_dst(skb); struct xfrm_state *x = dst->xfrm; |