diff options
author | Stephen Hemminger <stephen@networkplumber.org> | 2017-06-05 12:31:19 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-06-05 12:31:19 -0700 |
commit | a5445c56e1b07d1fd29df30adfdf151bfc42a811 (patch) | |
tree | bb0666ce1f4d026cd0232cfaca1249f4a542a472 | |
parent | 309d5c2f838ed32a2f186cb953b420af53cce4ef (diff) | |
parent | 5a3ec4ba64783a640e7716a37faae4be49489e51 (diff) | |
download | iproute2-a5445c56e1b07d1fd29df30adfdf151bfc42a811.tar.gz |
Merge branch 'master' into net-next
-rw-r--r-- | include/linux/can/vxcan.h | 12 | ||||
-rw-r--r-- | ip/Makefile | 2 | ||||
-rw-r--r-- | ip/iplink.c | 2 | ||||
-rw-r--r-- | ip/iplink_vxcan.c | 99 | ||||
-rw-r--r-- | man/man8/ip-link.8.in | 4 |
5 files changed, 116 insertions, 3 deletions
diff --git a/include/linux/can/vxcan.h b/include/linux/can/vxcan.h new file mode 100644 index 00000000..5b29e8a7 --- /dev/null +++ b/include/linux/can/vxcan.h @@ -0,0 +1,12 @@ +#ifndef _CAN_VXCAN_H +#define _CAN_VXCAN_H + +enum { + VXCAN_INFO_UNSPEC, + VXCAN_INFO_PEER, + + __VXCAN_INFO_MAX +#define VXCAN_INFO_MAX (__VXCAN_INFO_MAX - 1) +}; + +#endif diff --git a/ip/Makefile b/ip/Makefile index e08c170a..8424b1f6 100644 --- a/ip/Makefile +++ b/ip/Makefile @@ -2,7 +2,7 @@ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \ rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \ ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \ ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \ - iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \ + iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o iplink_vxcan.o \ iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \ iplink_macvlan.o ipl2tp.o link_vti.o link_vti6.o \ iplink_vxlan.o tcp_metrics.o iplink_ipoib.o ipnetconf.o link_ip6tnl.o \ diff --git a/ip/iplink.c b/ip/iplink.c index 58af402c..682f7eeb 100644 --- a/ip/iplink.c +++ b/ip/iplink.c @@ -91,6 +91,8 @@ void iplink_usage(void) " [ query_rss { on | off} ]\n" " [ state { auto | enable | disable} ] ]\n" " [ trust { on | off} ] ]\n" + " [ node_guid { eui64 } ]\n" + " [ port_guid { eui64 } ]\n" " [ xdp { off |\n" " object FILE [ section NAME ] [ verbose ] |\n" " pinned FILE } ]\n" diff --git a/ip/iplink_vxcan.c b/ip/iplink_vxcan.c new file mode 100644 index 00000000..680f640f --- /dev/null +++ b/ip/iplink_vxcan.c @@ -0,0 +1,99 @@ +/* + * iplink_vxcan.c vxcan device support (Virtual CAN Tunnel) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * Author: Oliver Hartkopp <socketcan@hartkopp.net> + * Based on: link_veth.c from Pavel Emelianov <xemul@openvz.org> + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <net/if.h> +#include <linux/can/vxcan.h> + +#include "utils.h" +#include "ip_common.h" + +static void print_usage(FILE *f) +{ + printf("Usage: ip link <options> type vxcan [peer <options>]\n" + "To get <options> type 'ip link add help'\n"); +} + +static void usage(void) +{ + print_usage(stderr); +} + +static int vxcan_parse_opt(struct link_util *lu, int argc, char **argv, + struct nlmsghdr *hdr) +{ + char *dev = NULL; + char *name = NULL; + char *link = NULL; + char *type = NULL; + int index = 0; + 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, VXCAN_INFO_PEER, NULL, 0); + + hdr->nlmsg_len += sizeof(struct ifinfomsg); + + err = iplink_parse(argc - 1, argv + 1, (struct iplink_req *)hdr, + &name, &type, &link, &dev, &group, &index); + if (err < 0) + return err; + + if (name) { + len = strlen(name) + 1; + if (len > IFNAMSIZ) + invarg("\"name\" too long\n", *argv); + addattr_l(hdr, 1024, IFLA_IFNAME, name, len); + } + + peer_ifm = RTA_DATA(data); + peer_ifm->ifi_index = index; + 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); + + data->rta_len = (void *)NLMSG_TAIL(hdr) - (void *)data; + return argc - 1 - err; +} + +static void vxcan_print_help(struct link_util *lu, int argc, char **argv, + FILE *f) +{ + print_usage(f); +} + +struct link_util vxcan_link_util = { + .id = "vxcan", + .parse_opt = vxcan_parse_opt, + .print_help = vxcan_print_help, +}; diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 52571b72..5d73538b 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -1564,10 +1564,10 @@ sent by the VF. which may impact security and/or performance. (e.g. VF multicast promiscuous mode) .sp .BI node_guid " eui64" -- configure node GUID for the VF. +- configure node GUID for Infiniband VFs. .sp .BI port_guid " eui64" -- configure port GUID for the VF. +- configure port GUID for Infiniband VFs. .in -8 .TP |