File veth-Handle-flags-correctry.patch of Package iproute2
From: Kusanagi Kouichi <slash@ac.auone-net.jp>
Date: Wed, 2 Apr 2014 01:09:18 +0900
Subject: veth: Handle flags correctry
Patch-mainline: v3.14.0
Git-commit: 18917544879aa699281dfc45d9d8f5658f5ba283
References: bnc#879865
Flags for a peer override flags for the other and not used for the
peer.
before:
1: lo: <LOOPBACK> mtu 65536 qdisc noop state DOWN mode DEFAULT group default
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
2: veth0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 2e:5c:cd:f5:63:d2 brd ff:ff:ff:ff:ff:ff
3: veth1: <BROADCAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 72:b0:fa:1e:76:7a brd ff:ff:ff:ff:ff:ff
after:
1: lo: <LOOPBACK> mtu 65536 qdisc noop state DOWN mode DEFAULT group default
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
2: veth0: <BROADCAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 1000
link/ether 6e:db:03:b3:bd:ff brd ff:ff:ff:ff:ff:ff
3: veth1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc pfifo_fast state DOWN mode DEFAULT group default qlen 1000
link/ether a6:62:d9:84:f0:73 brd ff:ff:ff:ff:ff:ff
Signed-off-by: Kusanagi Kouichi <slash@ac.auone-net.jp>
Conflicts:
ip/link_veth.c
---
ip/link_veth.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/ip/link_veth.c b/ip/link_veth.c
index 62cb5a5..99bf129 100644
--- a/ip/link_veth.c
+++ b/ip/link_veth.c
@@ -33,12 +33,20 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
int err, len;
struct rtattr * data;
int group;
+ struct ifinfomsg *ifm, *peer_ifm;
+ unsigned int ifi_flags, ifi_change;
if (strcmp(argv[0], "peer") != 0) {
usage();
return -1;
}
+ ifm = NLMSG_DATA(hdr);
+ ifi_flags = ifm->ifi_flags;
+ ifi_change = ifm->ifi_change;
+ ifm->ifi_flags = 0;
+ ifm->ifi_change = 0;
+
data = NLMSG_TAIL(hdr);
addattr_l(hdr, 1024, VETH_INFO_PEER, NULL, 0);
@@ -56,6 +64,12 @@ static int veth_parse_opt(struct link_util *lu, int argc, char **argv,
addattr_l(hdr, 1024, IFLA_IFNAME, name, len);
}
+ peer_ifm = RTA_DATA(data);
+ peer_ifm->ifi_flags = ifm->ifi_flags;
+ peer_ifm->ifi_change = ifm->ifi_change;
+ ifm->ifi_flags = ifi_flags;
+ ifm->ifi_change = ifi_change;
+
if (group != -1)
addattr32(hdr, 1024, IFLA_GROUP, group);
--
1.8.4.5