From 6d78150380f069c4d4323159c5257d61e100a0a7 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Tue, 18 Aug 2015 03:16:06 -0700
Subject: [PATCH] rename Generic to GenericLink and add missing macvtap

---
 link.go       | 8 ++++----
 link_linux.go | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/link.go b/link.go
index ec3df82..664895f 100644
--- a/link.go
+++ b/link.go
@@ -137,18 +137,18 @@ func (veth *Veth) Type() string {
 	return "veth"
 }
 
-// Generic links represent types that are not currently understood
+// GenericLink links represent types that are not currently understood
 // by this netlink library.
-type Generic struct {
+type GenericLink struct {
 	LinkAttrs
 	LinkType string
 }
 
-func (generic *Generic) Attrs() *LinkAttrs {
+func (generic *GenericLink) Attrs() *LinkAttrs {
 	return &generic.LinkAttrs
 }
 
-func (generic *Generic) Type() string {
+func (generic *GenericLink) Type() string {
 	return generic.LinkType
 }
 
diff --git a/link_linux.go b/link_linux.go
index 5dafe4b..d3d467a 100644
--- a/link_linux.go
+++ b/link_linux.go
@@ -508,7 +508,7 @@ func linkDeserialize(m []byte) (Link, error) {
 					case "macvtap":
 						link = &Macvtap{}
 					default:
-						link = &Generic{LinkType: linkType}
+						link = &GenericLink{LinkType: linkType}
 					}
 				case nl.IFLA_INFO_DATA:
 					data, err := nl.ParseRouteAttr(info.Value)
@@ -522,7 +522,7 @@ func linkDeserialize(m []byte) (Link, error) {
 						parseVxlanData(link, data)
 					case "ipvlan":
 						parseIPVlanData(link, data)
-					case "macvlan":
+					case "macvlan", "macvtap":
 						parseMacvlanData(link, data)
 					}
 				}