Re: [systemd-devel] [PATCH] missing: add more IFLA_VXLAN_* defines

2015-05-27 Thread Tom Gundersen
Applied. Thanks!

Tom

On Tue, May 26, 2015 at 7:48 AM, Michael Olbrich
m.olbr...@pengutronix.de wrote:
 Otherwise building faild with kernel headers  v3.16
 ---
  configure.ac |  2 +-
  src/shared/missing.h | 11 +--
  2 files changed, 10 insertions(+), 3 deletions(-)

 diff --git a/configure.ac b/configure.ac
 index 48cedb5ab61a..0818dd80cf0c 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -334,7 +334,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
  IFLA_PHYS_PORT_ID,
  IFLA_BOND_AD_INFO,
  IFLA_VLAN_PROTOCOL,
 -IFLA_VXLAN_LOCAL6,
 +IFLA_VXLAN_REMCSUM_NOPARTIAL,
  IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
  IFLA_BRIDGE_VLAN_INFO,
  IFLA_BRPORT_UNICAST_FLOOD,
 diff --git a/src/shared/missing.h b/src/shared/missing.h
 index 8ca6f8edb62c..919400949138 100644
 --- a/src/shared/missing.h
 +++ b/src/shared/missing.h
 @@ -713,7 +713,7 @@ static inline int setns(int fd, int nstype) {
  #define IFLA_VLAN_MAX   (__IFLA_VLAN_MAX - 1)
  #endif

 -#if !HAVE_DECL_IFLA_VXLAN_LOCAL6
 +#if !HAVE_DECL_IFLA_VXLAN_REMCSUM_NOPARTIAL
  #define IFLA_VXLAN_UNSPEC 0
  #define IFLA_VXLAN_ID 1
  #define IFLA_VXLAN_GROUP 2
 @@ -732,7 +732,14 @@ static inline int setns(int fd, int nstype) {
  #define IFLA_VXLAN_PORT 15
  #define IFLA_VXLAN_GROUP6 16
  #define IFLA_VXLAN_LOCAL6 17
 -#define __IFLA_VXLAN_MAX 18
 +#define IFLA_VXLAN_UDP_CSUM 18
 +#define IFLA_VXLAN_UDP_ZERO_CSUM6_TX 19
 +#define IFLA_VXLAN_UDP_ZERO_CSUM6_RX 20
 +#define IFLA_VXLAN_REMCSUM_TX 21
 +#define IFLA_VXLAN_REMCSUM_RX 22
 +#define IFLA_VXLAN_GBP 23
 +#define IFLA_VXLAN_REMCSUM_NOPARTIAL 24
 +#define __IFLA_VXLAN_MAX 25

  #define IFLA_VXLAN_MAX  (__IFLA_VXLAN_MAX - 1)
  #endif
 --
 2.1.4

 ___
 systemd-devel mailing list
 systemd-devel@lists.freedesktop.org
 http://lists.freedesktop.org/mailman/listinfo/systemd-devel
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


Re: [systemd-devel] [PATCH] missing: add more IFLA_VXLAN_* defines

2015-05-26 Thread systemd github import bot
Patchset imported to github.
Pull request:
https://github.com/systemd-devs/systemd/compare/master...systemd-mailing-devs:1432619328-32030-1-git-send-email-m.olbrich%40pengutronix.de

--
Generated by https://github.com/haraldh/mail2git
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel