Message ID | 20190115134216.1757-2-dh.herrmann@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [v2,1/3] net: introduce SO_BINDTOIFINDEX sockopt | expand |
From: David Herrmann <dh.herrmann@gmail.com> Date: Tue, 15 Jan 2019 14:42:15 +0100 > 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> > --- > v2: > - Rename to SO_BINDTOIFINDEX from SO_BINDTOIF Applied.
diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c index be8b5b2157d8..e93cc0379201 100644 --- a/net/ipv4/udp_tunnel.c +++ b/net/ipv4/udp_tunnel.c @@ -21,18 +21,9 @@ int udp_sock_create4(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; }