diff options
author | Roy.Li <rongqing.li@windriver.com> | 2014-10-29 14:01:07 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:27:12 +0000 |
commit | 18f6c1219a8611ceca75372f2e88454bf60eaf16 (patch) | |
tree | 3d0d6241eee10964fdfa4db853dd807998b869fb | |
parent | 8e146975a35ab2fcc9b8f9084a6ecbd493c4a222 (diff) | |
download | poky-18f6c1219a8611ceca75372f2e88454bf60eaf16.tar.gz |
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
$
(From OE-Core rev: 4f2873c8567738310f7e86c633c6da759554b21a)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch | 35 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb | 1 |
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 @@ | |||
1 | From 38790ccf7bd0e6eab78024ec381fd98d7c6a2782 Mon Sep 17 00:00:00 2001 | ||
2 | From: vadimk <vadim4j@gmail.com> | ||
3 | Date: Sat, 30 Aug 2014 15:06:00 +0300 | ||
4 | Subject: [PATCH] ip link: Remove unnecessary device checking | ||
5 | |||
6 | The real checking is performed later in iplink_modify(..) func which | ||
7 | checks device existence if NLM_F_CREATE flag is set. | ||
8 | |||
9 | Also it fixes the case when impossible to add veth link which was | ||
10 | caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate) | ||
11 | because these devices are not exist yet. | ||
12 | |||
13 | Signed-off-by: Vadim Kochan <vadim4j@gmail.com> | ||
14 | Acked-by: Oliver Hartkopp <socketcan@hartkopp.net> | ||
15 | Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> | ||
16 | --- | ||
17 | ip/iplink.c | 2 -- | ||
18 | 1 file changed, 2 deletions(-) | ||
19 | |||
20 | diff --git a/ip/iplink.c b/ip/iplink.c | ||
21 | index 1a907d9..ea06871 100644 | ||
22 | --- a/ip/iplink.c | ||
23 | +++ b/ip/iplink.c | ||
24 | @@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, | ||
25 | duparg2("dev", *argv); | ||
26 | *dev = *argv; | ||
27 | dev_index = ll_name_to_index(*dev); | ||
28 | - if (dev_index == 0) | ||
29 | - invarg("Unknown device", *argv); | ||
30 | } | ||
31 | argc--; argv++; | ||
32 | } | ||
33 | -- | ||
34 | 1.7.10.4 | ||
35 | |||
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 | |||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ |
4 | file://configure-cross.patch \ | 4 | file://configure-cross.patch \ |
5 | file://0001-iproute2-de-bash-scripts.patch \ | 5 | file://0001-iproute2-de-bash-scripts.patch \ |
6 | file://0001-ip-link-Remove-unnecessary-device-checking.patch \ | ||
6 | " | 7 | " |
7 | SRC_URI[md5sum] = "6c823b40fdcfa7b8120743349a52ac18" | 8 | SRC_URI[md5sum] = "6c823b40fdcfa7b8120743349a52ac18" |
8 | SRC_URI[sha256sum] = "1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79" | 9 | SRC_URI[sha256sum] = "1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79" |