While implementing support for MACVLAN_FLAG_NOPROMISC, I realized how similar
iplink_macvlan.c and iplink_macvtap.c are and that the main differences (apart
from substituting "macvlan" for "macvtap") were fixes and enhancements which
weren't applied to both files. To prevent this in the future and to share
common code, this series merges the files. In addition, it implements support
for MACVLAN_FLAG_NOPROMISC and finally documents these interface types in
ip-link.8.in.

Phil Sutter (3):
  ip: link: consolidate macvlan and macvtap
  ip: macvlan: support MACVLAN_FLAG_NOPROMISC flag
  man: ip-link: document MACVLAN/MACVTAP interface types

 ip/Makefile           |   2 +-
 ip/iplink_macvlan.c   |  68 ++++++++++++++++++++++++--------
 ip/iplink_macvtap.c   | 105 --------------------------------------------------
 man/man8/ip-link.8.in |  50 ++++++++++++++++++++++++
 4 files changed, 104 insertions(+), 121 deletions(-)
 delete mode 100644 ip/iplink_macvtap.c

-- 
2.1.2

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to