From patchwork Wed Jan 28 14:15:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 433927 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1FFE01402A2 for ; Thu, 29 Jan 2015 07:15:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754944AbbA1UPX (ORCPT ); Wed, 28 Jan 2015 15:15:23 -0500 Received: from 33.106-14-84.ripe.coltfrance.com ([84.14.106.33]:44108 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754898AbbA1UPP (ORCPT ); Wed, 28 Jan 2015 15:15:15 -0500 Received: from schnaps.dev.6wind.com (unknown [10.16.0.249]) by proxy.6wind.com (Postfix) with ESMTPS id 204D35AC38; Wed, 28 Jan 2015 15:15:56 +0100 (CET) Received: from root by schnaps.dev.6wind.com with local (Exim 4.80) (envelope-from ) id 1YGTPP-0008Ou-L8; Wed, 28 Jan 2015 15:15:55 +0100 From: Nicolas Dichtel To: shemminger@vyatta.com Cc: netdev@vger.kernel.org, Nicolas Dichtel Subject: [PATCH v2 iproute2-next 1/4] include: update headers Date: Wed, 28 Jan 2015 15:15:47 +0100 Message-Id: <1422454550-32222-1-git-send-email-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <54C8E3EB.8050904@6wind.com> References: <54C8E3EB.8050904@6wind.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Copy from sanitized headers. Signed-off-by: Nicolas Dichtel --- v2: took last headers from net-next include/linux/if_link.h | 4 ++++ include/linux/neighbour.h | 1 + include/linux/net_namespace.h | 23 +++++++++++++++++++++++ include/linux/rtnetlink.h | 5 +++++ 4 files changed, 33 insertions(+) create mode 100644 include/linux/net_namespace.h diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 167ec34bab73..ac64724c9425 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -146,6 +146,7 @@ enum { IFLA_PHYS_PORT_ID, IFLA_CARRIER_CHANGES, IFLA_PHYS_SWITCH_ID, + IFLA_LINK_NETNSID, __IFLA_MAX }; @@ -368,6 +369,9 @@ enum { IFLA_VXLAN_UDP_CSUM, IFLA_VXLAN_UDP_ZERO_CSUM6_TX, IFLA_VXLAN_UDP_ZERO_CSUM6_RX, + IFLA_VXLAN_REMCSUM_TX, + IFLA_VXLAN_REMCSUM_RX, + IFLA_VXLAN_GBP, __IFLA_VXLAN_MAX }; #define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1) diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h index f3d77f9f1e0b..3873a35509aa 100644 --- a/include/linux/neighbour.h +++ b/include/linux/neighbour.h @@ -25,6 +25,7 @@ enum { NDA_VNI, NDA_IFINDEX, NDA_MASTER, + NDA_LINK_NETNSID, __NDA_MAX }; diff --git a/include/linux/net_namespace.h b/include/linux/net_namespace.h new file mode 100644 index 000000000000..9a92b7e14a19 --- /dev/null +++ b/include/linux/net_namespace.h @@ -0,0 +1,23 @@ +/* Copyright (c) 2015 6WIND S.A. + * Author: Nicolas Dichtel + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + */ +#ifndef _LINUX_NET_NAMESPACE_H_ +#define _LINUX_NET_NAMESPACE_H_ + +/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */ +enum { + NETNSA_NONE, +#define NETNSA_NSID_NOT_ASSIGNED -1 + NETNSA_NSID, + NETNSA_PID, + NETNSA_FD, + __NETNSA_MAX, +}; + +#define NETNSA_MAX (__NETNSA_MAX - 1) + +#endif /* _LINUX_NET_NAMESPACE_H_ */ diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 9111053f2250..3eb78105399b 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -132,6 +132,11 @@ enum { RTM_GETMDB = 86, #define RTM_GETMDB RTM_GETMDB + RTM_NEWNSID = 88, +#define RTM_NEWNSID RTM_NEWNSID + RTM_GETNSID = 90, +#define RTM_GETNSID RTM_GETNSID + __RTM_MAX, #define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) };