diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-02 14:37:25 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-02 14:37:25 +0000 |
| commit | 85ee8479ba3175c85dcf16e6517a3bc334235fa3 (patch) | |
| tree | 532d7ef94253ae6146046ba2dfdbc7ac9d53cdbf /drivers/net | |
| parent | 255a88e7989ff52c975e8b80de9d746cb107c58e (diff) | |
| parent | 1bb13d02e6fff32818ccde759efe88c70afd008e (diff) | |
| download | wireguard-linux-trimmed-85ee8479ba3175c85dcf16e6517a3bc334235fa3.tar.gz wireguard-linux-trimmed-85ee8479ba3175c85dcf16e6517a3bc334235fa3.zip | |
Merge tag 'amba-make-remove-return-void' of https://git.pengutronix.de/git/ukl/linux into devel-stable
Tag for adaptions to struct amba_driver::remove changing prototype
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireguard/device.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireguard/socket.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireguard/device.c b/drivers/net/wireguard/device.c index c9f65e9..a3ed49c 100644 --- a/drivers/net/wireguard/device.c +++ b/drivers/net/wireguard/device.c @@ -215,7 +215,7 @@ static const struct net_device_ops netdev_ops = { .ndo_open = wg_open, .ndo_stop = wg_stop, .ndo_start_xmit = wg_xmit, - .ndo_get_stats64 = ip_tunnel_get_stats64 + .ndo_get_stats64 = dev_get_tstats64 }; static void wg_destruct(struct net_device *dev) diff --git a/drivers/net/wireguard/socket.c b/drivers/net/wireguard/socket.c index c33e2c8..410b318 100644 --- a/drivers/net/wireguard/socket.c +++ b/drivers/net/wireguard/socket.c @@ -49,7 +49,7 @@ static int send4(struct wg_device *wg, struct sk_buff *skb, rt = dst_cache_get_ip4(cache, &fl.saddr); if (!rt) { - security_sk_classify_flow(sock, flowi4_to_flowi(&fl)); + security_sk_classify_flow(sock, flowi4_to_flowi_common(&fl)); if (unlikely(!inet_confirm_addr(sock_net(sock), NULL, 0, fl.saddr, RT_SCOPE_HOST))) { endpoint->src4.s_addr = 0; @@ -129,7 +129,7 @@ static int send6(struct wg_device *wg, struct sk_buff *skb, dst = dst_cache_get_ip6(cache, &fl.saddr); if (!dst) { - security_sk_classify_flow(sock, flowi6_to_flowi(&fl)); + security_sk_classify_flow(sock, flowi6_to_flowi_common(&fl)); if (unlikely(!ipv6_addr_any(&fl.saddr) && !ipv6_chk_addr(sock_net(sock), &fl.saddr, NULL, 0))) { endpoint->src6 = fl.saddr = in6addr_any; |