summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorAlexei Starovoitov <ast@kernel.org>2020-06-01 23:57:15 +0200
committerAlexei Starovoitov <ast@kernel.org>2020-06-02 00:00:20 +0200
commitc48a24f00e7a8b90c817e3f7aa800a3150bb83d0 (patch)
treebba2031049e20cce4e5ff3d21f6749c6b9e625b5 /include/net
parentbpf: Change kvfree to kfree in generic_map_lookup_batch() (diff)
parentselftests/bpf: Add test for SO_BINDTODEVICE opt of bpf_setsockopt (diff)
downloadlinux-c48a24f00e7a8b90c817e3f7aa800a3150bb83d0.tar.xz
linux-c48a24f00e7a8b90c817e3f7aa800a3150bb83d0.zip
Merge branch 'bpf_setsockopt-SO_BINDTODEVICE'
Ferenc Fejes says: ==================== This option makes it possible to programatically bind sockets to netdevices. With the help of this option sockets of VRF unaware applications could be distributed between multiple VRFs with an eBPF program. This lets the applications benefit from multiple possible routes. v2: - splitting up the patch to three parts - lock_sk parameter for optional locking in sock_bindtoindex - Stanislav Fomichev - testing the SO_BINDTODEVICE option - Andrii Nakryiko ==================== Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 6e9f713a7860..c53cc42b5ab9 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2690,7 +2690,7 @@ static inline bool sk_dev_equal_l3scope(struct sock *sk, int dif)
void sock_def_readable(struct sock *sk);
-int sock_bindtoindex(struct sock *sk, int ifindex);
+int sock_bindtoindex(struct sock *sk, int ifindex, bool lock_sk);
void sock_enable_timestamps(struct sock *sk);
void sock_no_linger(struct sock *sk);
void sock_set_keepalive(struct sock *sk);