summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2014-10-29 14:01:07 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:20:34 +0000
commit4f2873c8567738310f7e86c633c6da759554b21a (patch)
tree64cd4326f5a43526a9ff18e14081ab4dc48e6481
parent8c6158d7bcca2ecf3e150d1e8eaaaa4ece58e1e2 (diff)
downloadopenembedded-core-contrib-4f2873c8567738310f7e86c633c6da759554b21a.tar.gz
openembedded-core-contrib-4f2873c8567738310f7e86c633c6da759554b21a.tar.bz2
openembedded-core-contrib-4f2873c8567738310f7e86c633c6da759554b21a.zip
iproute2: backport a patch to make adding vxlan link success
If without this patch: $ ip link add vxlan0 type vxlan id 51 group 238.1.1.1 dev eth0 Error: argument "vxlan0" is wrong: Unknown device $ With this patch; $ ip link add vxlan0 type vxlan id 51 group 238.1.1.1 dev eth0 $ ifconfig -a |grep vxlan0 vxlan0 Link encap:Ethernet HWaddr da:61:56:2e:c2:20 $ Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch35
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb1
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch
new file mode 100644
index 0000000000..0305a7065b
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch
@@ -0,0 +1,35 @@
+From 38790ccf7bd0e6eab78024ec381fd98d7c6a2782 Mon Sep 17 00:00:00 2001
+From: vadimk <vadim4j@gmail.com>
+Date: Sat, 30 Aug 2014 15:06:00 +0300
+Subject: [PATCH] ip link: Remove unnecessary device checking
+
+The real checking is performed later in iplink_modify(..) func which
+checks device existence if NLM_F_CREATE flag is set.
+
+Also it fixes the case when impossible to add veth link which was
+caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate)
+because these devices are not exist yet.
+
+Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
+Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
+Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
+---
+ ip/iplink.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/ip/iplink.c b/ip/iplink.c
+index 1a907d9..ea06871 100644
+--- a/ip/iplink.c
++++ b/ip/iplink.c
+@@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
+ duparg2("dev", *argv);
+ *dev = *argv;
+ dev_index = ll_name_to_index(*dev);
+- if (dev_index == 0)
+- invarg("Unknown device", *argv);
+ }
+ argc--; argv++;
+ }
+--
+1.7.10.4
+
diff --git a/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb b/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb
index b1a68f2419..39fe9c83b8 100644
--- a/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb
+++ b/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb
@@ -3,6 +3,7 @@ require iproute2.inc
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://configure-cross.patch \
file://0001-iproute2-de-bash-scripts.patch \
+ file://0001-ip-link-Remove-unnecessary-device-checking.patch \
"
SRC_URI[md5sum] = "6c823b40fdcfa7b8120743349a52ac18"
SRC_URI[sha256sum] = "1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79"