diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2019-01-15 14:42:16 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-17 14:55:52 -0800 |
| commit | 49b4994c14010b851351f20f33d8660311aaa86e (patch) | |
| tree | cf11a435c75fc4358527d40daf747e2e363db5ba /net/ipv6 | |
| parent | 2eadee72dbb8de37585a1ee63823c8495454ffa4 (diff) | |
| download | linux-49b4994c14010b851351f20f33d8660311aaa86e.tar.gz linux-49b4994c14010b851351f20f33d8660311aaa86e.tar.bz2 linux-49b4994c14010b851351f20f33d8660311aaa86e.zip | |
net/ipv6/udp_tunnel: prefer SO_BINDTOIFINDEX over SO_BINDTODEVICE
The udp-tunnel setup allows binding sockets to a network device. Prefer
the new SO_BINDTOIFINDEX to avoid temporarily resolving the device-name
just to look it up in the ioctl again.
Reviewed-by: Tom Gundersen <teg@jklm.no>
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ip6_udp_tunnel.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/net/ipv6/ip6_udp_tunnel.c b/net/ipv6/ip6_udp_tunnel.c index ad1a9ccd4b44..25430c991cea 100644 --- a/net/ipv6/ip6_udp_tunnel.c +++ b/net/ipv6/ip6_udp_tunnel.c @@ -32,18 +32,9 @@ int udp_sock_create6(struct net *net, struct udp_port_cfg *cfg, goto error; } if (cfg->bind_ifindex) { - struct net_device *dev; - - dev = dev_get_by_index(net, cfg->bind_ifindex); - if (!dev) { - err = -ENODEV; - goto error; - } - - err = kernel_setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, - dev->name, strlen(dev->name) + 1); - dev_put(dev); - + err = kernel_setsockopt(sock, SOL_SOCKET, SO_BINDTOIFINDEX, + (void *)&cfg->bind_ifindex, + sizeof(cfg->bind_ifindex)); if (err < 0) goto error; } |