diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-07-10 14:09:12 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-07-20 03:37:39 +0200 |
| commit | 9881a2569f554006d16590e03a31193bfedd23a3 (patch) | |
| tree | 73c9f842b6b531c5722931cdd9b28426c575316f /src/socket.c | |
| parent | device: support 4.13's extact newlink param (diff) | |
| download | wireguard-monolithic-historical-9881a2569f554006d16590e03a31193bfedd23a3.tar.xz wireguard-monolithic-historical-9881a2569f554006d16590e03a31193bfedd23a3.zip | |
global: use pointer to net_device
DaveM prefers it to be this way per [1].
[1] http://www.spinics.net/lists/netdev/msg443992.html
Diffstat (limited to 'src/socket.c')
| -rw-r--r-- | src/socket.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/socket.c b/src/socket.c index a90811a..cdb0f47 100644 --- a/src/socket.c +++ b/src/socket.c @@ -29,7 +29,7 @@ static inline int send4(struct wireguard_device *wg, struct sk_buff *skb, struct int ret = 0; skb->next = skb->prev = NULL; - skb->dev = netdev_pub(wg); + skb->dev = wg->dev; rcu_read_lock_bh(); sock = rcu_dereference_bh(wg->sock4); @@ -55,12 +55,12 @@ static inline int send4(struct wireguard_device *wg, struct sk_buff *skb, struct } if (unlikely(IS_ERR(rt))) { ret = PTR_ERR(rt); - net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", netdev_pub(wg)->name, &endpoint->addr, ret); + net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", wg->dev->name, &endpoint->addr, ret); goto err; } else if (unlikely(rt->dst.dev == skb->dev)) { ip_rt_put(rt); ret = -ELOOP; - net_dbg_ratelimited("%s: Avoiding routing loop to %pISpfsc\n", netdev_pub(wg)->name, &endpoint->addr); + net_dbg_ratelimited("%s: Avoiding routing loop to %pISpfsc\n", wg->dev->name, &endpoint->addr); goto err; } if (cache) @@ -94,7 +94,7 @@ static inline int send6(struct wireguard_device *wg, struct sk_buff *skb, struct int ret = 0; skb->next = skb->prev = NULL; - skb->dev = netdev_pub(wg); + skb->dev = wg->dev; rcu_read_lock_bh(); sock = rcu_dereference_bh(wg->sock6); @@ -116,12 +116,12 @@ static inline int send6(struct wireguard_device *wg, struct sk_buff *skb, struct } ret = ipv6_stub->ipv6_dst_lookup(sock_net(sock), sock, &dst, &fl); if (unlikely(ret)) { - net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", netdev_pub(wg)->name, &endpoint->addr, ret); + net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n", wg->dev->name, &endpoint->addr, ret); goto err; } else if (unlikely(dst->dev == skb->dev)) { dst_release(dst); ret = -ELOOP; - net_dbg_ratelimited("%s: Avoiding routing loop to %pISpfsc\n", netdev_pub(wg)->name, &endpoint->addr); + net_dbg_ratelimited("%s: Avoiding routing loop to %pISpfsc\n", wg->dev->name, &endpoint->addr); goto err; } if (cache) @@ -329,7 +329,7 @@ retry: ret = udp_sock_create(wg->creating_net, &port4, &new4); if (ret < 0) { - pr_err("%s: Could not create IPv4 socket\n", netdev_pub(wg)->name); + pr_err("%s: Could not create IPv4 socket\n", wg->dev->name); goto out; } wg->incoming_port = ntohs(inet_sk(new4->sk)->inet_sport); @@ -349,7 +349,7 @@ retry: goto retry; if (!port4.local_udp_port) wg->incoming_port = 0; - pr_err("%s: Could not create IPv6 socket\n", netdev_pub(wg)->name); + pr_err("%s: Could not create IPv6 socket\n", wg->dev->name); goto out; } set_sock_opts(new6); |