Merge ~smb/ubuntu/+source/iproute2:ubuntu/eoan-merge-5.2.0 into ubuntu/+source/iproute2:debian/sid

[Stefan Bader]

Rebased to debian/sid (5.2.0-1) resulting in no change of delta except dropping one patch we had pulled from 5.2 to fix a test regression. I deliberately left the commit adding this in the history for this merge to document that this had been in the last ubuntu upload and was dropped during the merge.

Test builds at: https://launchpad.net/~smb/+archive/ubuntu/eoan

[Christian Ehrhardt  (paelzer)]

you missed the tags for a merge, but I still have the old merge so that is fine for now

[Christian Ehrhardt  (paelzer)]

Drop error suppress - ok

The Fan patches have not been refreshed since last mereg, so you could this time drop this line:
- Refresh: Ubuntu Fan driver (V2/3/4) patches

Changelog/Version - ok

Overall LGTM +1

review: Approve

[Christian Ehrhardt  (paelzer)]

Checked, Tagged and Sponsored.
Please track proposed migration as usual

diff --git a/debian/changelog b/debian/changelog
index df82bc4..2e6cda4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+iproute2 (5.2.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian testing. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+    - Refresh: Ubuntu Fan driver (V2/3/4) patches
+  * Dropped changes:
+    - d/p/1005-lib-suppress-error-msg-when-filling-the-cache.patch
+      Already included upstream in 5.2.0.
+
+ -- Stefan Bader <[e-mail]>  Thu, 08 Aug 2019 11:18:17 +0200
+
 iproute2 (5.2.0-1) unstable; urgency=medium
 
   * Use /run/netns rather than /var/run/netns. Allows to manage namespaces
@@ -9,6 +27,34 @@ iproute2 (5.2.0-1) unstable; urgency=medium
 
  -- Luca Boccassi <[e-mail]>  Tue, 09 Jul 2019 20:52:47 +0100
 
+iproute2 (5.1.0-1ubuntu2) eoan; urgency=medium
+
+  * Add: d/p/1005-lib-suppress-error-msg-when-filling-the-cache.patch
+    Suppress meaningless error message during interface setup.
+
+ -- Stefan Bader <[e-mail]>  Wed, 10 Jul 2019 16:38:52 +0200
+
+iproute2 (5.1.0-1ubuntu1) eoan; urgency=medium
+
+  * Merge with Debian experimental. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - d/p/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - d/p/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - d/p/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+    - Refresh: Ubuntu Fan driver (V2/3/4) patches
+  * Dropped changes:
+    - d/p/1005-ubuntu-fix-testsuite-kenv.patch (upstream)
+    - d/p/1006-ubuntu-iprule-fix-output.patch (upstream
+    - d/p/ss-review-ssfilter.patch (upstream)
+    - Set debhelper dependency to >= 10 (upstream)
+    - Set compat level 10 (upstream)
+
+ -- Stefan Bader <[e-mail]>  Mon, 17 Jun 2019 11:15:33 +0200
+
 iproute2 (5.1.0-1) experimental; urgency=medium
 
   * Update upstream source from tag 'upstream/5.1.0'
@@ -81,6 +127,43 @@ iproute2 (4.18.0-2) unstable; urgency=medium
 
  -- Luca Boccassi <[e-mail]>  Tue, 28 Aug 2018 16:55:44 +0100
 
+iproute2 (4.18.0-1ubuntu3) eoan; urgency=medium
+
+  * d/p/ss-review-ssfilter.patch: fixed issue with ss and ssfilter
+    where ssfilter rejects single expressions if enclosed in
+    braces (LP: #1831775)
+
+ -- Rafael David Tinoco <[e-mail]>  Wed, 05 Jun 2019 21:26:00 -0300
+
+iproute2 (4.18.0-1ubuntu2) cosmic; urgency=low
+
+  * d/p/1006-ubuntu-iprule-fix-output.patch
+    Fix destination prefix output of "ip rule show" (LP: #1789431).
+
+ -- Stefan Bader <[e-mail]>  Tue, 28 Aug 2018 16:38:47 +0200
+
+iproute2 (4.18.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Add: Ubuntu Fan driver (V2/3/4) patches
+      - debian/patches/1000-ubuntu-poc-fan-driver.patch
+        Ubuntu FAN driver support V2 (LP 1439706)
+      - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+        Ubuntu FAN driver support V3 (LP 1470091)
+      - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+        Ubuntu FAN driver support VXLAN V4.
+    - Drop: debian/patches/0001-Add-moo-feature.patch
+    - set compat level 10 (no further changes needed)
+    - Refresh: Ubuntu Fan driver (V2/3/4) patches
+      Patches updated to apply against upstream 4.18 release.
+  * Added changes:
+    - debian/patches/1005-ubuntu-fix-testsuite-kenv.patch
+      Fix testsuite failure if there are too many kernel config
+      options.
+    - Set debhelper dependency to >= 10 (no further changes needed)
+
+ -- Stefan Bader <[e-mail]>  Wed, 22 Aug 2018 09:54:04 +0200
+
 iproute2 (4.18.0-1) experimental; urgency=medium
 
   * Add Brazilian Portuguese translation for Debconf template. Thanks
@@ -111,6 +194,22 @@ iproute2 (4.17.0-1) experimental; urgency=medium
 
  -- Luca Boccassi <[e-mail]>  Sat, 09 Jun 2018 17:45:11 +0100
 
+iproute2 (4.16.0-4ubuntu1) cosmic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/patches/1000-ubuntu-poc-fan-driver.patch [refreshed]
+      Ubuntu FAN driver support V2 (LP 1439706)
+    - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch [refreshed]
+      Ubuntu FAN driver support V3 (LP 1470091)
+    - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch [refreshed]
+      Ubuntu FAN driver support VXLAN V4.
+    - drop debian/patches/0001-Add-moo-feature.patch
+    - set compat level 10 (no further changes needed)
+  * Dropped (upstream)
+    - d/p/netns-allow-negative-nsid: permit negative nsid using "auto".
+
+ -- Stefan Bader <[e-mail]>  Mon, 30 Jul 2018 16:55:35 +0200
+
 iproute2 (4.16.0-4) unstable; urgency=medium
 
   * Backport patch to fix regression in v6 automated parsing.
@@ -163,6 +262,32 @@ iproute2 (4.15.0-3) unstable; urgency=medium
 
  -- Luca Boccassi <[e-mail]>  Mon, 12 Mar 2018 22:46:24 +0000
 
+iproute2 (4.15.0-2ubuntu1) bionic; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - debian/patches/1000-ubuntu-poc-fan-driver.patch
+      Ubuntu FAN driver support V2 (LP 1439706)
+    - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+      Ubuntu FAN driver support V3 (LP 1470091)
+    - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+      Ubuntu FAN driver support VXLAN V4
+    - drop debian/patches/0001-Add-moo-feature.patch
+    - set compat level 10 (no further changes needed)
+    - Add: d/p/netns-allow-negative-nsid: permit negative nsid using "auto"
+  * Dropped changes (in Debian):
+    - follow upstream dropping the old ip documentation (of 1999)
+    - d/rules: consider DEB_*_GNU_TYPE from env
+    - d/control: bump debhelper dependency and Standards-Version
+    - drop 0003-fix-segfault-with-iptables-1.6.patch (upstream)
+    - d/control: fix lintian priority-extra-is-replaced-by-priority-optional
+    - d/t/control: d/t/testsuite.sh: add iproute2 testsuite as autopkgtest
+  * Dropped changes (upstream):
+    - d/p/fix-testsuite-broken-pipes.patch: avoid broken pipe errors in tests
+  * Added changes:
+   - Refresh: d/p/*ubuntu-poc-fan-driver*.patch to latest upstream
+
+ -- Stefan Bader <[e-mail]>  Mon, 26 Feb 2018 16:21:30 +0100
+
 iproute2 (4.15.0-2) unstable; urgency=medium
 
   * Update upstream git repository URL. (Closes: #888804)
@@ -213,6 +338,58 @@ iproute2 (4.14.1-1) unstable; urgency=medium
 
  -- Luca Boccassi <[e-mail]>  Sat, 23 Dec 2017 14:55:10 +0100
 
+iproute2 (4.14.1-0ubuntu3) bionic; urgency=medium
+
+  [ Christian Brauner ]
+  * d/p/netns-allow-negative-nsid: permit negative nsid using "auto".
+
+ -- Robie Basak <[e-mail]>  Thu, 15 Feb 2018 15:03:56 +0000
+
+iproute2 (4.14.1-0ubuntu2) bionic; urgency=medium
+
+  * d/p/1002-ubuntu-poc-fan-driver-vxlan.patch: update to fix fan-map
+    processing in vxlan_parse_opt in new version of iproute2.
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 11 Dec 2017 12:13:50 +0100
+
+iproute2 (4.14.1-0ubuntu1) bionic; urgency=medium
+
+  [ Christian Ehrhardt ]
+  * Merge from Debian unstable AND latest upstream (LP: #1726730)
+    (LP: #1735032). Remaining changes:
+    - debian/patches/1000-ubuntu-poc-fan-driver.patch
+      Ubuntu FAN driver support V2 (LP 1439706)
+    - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+      Ubuntu FAN driver support V3 (LP 1470091)
+    - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+      Ubuntu FAN driver support VXLAN V4.
+  * Dropped changes (upstream now)
+    - Fix ip maddr show (LP 1732032):
+      - d/p/1003-ip-maddr-fix-igmp-parsing.patch: fix igmp parsing when iface is
+        long
+      - d/p/1004-ip-maddr-avoid-uninitialized-data.patch: avoid accessing
+        uninitialized data
+      - d/p/1005-ip-maddr-fix-filtering-by-device.patch: fix filtering
+        by device
+    - d/p/1006-fix-undeclared-UINT16_MAX.patch: FTBFS: tc: include stdint.h
+      explicitly for UINT16_MAX (LP 1735158)
+  * Added changes
+    - drop 0003-fix-segfault-with-iptables-1.6.patch (upstream)
+    - update d/p/*ubuntu-poc-fan-driver*.patch to latest upstream
+    - d/control: fix lintian priority-extra-is-replaced-by-priority-optional
+    - d/t/control: d/t/testsuite.sh: add iproute2 testsuite as autopkgtest
+    - d/p/fix-testsuite-broken-pipes.patch: avoid broken pipe errors in tests
+
+  [ Julian Wollrath <[e-mail]> ]
+  * Added changes based on suggested 4.14.1-0 changes for Debian in bug 879854
+    - dropped d/p/0001-Add-moo-feature.patch (isn't needed)
+    - follow upstream dropping the old ip documentation (of 1999)
+    - d/rules: consider DEB_*_GNU_TYPE from env
+    - d/control: bump debhelper dependency and Standards-Version
+    - set compat level 10 (no further changes needed)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 30 Nov 2017 14:17:25 +0100
+
 iproute2 (4.13.0-1) unstable; urgency=medium
 
   * Merge tag 'upstream/4.13.0' (Closes: #879854)
@@ -243,6 +420,44 @@ iproute2 (4.9.0-2) unstable; urgency=medium
 
  -- Andreas Henriksson <[e-mail]>  Thu, 14 Sep 2017 11:01:46 +0200
 
+iproute2 (4.9.0-1ubuntu3) bionic; urgency=medium
+
+  * Fix ip maddr show (LP: #1732032):
+    - d/p/1003-ip-maddr-fix-igmp-parsing.patch: fix igmp parsing when iface is
+      long
+    - d/p/1004-ip-maddr-avoid-uninitialized-data.patch: avoid accessing
+      uninitialized data
+    - d/p/1005-ip-maddr-fix-filtering-by-device.patch: fix filtering
+      by device
+  * d/p/1006-fix-undeclared-UINT16_MAX.patch: FTBFS: tc: include stdint.h
+    explicitly for UINT16_MAX (LP: #1735158)
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 29 Nov 2017 09:35:46 -0200
+
+iproute2 (4.9.0-1ubuntu2) artful; urgency=medium
+
+  * No-change rebuild against latest iptables
+
+ -- Jeremy Bicha <[e-mail]>  Sun, 18 Jun 2017 23:59:24 -0400
+
+iproute2 (4.9.0-1ubuntu1) zesty; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+   - debian/patches/1000-ubuntu-poc-fan-driver.patch
+     Ubuntu FAN driver support V2 (LP: #1439706)
+   - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+     Ubuntu FAN driver support V3 (LP: #1470091)
+   - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+     Ubuntu FAN driver support VXLAN V4.
+  * Drop the following, fixed in debian:
+   - d/p/1003-fix-variable-in-libnetlink.patch (LP: #1522371)
+   - Add TIPC support (LP: #1508225):
+      - d/control: add libmnl-dev to BDs, to include TIPC support.
+      - d/iproute2.install: add tipc binary.
+  * Rebased FAN quilt patches on to latest upstream code.
+
+ -- Jon Grimm <[e-mail]>  Fri, 10 Feb 2017 14:15:55 -0600
+
 iproute2 (4.9.0-1) unstable; urgency=medium
 
   * New upstream release, tested by Julian Wollrath.
@@ -307,6 +522,34 @@ iproute2 (4.6.0-1) unstable; urgency=medium
 
  -- Andreas Henriksson <[e-mail]>  Sat, 09 Jul 2016 13:17:22 +0200
 
+iproute2 (4.3.0-1ubuntu3) xenial; urgency=medium
+
+  * Add d/p/1003-fix-variable-in-libnetlink.patch (LP: #1522371), fix a variable name
+    collision issuing a segfault; from upstream.
+  * Add TIPC support (LP: #1508225):
+    - d/control: add libmnl-dev to BDs, to include TIPC support.
+    - d/iproute2.install: add tipc binary.
+
+ -- Pierre-André MOREY <[e-mail]>  Tue, 05 Apr 2016 09:43:44 +0200
+
+iproute2 (4.3.0-1ubuntu2) xenial; urgency=medium
+
+  * No-change rebuild for new iptables.
+
+ -- Matthias Klose <[e-mail]>  Sun, 21 Feb 2016 20:00:55 +0100
+
+iproute2 (4.3.0-1ubuntu1) xenial; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+   - debian/patches/1000-ubuntu-poc-fan-driver.patch
+     Ubuntu FAN driver support V2 (LP: #1439706)
+   - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+     Ubuntu FAN driver support V3 (LP: #1470091)
+   - debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+     Ubuntu FAN driver support VXLAN V4.
+
+ -- Andy Whitcroft <[e-mail]>  Tue, 22 Dec 2015 09:32:32 +0000
+
 iproute2 (4.3.0-1) unstable; urgency=medium
 
   * Add debian/gbp.conf
@@ -318,6 +561,23 @@ iproute2 (4.3.0-1) unstable; urgency=medium
 
  -- Andreas Henriksson <[e-mail]>  Thu, 26 Nov 2015 18:34:59 +0100
 
+iproute2 (4.1.1-1ubuntu2) xenial; urgency=low
+
+  * debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
+    Ubuntu FAN drvier support VXLAN V4.
+
+ -- Andy Whitcroft <[e-mail]>  Tue, 17 Nov 2015 13:29:03 +0000
+
+iproute2 (4.1.1-1ubuntu1) wily; urgency=medium
+
+  * Merge with Debian, remaining changes (LP: #1448800):
+   - debian/patches/1000-ubuntu-poc-fan-driver.patch
+     Ubuntu FAN driver support V2 (LP: #1439706)
+   - debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
+     Ubuntu FAN driver support V3 (LP: #1470091)
+
+ -- Andy Whitcroft <[e-mail]>  Wed, 19 Aug 2015 09:59:35 +0100
+
 iproute2 (4.1.1-1) unstable; urgency=medium
 
   * [be9f298] Imported Upstream version 4.1.1
@@ -334,6 +594,18 @@ iproute2 (4.0.0-1) unstable; urgency=medium
 
  -- Alexander Wirt <[e-mail]>  Wed, 24 Jun 2015 10:01:45 +0200
 
+iproute2 (3.16.0-2ubuntu2) wily; urgency=low
+
+  * Update Ubuntu FAN support to V3.  (LP: #1470091)
+
+ -- Andy Whitcroft <[e-mail]>  Mon, 29 Jun 2015 16:59:24 +0100
+
+iproute2 (3.16.0-2ubuntu1) vivid; urgency=low
+
+  * Add Ubuntu FAN support.  (LP: #1439706)
+
+ -- Andy Whitcroft <[e-mail]>  Tue, 24 Feb 2015 14:45:19 +0000
+
 iproute2 (3.16.0-2) unstable; urgency=medium
 
   * Cherry-pick upstream commit f1b66ff8
@@ -1453,6 +1725,3 @@ iproute (961225-1) unstable; urgency=low
 
  -- Tom Lees <[e-mail]>  Mon, 30 Dec 1996 11:12:23 +0000
 
-Local variables:
-mode: debian-changelog
-End:
diff --git a/debian/control b/debian/control
index c042a1b..e24afa8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: iproute2
 Section: net
 Priority: optional
-Maintainer: Alexander Wirt <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Alexander Wirt <[e-mail]>
 Uploaders: Luca Boccassi <[e-mail]>
 Homepage: https://wiki.linuxfoundation.org/networking/iproute2
 Vcs-Browser: https://salsa.debian.org/debian/iproute2.git
diff --git a/debian/patches/0001-Add-moo-feature.patch b/debian/patches/0001-Add-moo-feature.patch
deleted file mode 100644
index b046590..0000000
--- a/debian/patches/0001-Add-moo-feature.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Alexander Wirt <[e-mail]>
-Date: Mon, 10 Jun 2013 11:47:00 +0200
-Subject: Add moo feature
-
----
- ip/ip.c |   15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/ip/ip.c
-+++ b/ip/ip.c
-@@ -69,6 +69,20 @@ static int do_help(int argc, char **argv
- 	return 0;
- }
- 
-+static int do_moo(int argc, char **argv)
-+{
-+	
-+fprintf(stderr,
-+"\n"
-+" _ __ ___   ___   ___\n"
-+"| '_ ` _ \\ / _ \\ / _ \\\n"
-+"| | | | | | (_) | (_) |\n"
-+"|_| |_| |_|\\___/ \\___/\n"
-+"\n\n"
-+"P.S. no real cows were harmed for this moo\n");
-+	exit(1);
-+}
-+                       
- static const struct cmd {
- 	const char *cmd;
- 	int (*func)(int argc, char **argv);
-@@ -103,6 +117,7 @@ static const struct cmd {
- 	{ "vrf",	do_ipvrf},
- 	{ "sr",		do_seg6 },
- 	{ "help",	do_help },
-+	{ "moo",	do_moo }, 
- 	{ 0 }
- };
- 
diff --git a/debian/patches/1000-ubuntu-poc-fan-driver.patch b/debian/patches/1000-ubuntu-poc-fan-driver.patch
new file mode 100644
index 0000000..f3aaec2
--- /dev/null
+++ b/debian/patches/1000-ubuntu-poc-fan-driver.patch
@@ -0,0 +1,74 @@
+Description: POC fan driver support
+ POC Fan driver support
+Author: Jay Vosburgh <[e-mail]>
+
+Index: iproute2/ip/link_iptnl.c
+===================================================================
+--- iproute2.orig/ip/link_iptnl.c
++++ iproute2/ip/link_iptnl.c
+@@ -91,6 +91,7 @@ static int iptunnel_parse_opt(struct lin
+ 	struct rtattr *iptuninfo[IFLA_IPTUN_MAX + 1];
+ 	int len;
+ 	inet_prefix saddr, daddr, ip6rdprefix, ip6rdrelayprefix;
++	inet_prefix underlay;
+ 	__u8 pmtudisc = 1;
+ 	__u8 tos = 0;
+ 	__u16 iflags = 0;
+@@ -106,6 +107,7 @@ static int iptunnel_parse_opt(struct lin
+ 
+ 	inet_prefix_reset(&saddr);
+ 	inet_prefix_reset(&daddr);
++	inet_prefix_reset(&underlay);
+ 
+ 	inet_prefix_reset(&ip6rdprefix);
+ 	inet_prefix_reset(&ip6rdrelayprefix);
+@@ -219,6 +221,9 @@ get_failed:
+ 		} else if (strcmp(*argv, "remote") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&daddr, *argv, AF_INET);
++		} else if (strcmp(*argv, "underlay") == 0) {
++			NEXT_ARG();
++			get_addr(&underlay, *argv, AF_INET);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&saddr, *argv, AF_INET);
+@@ -360,6 +365,10 @@ get_failed:
+ 		}
+ 	}
+ 
++	if (is_addrtype_inet(&underlay))
++		addattr_l(n, 1024, IFLA_IPTUN_FAN_UNDERLAY,
++			  underlay.data, underlay.bytelen);
++
+ 	return 0;
+ }
+ 
+@@ -398,6 +407,14 @@ static void iptunnel_print_opt(struct li
+ 	tnl_print_endpoint("remote", tb[IFLA_IPTUN_REMOTE], AF_INET);
+ 	tnl_print_endpoint("local", tb[IFLA_IPTUN_LOCAL], AF_INET);
+ 
++	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {
++		inet_prefix addr;
++
++		if(!get_addr_rta(&addr, tb[IFLA_IPTUN_FAN_UNDERLAY], AF_INET))
++			print_string(PRINT_ANY, "underlay",  "underlay %s ",
++				format_host(AF_INET, addr.bytelen, addr.data));
++	}
++
+ 	if (tb[IFLA_IPTUN_LINK]) {
+ 		__u32 link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 
+Index: iproute2/include/uapi/linux/if_tunnel.h
+===================================================================
+--- iproute2.orig/include/uapi/linux/if_tunnel.h
++++ iproute2/include/uapi/linux/if_tunnel.h
+@@ -77,6 +77,9 @@ enum {
+ 	IFLA_IPTUN_ENCAP_DPORT,
+ 	IFLA_IPTUN_COLLECT_METADATA,
+ 	IFLA_IPTUN_FWMARK,
++
++	IFLA_IPTUN_FAN_UNDERLAY = 32,
++
+ 	__IFLA_IPTUN_MAX,
+ };
+ #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)
diff --git a/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch b/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
new file mode 100644
index 0000000..d12b88e
--- /dev/null
+++ b/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
@@ -0,0 +1,134 @@
+Description: Fan driver support v3
+ Fan driver support v3
+Author: Jay Vosburgh <[e-mail]>
+Index: iproute2/include/uapi/linux/if_tunnel.h
+===================================================================
+--- iproute2.orig/include/uapi/linux/if_tunnel.h
++++ iproute2/include/uapi/linux/if_tunnel.h
+@@ -79,6 +79,7 @@ enum {
+ 	IFLA_IPTUN_FWMARK,
+ 
+ 	IFLA_IPTUN_FAN_UNDERLAY = 32,
++	IFLA_IPTUN_FAN_MAP = 33,
+ 
+ 	__IFLA_IPTUN_MAX,
+ };
+@@ -164,6 +165,21 @@ enum {
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
+ 
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32          underlay;
++	__be32          overlay;
++	__u16           underlay_prefix;
++	__u16           overlay_prefix;
++};
++
+ #define TUNNEL_CSUM		__cpu_to_be16(0x01)
+ #define TUNNEL_ROUTING		__cpu_to_be16(0x02)
+ #define TUNNEL_KEY		__cpu_to_be16(0x04)
+Index: iproute2/ip/link_iptnl.c
+===================================================================
+--- iproute2.orig/ip/link_iptnl.c
++++ iproute2/ip/link_iptnl.c
+@@ -70,6 +70,42 @@ static void iptunnel_print_help(struct l
+ 		"       MARK := { 0x0..0xffffffff }\n"
+ 	);
+ }
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ip_tunnel_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon)
++			break;
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
+ 
+ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			      struct nlmsghdr *n)
+@@ -224,6 +260,10 @@ get_failed:
+ 		} else if (strcmp(*argv, "underlay") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&underlay, *argv, AF_INET);
++		} else if (strcmp(*argv, "fan-map") == 0) {
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			get_addr(&saddr, *argv, AF_INET);
+@@ -372,6 +412,28 @@ get_failed:
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ip_tunnel_fan_map *m;
++	struct rtattr *i;
++	int rem;
++	int p;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		p = RTA_PAYLOAD(i);
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	char s2[64];
+@@ -415,6 +477,9 @@ static void iptunnel_print_opt(struct li
+ 				format_host(AF_INET, addr.bytelen, addr.data));
+ 	}
+ 
++	if (tb[IFLA_IPTUN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
++
+ 	if (tb[IFLA_IPTUN_LINK]) {
+ 		__u32 link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 
diff --git a/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch b/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
new file mode 100644
index 0000000..b5b3b0c
--- /dev/null
+++ b/debian/patches/1002-ubuntu-poc-fan-driver-vxlan.patch
@@ -0,0 +1,178 @@
+Description: Fan driver support VXLAN (p4)
+ Fan driver setup support for vxlan interfaces.
+
+Index: iproute2/include/uapi/linux/if_tunnel.h
+===================================================================
+--- iproute2.orig/include/uapi/linux/if_tunnel.h
++++ iproute2/include/uapi/linux/if_tunnel.h
+@@ -173,7 +173,7 @@ enum {
+ 
+ #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
+ 
+-struct ip_tunnel_fan_map {
++struct ifla_fan_map {
+ 	__be32          underlay;
+ 	__be32          overlay;
+ 	__u16           underlay_prefix;
+Index: iproute2/ip/iplink_vxlan.c
+===================================================================
+--- iproute2.orig/ip/iplink_vxlan.c
++++ iproute2/ip/iplink_vxlan.c
+@@ -15,7 +15,10 @@
+ #include <net/if.h>
+ #include <linux/ip.h>
+ #include <linux/if_link.h>
++#include <linux/types.h>
+ #include <arpa/inet.h>
++#include <linux/in6.h>
++#include <linux/if_tunnel.h>
+ 
+ #include "rt_names.h"
+ #include "utils.h"
+@@ -73,6 +76,45 @@ static void check_duparg(__u64 *attrs, i
+ 	duparg2(key, argv);
+ }
+ 
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ifla_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon) {
++			PREV_ARG();
++			break;
++		}
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
++
+ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			  struct nlmsghdr *n)
+ {
+@@ -330,6 +372,11 @@ static int vxlan_parse_opt(struct link_u
+ 		} else if (!matches(*argv, "gpe")) {
+ 			check_duparg(&attrs, IFLA_VXLAN_GPE, *argv, *argv);
+ 			addattr_l(n, 1024, IFLA_VXLAN_GPE, NULL, 0);
++		} else if (!matches(*argv, "fan-map")) {
++			check_duparg(&attrs, IFLA_VXLAN_FAN_MAP, *argv, *argv);
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (matches(*argv, "help") == 0) {
+ 			explain();
+ 			return -1;
+@@ -406,6 +453,28 @@ static int vxlan_parse_opt(struct link_u
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ifla_fan_map *m;
++	struct rtattr *i;
++	int rem;
++	int p;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		p = RTA_PAYLOAD(i);
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	__u32 vni;
+@@ -466,6 +535,9 @@ static void vxlan_print_opt(struct link_
+ 		}
+ 	}
+ 
++	if (tb[IFLA_VXLAN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]);
++
+ 	if (tb[IFLA_VXLAN_LOCAL]) {
+ 		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);
+ 
+Index: iproute2/ip/link_iptnl.c
+===================================================================
+--- iproute2.orig/ip/link_iptnl.c
++++ iproute2/ip/link_iptnl.c
+@@ -70,10 +70,11 @@ static void iptunnel_print_help(struct l
+ 		"       MARK := { 0x0..0xffffffff }\n"
+ 	);
+ }
++
+ static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
+ {
+ 	inet_prefix underlay, overlay;
+-	struct ip_tunnel_fan_map map;
++	struct ifla_fan_map map;
+ 	struct rtattr *nest;
+ 	char **argv = *argvp;
+ 	int argc = *argcp;
+@@ -82,8 +83,10 @@ static int fan_parse_map(int *argcp, cha
+ 	while (argc > 0) {
+ 		char *colon = strchr(*argv, ':');
+ 
+-		if (!colon)
++		if (!colon) {
++			PREV_ARG();
+ 			break;
++		}
+ 		*colon = '\0';
+ 
+ 		if (get_prefix(&overlay, *argv, AF_INET))
+@@ -415,7 +418,7 @@ get_failed:
+ static void fan_print_map(FILE *f, struct rtattr *attr)
+ {
+ 	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
+-	struct ip_tunnel_fan_map *m;
++	struct ifla_fan_map *m;
+ 	struct rtattr *i;
+ 	int rem;
+ 	int p;
+Index: iproute2/include/uapi/linux/if_link.h
+===================================================================
+--- iproute2.orig/include/uapi/linux/if_link.h
++++ iproute2/include/uapi/linux/if_link.h
+@@ -533,6 +533,7 @@ enum {
+ 	IFLA_VXLAN_GPE,
+ 	IFLA_VXLAN_TTL_INHERIT,
+ 	IFLA_VXLAN_DF,
++	IFLA_VXLAN_FAN_MAP = 33,
+ 	__IFLA_VXLAN_MAX
+ };
+ #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)
diff --git a/debian/patches/series b/debian/patches/series
index 7616c7e..3ef0f04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,8 @@
-0001-Add-moo-feature.patch
 0004-sync-iptables-header.patch
+
+
+
+1000-ubuntu-poc-fan-driver.patch
+1001-ubuntu-poc-fan-driver-v3.patch
+1002-ubuntu-poc-fan-driver-vxlan.patch
+