[PATCH net-next 2/6] net: check tunnel offload feature before calling tunnel ndo ndo

[Sabrina Dubroca]

If NETIF_F_TUNNEL_OFFLOAD was disabled on a given netdevice, skip the
tunnel offload ndo call during tunnel port creation and deletion.

Signed-off-by: Sabrina Dubroca <s...@queasysnail.net>
---
 net/ipv4/udp_tunnel.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c
index 58bd39fb14b4..fc8336fddadf 100644
--- a/net/ipv4/udp_tunnel.c
+++ b/net/ipv4/udp_tunnel.c
@@ -82,7 +82,8 @@ void udp_tunnel_push_rx_port(struct net_device *dev, struct 
socket *sock,
        struct sock *sk = sock->sk;
        struct udp_tunnel_info ti;
 
-       if (!dev->netdev_ops->ndo_udp_tunnel_add)
+       if (!dev->netdev_ops->ndo_udp_tunnel_add ||
+           !(dev->features & NETIF_F_TUNNEL_OFFLOAD))
                return;
 
        ti.type = type;
@@ -109,6 +110,8 @@ void udp_tunnel_notify_add_rx_port(struct socket *sock, 
unsigned short type)
        for_each_netdev_rcu(net, dev) {
                if (!dev->netdev_ops->ndo_udp_tunnel_add)
                        continue;
+               if (!(dev->features & NETIF_F_TUNNEL_OFFLOAD))
+                       continue;
                dev->netdev_ops->ndo_udp_tunnel_add(dev, &ti);
        }
        rcu_read_unlock();
@@ -131,6 +134,8 @@ void udp_tunnel_notify_del_rx_port(struct socket *sock, 
unsigned short type)
        for_each_netdev_rcu(net, dev) {
                if (!dev->netdev_ops->ndo_udp_tunnel_del)
                        continue;
+               if (!(dev->features & NETIF_F_TUNNEL_OFFLOAD))
+                       continue;
                dev->netdev_ops->ndo_udp_tunnel_del(dev, &ti);
        }
        rcu_read_unlock();
-- 
2.13.2