diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-10-07 16:48:36 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-10-08 04:26:55 -0700 |
| commit | 4ebdfba73c09d8568d891bae87c40fad43dd7f41 (patch) | |
| tree | f90cbfbed25de48ec9972d9b294cdcd856f05a12 /net/xfrm/xfrm_output.c | |
| parent | net: Pass net into dst_output and remove dst_output_okfn (diff) | |
| download | linux-dev-4ebdfba73c09d8568d891bae87c40fad43dd7f41.tar.xz linux-dev-4ebdfba73c09d8568d891bae87c40fad43dd7f41.zip | |
dst: Pass a sk into .local_out
For consistency with the other similar methods in the kernel pass a
struct sock into the dst_ops .local_out method.
Simplifying the socket passing case is needed a prequel to passing a
struct net reference into .local_out.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm/xfrm_output.c')
| -rw-r--r-- | net/xfrm/xfrm_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 88752b0c07d8..a7a254fe7985 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -136,7 +136,7 @@ int xfrm_output_resume(struct sk_buff *skb, int err) while (likely((err = xfrm_output_one(skb, err)) == 0)) { nf_reset(skb); - err = skb_dst(skb)->ops->local_out(skb); + err = skb_dst(skb)->ops->local_out(skb->sk, skb); if (unlikely(err != 1)) goto out; |