diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:50:34 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:50:34 +0200 |
| commit | f257f9ae83162113a10130d49ee34e58c7f8db92 (patch) | |
| tree | 6c5955d248bcbaefb3d1fb174d94deec2982ced3 /drivers/net/wireguard/socket.c | |
| parent | 3a3bf3592c067aa869ee36e30aba526a4e40d70c (diff) | |
| parent | a7c7fb13625f4ec9df02d32e90d4071393756f01 (diff) | |
| download | wireguard-linux-trimmed-f257f9ae83162113a10130d49ee34e58c7f8db92.tar.gz wireguard-linux-trimmed-f257f9ae83162113a10130d49ee34e58c7f8db92.zip | |
Merge tag 'noinstr-lds-2020-05-19' into core/rcu
Get the noinstr section and annotation markers to base the RCU parts on.
Diffstat (limited to 'drivers/net/wireguard/socket.c')
| -rw-r--r-- | drivers/net/wireguard/socket.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index b0d6541..f901802 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -76,12 +76,6 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, 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", - wg->dev->name, &endpoint->addr); - goto err; } if (cache) dst_cache_set_ip4(cache, &rt->dst, fl.saddr); @@ -149,12 +143,6 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, 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", - wg->dev->name, &endpoint->addr); - goto err; } if (cache) dst_cache_set_ip6(cache, dst, &fl.saddr); |