From 42f621a6ea35ed7021146710cc4c8c1b482df7b5 Mon Sep 17 00:00:00 2001
From: Philippe Guibert <philippe.guibert@6wind.com>
Date: Fri, 3 Feb 2017 07:59:20 +0100
Subject: [PATCH] lib: replace AFI_ETHER reference with AFI_L2VPN

The introduction of AFI_L2VPN prefix makes usage of AFI_ETHER deprecated
and is of no usage currently. The latter define is linked to AFI_L2VPN.
For that, the prefix enumerate has the AFI_ETHER value removed.

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
---
 lib/plist.c  | 2 +-
 lib/prefix.c | 2 --
 lib/zebra.h  | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/plist.c b/lib/plist.c
index 4539d82972..9a2fc4af09 100644
--- a/lib/plist.c
+++ b/lib/plist.c
@@ -972,7 +972,7 @@ vty_prefix_list_install (struct vty *vty, afi_t afi, const char *name,
       apply_mask_ipv6 ((struct prefix_ipv6 *) &p_tmp);
 
       break;
-    case AFI_ETHER:
+    case AFI_L2VPN:
     default:
       vty_out (vty, "%% Unrecognized AFI (%d)%s", afi, VTY_NEWLINE);
       return CMD_WARNING;
diff --git a/lib/prefix.c b/lib/prefix.c
index bef28ff9ec..73af29ead3 100644
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -234,8 +234,6 @@ afi2str(afi_t afi)
 	return "IPv4";
     case AFI_IP6:
 	return "IPv6";
-    case AFI_ETHER:
-	return "ethernet";
     case AFI_L2VPN:
 	return "l2vpn";
     case AFI_MAX:
diff --git a/lib/zebra.h b/lib/zebra.h
index db6fcf93ad..760264d752 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -401,7 +401,6 @@ extern const char *zserv_command_string (unsigned int command);
 typedef enum {
   AFI_IP  = 1,
   AFI_IP6 = 2,
-  AFI_ETHER = 3,                /* RFC 1700 has "6" for 802.* */
   AFI_L2VPN = 4,
   AFI_MAX = 5
 } afi_t;