diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-09-25 07:39:20 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-25 13:00:38 -0700 |
| commit | 1c1e9d2b67897316770fc8a2e1acdd9f2787838d (patch) | |
| tree | b62b9ca9ecfdd5d26bc614fe84834dd05146898a /include/net/ipv6.h | |
| parent | 5d062de7f8ea1ca7c635957ff1144fba815ba34c (diff) | |
| download | linux-stable-1c1e9d2b67897316770fc8a2e1acdd9f2787838d.tar.gz linux-stable-1c1e9d2b67897316770fc8a2e1acdd9f2787838d.tar.bz2 linux-stable-1c1e9d2b67897316770fc8a2e1acdd9f2787838d.zip | |
ipv6: constify ip6_xmit() sock argument
This is to document that socket lock might not be held at this point.
skb_set_owner_w() and ipv6_local_error() are using proper atomic ops
or spinlocks, so we promote the socket to non const when calling them.
netfilter hooks should never assume socket lock is held,
we also promote the socket to non const.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ipv6.h')
| -rw-r--r-- | include/net/ipv6.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 9877b68ad207..3dde042bcd3f 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h @@ -812,7 +812,7 @@ int ip6_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb); /* * upper-layer output functions */ -int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, +int ip6_xmit(const struct sock *sk, struct sk_buff *skb, struct flowi6 *fl6, struct ipv6_txoptions *opt, int tclass); int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr); |