Merge pull request #149 from pguibert6WIND/frr_6wind_stringify

issue #142 / pull request to provide mac address stringification

diff --cc bgpd/rfapi/rfapi_vty.c
Simple merge

diff --cc lib/prefix.c
Simple merge

diff --cc lib/prefix.h
index eb69e98f044e0cd0304b18e3507d9c9618da3089,cb0cfd2d45c778669a3c6c71b9084c00f7fdf3d3..56adce5eabfe277d0d0690f7a198275f25378647
--- 1/lib/prefix.h
--- 2/lib/prefix.h
+++ b/lib/prefix.h
@@@ -281,8 -286,12 +286,11 @@@ extern void apply_mask_ipv6 (struct pre
  extern int ip6_masklen (struct in6_addr);
  extern void masklen2ip6 (const int, struct in6_addr *);
  
 -extern void str2in6_addr (const char *, struct in6_addr *);
  extern const char *inet6_ntoa (struct in6_addr);
  
+ extern int prefix_str2mac(const char *str, struct ethaddr *mac);
+ extern char *prefix_mac2str(const struct ethaddr *mac, char *buf, int size);
+ 
  static inline int ipv6_martian (struct in6_addr *addr)
  {
    struct in6_addr localhost_addr;