diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-07-07 03:36:53 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-07-07 03:36:53 +0200 |
| commit | b7798de4fd7e8631908c49333d7111d748395698 (patch) | |
| tree | dfae21a329792ae097b1b73b2267d665cf8903f2 | |
| parent | qemu: update default testing kernel (diff) | |
| download | wireguard-monolithic-historical-b7798de4fd7e8631908c49333d7111d748395698.tar.xz wireguard-monolithic-historical-b7798de4fd7e8631908c49333d7111d748395698.zip | |
socket: style
| -rw-r--r-- | src/socket.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/socket.c b/src/socket.c index ac6c668..a90811a 100644 --- a/src/socket.c +++ b/src/socket.c @@ -66,11 +66,7 @@ static inline int send4(struct wireguard_device *wg, struct sk_buff *skb, struct if (cache) dst_cache_set_ip4(cache, &rt->dst, fl.saddr); } - udp_tunnel_xmit_skb(rt, sock, skb, - fl.saddr, fl.daddr, - ds, ip4_dst_hoplimit(&rt->dst), 0, - fl.fl4_sport, fl.fl4_dport, - false, false); + udp_tunnel_xmit_skb(rt, sock, skb, fl.saddr, fl.daddr, ds, ip4_dst_hoplimit(&rt->dst), 0, fl.fl4_sport, fl.fl4_dport, false, false); goto out; err: @@ -132,11 +128,7 @@ static inline int send6(struct wireguard_device *wg, struct sk_buff *skb, struct dst_cache_set_ip6(cache, dst, &fl.saddr); } - udp_tunnel6_xmit_skb(dst, sock, skb, skb->dev, - &fl.saddr, &fl.daddr, - ds, ip6_dst_hoplimit(dst), 0, - fl.fl6_sport, fl.fl6_dport, - false); + udp_tunnel6_xmit_skb(dst, sock, skb, skb->dev, &fl.saddr, &fl.daddr, ds, ip6_dst_hoplimit(dst), 0, fl.fl6_sport, fl.fl6_dport, false); goto out; err: @@ -330,8 +322,7 @@ int socket_init(struct wireguard_device *wg) #if IS_ENABLED(CONFIG_IPV6) retry: #endif - if (rcu_dereference_protected(wg->sock4, lockdep_is_held(&wg->socket_update_lock)) || - rcu_dereference_protected(wg->sock6, lockdep_is_held(&wg->socket_update_lock))) { + if (rcu_dereference_protected(wg->sock4, lockdep_is_held(&wg->socket_update_lock)) || rcu_dereference_protected(wg->sock6, lockdep_is_held(&wg->socket_update_lock))) { ret = -EADDRINUSE; goto out; } |