liquidio: convert to new udp_tunnel_nic infra

This driver is just a super thin FW interface, but Derek let us
know the table has 1024 entries.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c
index 19689d7..e73bc21 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_main.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -2670,6 +2670,35 @@ static int liquidio_vxlan_port_command(struct net_device *netdev, int command,
        return ret;
 }
 
+static int liquidio_udp_tunnel_set_port(struct net_device *netdev,
+                                       unsigned int table, unsigned int entry,
+                                       struct udp_tunnel_info *ti)
+{
+       return liquidio_vxlan_port_command(netdev,
+                                          OCTNET_CMD_VXLAN_PORT_CONFIG,
+                                          htons(ti->port),
+                                          OCTNET_CMD_VXLAN_PORT_ADD);
+}
+
+static int liquidio_udp_tunnel_unset_port(struct net_device *netdev,
+                                         unsigned int table,
+                                         unsigned int entry,
+                                         struct udp_tunnel_info *ti)
+{
+       return liquidio_vxlan_port_command(netdev,
+                                          OCTNET_CMD_VXLAN_PORT_CONFIG,
+                                          htons(ti->port),
+                                          OCTNET_CMD_VXLAN_PORT_DEL);
+}
+
+static const struct udp_tunnel_nic_info liquidio_udp_tunnels = {
+       .set_port       = liquidio_udp_tunnel_set_port,
+       .unset_port     = liquidio_udp_tunnel_unset_port,
+       .tables         = {
+               { .n_entries = 1024, .tunnel_types = UDP_TUNNEL_TYPE_VXLAN, },
+       },
+};
+
 /** \brief Net device fix features
  * @param netdev  pointer to network device
  * @param request features requested
@@ -2758,30 +2787,6 @@ static int liquidio_set_features(struct net_device *netdev,
        return 0;
 }
 
-static void liquidio_add_vxlan_port(struct net_device *netdev,
-                                   struct udp_tunnel_info *ti)
-{
-       if (ti->type != UDP_TUNNEL_TYPE_VXLAN)
-               return;
-
-       liquidio_vxlan_port_command(netdev,
-                                   OCTNET_CMD_VXLAN_PORT_CONFIG,
-                                   htons(ti->port),
-                                   OCTNET_CMD_VXLAN_PORT_ADD);
-}
-
-static void liquidio_del_vxlan_port(struct net_device *netdev,
-                                   struct udp_tunnel_info *ti)
-{
-       if (ti->type != UDP_TUNNEL_TYPE_VXLAN)
-               return;
-
-       liquidio_vxlan_port_command(netdev,
-                                   OCTNET_CMD_VXLAN_PORT_CONFIG,
-                                   htons(ti->port),
-                                   OCTNET_CMD_VXLAN_PORT_DEL);
-}
-
 static int __liquidio_set_vf_mac(struct net_device *netdev, int vfidx,
                                 u8 *mac, bool is_admin_assigned)
 {
@@ -3208,8 +3213,8 @@ static const struct net_device_ops lionetdevops = {
        .ndo_do_ioctl           = liquidio_ioctl,
        .ndo_fix_features       = liquidio_fix_features,
        .ndo_set_features       = liquidio_set_features,
-       .ndo_udp_tunnel_add     = liquidio_add_vxlan_port,
-       .ndo_udp_tunnel_del     = liquidio_del_vxlan_port,
+       .ndo_udp_tunnel_add     = udp_tunnel_nic_add_port,
+       .ndo_udp_tunnel_del     = udp_tunnel_nic_del_port,
        .ndo_set_vf_mac         = liquidio_set_vf_mac,
        .ndo_set_vf_vlan        = liquidio_set_vf_vlan,
        .ndo_get_vf_config      = liquidio_get_vf_config,
@@ -3564,6 +3569,8 @@ static int setup_nic_devices(struct octeon_device *octeon_dev)
                netdev->hw_enc_features = (lio->enc_dev_capability &
                                           ~NETIF_F_LRO);
 
+               netdev->udp_tunnel_nic_info = &liquidio_udp_tunnels;
+
                lio->dev_capability |= NETIF_F_GSO_UDP_TUNNEL;
 
                netdev->vlan_features = lio->dev_capability;