diff options
| -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.17.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb) | 5 |
2 files changed, 2 insertions, 38 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 deleted file mode 100644 index 0305a7065b..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-link-Remove-unnecessary-device-checking.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 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.17.0.bb index 39fe9c83b8..d12b33fbd1 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_3.16.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_3.17.0.bb | |||
| @@ -3,10 +3,9 @@ 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 \ | ||
| 7 | " | 6 | " |
| 8 | SRC_URI[md5sum] = "6c823b40fdcfa7b8120743349a52ac18" | 7 | SRC_URI[md5sum] = "b741a02c6dda5818d18011d572874493" |
| 9 | SRC_URI[sha256sum] = "1f0a8a6c0e872166f75433f5cbf9766f3002b5c2f13501b3bb8c51846a127b79" | 8 | SRC_URI[sha256sum] = "09e406636e7598e46d5d4f7b928bf5db57049d65dbeb9a496005957ee16f6000" |
| 10 | 9 | ||
| 11 | # CFLAGS are computed in Makefile and reference CCOPTS | 10 | # CFLAGS are computed in Makefile and reference CCOPTS |
| 12 | # | 11 | # |
