vty_cli_cmds/cfg: drop local knowledge of MTU and delegate to libtap

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

diff --git a/cfg.h b/cfg.h
index 5b6ebdc13911fb31c40a1d9a4f305eeefcd645f5..61e6098543bf010c7850b65aa17870cdc4506dec 100644 (file)
--- a/cfg.h
+++ b/cfg.h
@@ -18,8 +18,6 @@ struct knet_cfg_eth {
        knet_tap_t knet_tap;
        char name[IFNAMSIZ];
        uint8_t node_id;
-       int mtu;
-       int default_mtu;
        struct knet_cfg_ip *knet_ip;
 };
 

diff --git a/vty_cli_cmds.c b/vty_cli_cmds.c
index 83bf8a8945f0917e0fd62d465e83e56b0f0bf83b..eb08ea76c6a52facbb90ff146f9a5fe3e2109f27 100644 (file)
--- a/vty_cli_cmds.c
+++ b/vty_cli_cmds.c
@@ -994,14 +994,12 @@ static int knet_cmd_no_mtu(struct knet_vty *vty)
 {
        struct knet_cfg *knet_iface = (struct knet_cfg *)vty->iface;
 
-       if (knet_tap_set_mtu(knet_iface->cfg_eth.knet_tap, knet_iface->cfg_eth.default_mtu) < 0) {
-               knet_vty_write(vty, "Error: Unable to set default mtu %d on device %s%s",
-                                knet_iface->cfg_eth.default_mtu, knet_iface->cfg_eth.name, telnet_newline);
+       if (knet_tap_reset_mtu(knet_iface->cfg_eth.knet_tap) < 0) {
+               knet_vty_write(vty, "Error: Unable to set default mtu on device %s%s",
+                               knet_iface->cfg_eth.name, telnet_newline);
                                return -1;
        }
 
-       knet_iface->cfg_eth.mtu = knet_iface->cfg_eth.default_mtu;
-
        return 0;
 }
 
@@ -1020,8 +1018,6 @@ static int knet_cmd_mtu(struct knet_vty *vty)
                                return -1;
        }
 
-       knet_iface->cfg_eth.mtu = expected_mtu;
-
        return 0;
 }
 
@@ -1211,15 +1207,6 @@ knet_found:
                goto out_clean;
        }
 
-       knet_iface->cfg_eth.default_mtu = knet_tap_get_mtu(knet_iface->cfg_eth.knet_tap);
-       if (knet_iface->cfg_eth.default_mtu < 0) {
-               knet_vty_write(vty, "Error: Unable to get current MTU on device %s%s",
-                               device, telnet_newline);
-               err = -1;
-               goto out_clean;
-       }
-       knet_iface->cfg_eth.mtu = knet_iface->cfg_eth.default_mtu;
-
 out_found:
 
        vty->node = NODE_INTERFACE;
@@ -1261,8 +1248,7 @@ static int knet_cmd_print_conf(struct knet_vty *vty)
 
                knet_vty_write(vty, " interface %s %d%s", knet_iface->cfg_eth.name, knet_iface->cfg_eth.node_id, nl);
 
-               if (knet_iface->cfg_eth.mtu != knet_iface->cfg_eth.default_mtu)
-                        knet_vty_write(vty, "  mtu %d%s", knet_iface->cfg_eth.mtu, nl);
+               knet_vty_write(vty, "  mtu %d%s", knet_tap_get_mtu(knet_iface->cfg_eth.knet_tap), nl);
 
                while (knet_ip != NULL) {
                        knet_vty_write(vty, "  ip %s %s%s", knet_ip->ipaddr, knet_ip->prefix, nl);