Merge remote-tracking branch 'torvalds/master' into perf/core

[sfrench/cifs-2.6.git] / drivers / net / wireguard / socket.c

diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c
index 410b318e57fb941140fb3e6161eb876fb0d7fa42..d9ad850daa7932b93e6dc982eccc1d22a4cc7ca3 100644 (file)
--- a/drivers/net/wireguard/socket.c
+++ b/drivers/net/wireguard/socket.c
@@ -53,7 +53,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,
                if (unlikely(!inet_confirm_addr(sock_net(sock), NULL, 0,
                                                fl.saddr, RT_SCOPE_HOST))) {
                        endpoint->src4.s_addr = 0;
-                       *(__force __be32 *)&endpoint->src_if4 = 0;
+                       endpoint->src_if4 = 0;
                        fl.saddr = 0;
                        if (cache)
                                dst_cache_reset(cache);
@@ -63,7 +63,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,
                             PTR_ERR(rt) == -EINVAL) || (!IS_ERR(rt) &&
                             rt->dst.dev->ifindex != endpoint->src_if4)))) {
                        endpoint->src4.s_addr = 0;
-                       *(__force __be32 *)&endpoint->src_if4 = 0;
+                       endpoint->src_if4 = 0;
                        fl.saddr = 0;
                        if (cache)
                                dst_cache_reset(cache);
@@ -71,7 +71,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb,
                                ip_rt_put(rt);
                        rt = ip_route_output_flow(sock_net(sock), &fl, sock);
                }
-               if (unlikely(IS_ERR(rt))) {
+               if (IS_ERR(rt)) {
                        ret = PTR_ERR(rt);
                        net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
                                            wg->dev->name, &endpoint->addr, ret);
@@ -138,7 +138,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb,
                }
                dst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(sock), sock, &fl,
                                                      NULL);
-               if (unlikely(IS_ERR(dst))) {
+               if (IS_ERR(dst)) {
                        ret = PTR_ERR(dst);
                        net_dbg_ratelimited("%s: No route to %pISpfsc, error %d\n",
                                            wg->dev->name, &endpoint->addr, ret);