vxlan: remove redundant enable/disable API from vxlan

The enable/disable API is redundant and increases the library
in binary size and documentation. There should be one sensible way
to do something, not several.

Yes, there is prior act to that like rtnl_link_vxlan_disable_proxy().
That doesn't mean it should be repeated.

diff --git a/include/netlink/route/link/vxlan.h b/include/netlink/route/link/vxlan.h
index 40ce623e529050869e8ca5f9025ba5218178e1ec..b3fb15a9e8492f7bad62548a8b0beab12a5aede6 100644 (file)
--- a/include/netlink/route/link/vxlan.h
+++ b/include/netlink/route/link/vxlan.h
@@ -84,51 +84,33 @@ extern int  rtnl_link_vxlan_get_port(struct rtnl_link *, uint32_t *);
 
 extern int     rtnl_link_vxlan_set_udp_csum(struct rtnl_link *, uint8_t);
 extern int     rtnl_link_vxlan_get_udp_csum(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_udp_csum(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_udp_csum(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_udp_zero_csum6_tx(struct rtnl_link *, uint8_t);
 extern int     rtnl_link_vxlan_get_udp_zero_csum6_tx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_udp_zero_csum6_tx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_udp_zero_csum6_tx(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_udp_zero_csum6_rx(struct rtnl_link *, uint8_t);
 extern int     rtnl_link_vxlan_get_udp_zero_csum6_rx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_udp_zero_csum6_rx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_udp_zero_csum6_rx(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_remcsum_tx(struct rtnl_link *, uint8_t);
 extern int     rtnl_link_vxlan_get_remcsum_tx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_remcsum_tx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_remcsum_tx(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_remcsum_rx(struct rtnl_link *, uint8_t);
 extern int     rtnl_link_vxlan_get_remcsum_rx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_remcsum_rx(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_remcsum_rx(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_gbp(struct rtnl_link *, int);
 extern int     rtnl_link_vxlan_get_gbp(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_gbp(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_gbp(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_remcsum_nopartial(struct rtnl_link *, int);
 extern int     rtnl_link_vxlan_get_remcsum_nopartial(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_remcsum_nopartial(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_remcsum_nopartial(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_collect_metadata(struct rtnl_link *, uint8_t);
 extern int     rtnl_link_vxlan_get_collect_metadata(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_collect_metadata(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_collect_metadata(struct rtnl_link *);
 
 extern int     rtnl_link_vxlan_set_label(struct rtnl_link *, uint32_t);
 extern int     rtnl_link_vxlan_get_label(struct rtnl_link *, uint32_t *);
 
 extern int     rtnl_link_vxlan_set_gpe(struct rtnl_link *, int);
 extern int     rtnl_link_vxlan_get_gpe(struct rtnl_link *);
-extern int     rtnl_link_vxlan_enable_gpe(struct rtnl_link *);
-extern int     rtnl_link_vxlan_disable_gpe(struct rtnl_link *);
 
 #ifdef __cplusplus
 }

diff --git a/lib/route/link/vxlan.c b/lib/route/link/vxlan.c
index 0028213e6b073bd45c3e1d555d761bdbd86f84b1..b7551d773ef8ff09af481b4d3048b77ba4a0cd1f 100644 (file)
--- a/lib/route/link/vxlan.c
+++ b/lib/route/link/vxlan.c
@@ -1515,28 +1515,6 @@ int rtnl_link_vxlan_get_udp_csum(struct rtnl_link *link)
        return vxi->vxi_udp_csum;
 }
 
-/**
- * Enable UDP checksums
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_udp_csum(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_udp_csum(link, 1);
-}
-
-/**
- * Disable UDP checksums
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_udp_csum(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_udp_csum(link, 0);
-}
-
 /**
  * Set skip UDP checksum transmitted over IPv6 status to use for VXLAN
  * @arg link           Link object
@@ -1574,28 +1552,6 @@ int rtnl_link_vxlan_get_udp_zero_csum6_tx(struct rtnl_link *link)
        return vxi->vxi_udp_zero_csum6_tx;
 }
 
-/**
- * Enable skip UDP checksum transmitted over IPv6
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_udp_zero_csum6_tx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_udp_zero_csum6_tx(link, 1);
-}
-
-/**
- * Disable skip UDP checksum transmitted over IPv6
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_udp_zero_csum6_tx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_udp_zero_csum6_tx(link, 0);
-}
-
 /**
  * Set skip UDP checksum received over IPv6 status to use for VXLAN
  * @arg link           Link object
@@ -1633,28 +1589,6 @@ int rtnl_link_vxlan_get_udp_zero_csum6_rx(struct rtnl_link *link)
        return vxi->vxi_udp_zero_csum6_rx;
 }
 
-/**
- * Enable skip UDP checksum received over IPv6
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_udp_zero_csum6_rx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_udp_zero_csum6_rx(link, 1);
-}
-
-/**
- * Disable skip UDP checksum received over IPv6
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_udp_zero_csum6_rx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_udp_zero_csum6_rx(link, 0);
-}
-
 /**
  * Set remote offload transmit checksum status to use for VXLAN
  * @arg link           Link object
@@ -1692,28 +1626,6 @@ int rtnl_link_vxlan_get_remcsum_tx(struct rtnl_link *link)
        return vxi->vxi_remcsum_tx;
 }
 
-/**
- * Enable remote offload transmit checksums
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_remcsum_tx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_remcsum_tx(link, 1);
-}
-
-/**
- * Disable remote offload transmit checksums
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_remcsum_tx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_remcsum_tx(link, 0);
-}
-
 /**
  * Set remote offload receive checksum status to use for VXLAN
  * @arg link           Link object
@@ -1751,28 +1663,6 @@ int rtnl_link_vxlan_get_remcsum_rx(struct rtnl_link *link)
        return vxi->vxi_remcsum_rx;
 }
 
-/**
- * Enable remote offload receive checksums
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_remcsum_rx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_remcsum_rx(link, 1);
-}
-
-/**
- * Disable remote offload receive checksums
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_remcsum_rx(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_remcsum_rx(link, 0);
-}
-
 /**
  * Set group-based policy extension flag to use for VXLAN
  * @arg link           Link object
@@ -1809,28 +1699,6 @@ int rtnl_link_vxlan_get_gbp(struct rtnl_link *link)
        return !!(vxi->ce_mask & VXLAN_ATTR_GBP);
 }
 
-/**
- * Enable group-based policy extension
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_gbp(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_gbp(link, 1);
-}
-
-/**
- * Disable group-based policy extension
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_gbp(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_gbp(link, 0);
-}
-
 /**
  * Set no-partial remote offload checksum flag to use for VXLAN
  * @arg link           Link object
@@ -1867,28 +1735,6 @@ int rtnl_link_vxlan_get_remcsum_nopartial(struct rtnl_link *link)
        return !!(vxi->ce_mask & VXLAN_ATTR_REMCSUM_NOPARTIAL);
 }
 
-/**
- * Enable no-partial remote offload checksum
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_remcsum_nopartial(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_remcsum_nopartial(link, 1);
-}
-
-/**
- * Disable no-partial remote offload checksum
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_remcsum_nopartial(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_remcsum_nopartial(link, 0);
-}
-
 /**
  * Set collect metadata status to use for VXLAN
  * @arg link           Link object
@@ -1926,28 +1772,6 @@ int rtnl_link_vxlan_get_collect_metadata(struct rtnl_link *link)
        return vxi->vxi_collect_metadata;
 }
 
-/**
- * Enable collect metadata
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_collect_metadata(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_collect_metadata(link, 1);
-}
-
-/**
- * Disable collect metadata
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_collect_metadata(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_collect_metadata(link, 0);
-}
-
 /**
  * Set flow label to use for VXLAN
  * @arg link           Link object
@@ -2027,28 +1851,6 @@ int rtnl_link_vxlan_get_gpe(struct rtnl_link *link)
        return !!(vxi->ce_mask & VXLAN_ATTR_GPE);
 }
 
-/**
- * Enable generic protocol extension
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_enable_gpe(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_gpe(link, 1);
-}
-
-/**
- * Disable generic protocol extension
- * @arg link           Link object
- *
- * @return 0 on success or a negative error code
- */
-int rtnl_link_vxlan_disable_gpe(struct rtnl_link *link)
-{
-       return rtnl_link_vxlan_set_gpe(link, 0);
-}
-
 /** @} */
 
 static void __init vxlan_init(void)

diff --git a/libnl-route-3.sym b/libnl-route-3.sym
index 14e922f106d21e2227a4d2c0a9eafd7e274e0ca0..90dd9106f6b94fd7d90531b6c1930558d03bf383 100644 (file)
--- a/libnl-route-3.sym
+++ b/libnl-route-3.sym
@@ -964,24 +964,6 @@ global:
        rtnl_link_macvlan_macmode2str;
        rtnl_link_macvlan_set_macmode;
        rtnl_link_macvlan_str2macmode;
-       rtnl_link_vxlan_disable_collect_metadata;
-       rtnl_link_vxlan_disable_gbp;
-       rtnl_link_vxlan_disable_gpe;
-       rtnl_link_vxlan_disable_remcsum_nopartial;
-       rtnl_link_vxlan_disable_remcsum_rx;
-       rtnl_link_vxlan_disable_remcsum_tx;
-       rtnl_link_vxlan_disable_udp_csum;
-       rtnl_link_vxlan_disable_udp_zero_csum6_rx;
-       rtnl_link_vxlan_disable_udp_zero_csum6_tx;
-       rtnl_link_vxlan_enable_collect_metadata;
-       rtnl_link_vxlan_enable_gbp;
-       rtnl_link_vxlan_enable_gpe;
-       rtnl_link_vxlan_enable_remcsum_nopartial;
-       rtnl_link_vxlan_enable_remcsum_rx;
-       rtnl_link_vxlan_enable_remcsum_tx;
-       rtnl_link_vxlan_enable_udp_csum;
-       rtnl_link_vxlan_enable_udp_zero_csum6_rx;
-       rtnl_link_vxlan_enable_udp_zero_csum6_tx;
        rtnl_link_vxlan_get_collect_metadata;
        rtnl_link_vxlan_get_gbp;
        rtnl_link_vxlan_get_gpe;