From: Stephen Hemminger <shemming@brocade.com>
Date: Thu, 28 May 2015 16:18:01 +0000 (-0700)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.13.0~746^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=03371c7d98d167145b0c562f5d2ca2f54c8a5c7f;p=mirror_iproute2.git

Merge branch 'master' into net-next

Conflicts:
	include/linux/tcp.h
	lib/libnetlink.c
---

03371c7d98d167145b0c562f5d2ca2f54c8a5c7f
diff --cc include/linux/tcp.h
index 8b17cff1,1e002563..1e9b4a62
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@@ -192,8 -190,8 +192,10 @@@ struct tcp_info 
  
  	__u64	tcpi_pacing_rate;
  	__u64	tcpi_max_pacing_rate;
--	__u64	tcpi_bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
++	__u64	tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
  	__u64	tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
++	__u32	tcpi_segs_out;	     /* RFC4898 tcpEStatsPerfSegsOut */
++	__u32	tcpi_segs_in;	     /* RFC4898 tcpEStatsPerfSegsIn */
  };
  
  /* for TCP_MD5SIG socket option */
diff --cc lib/libnetlink.c
index 424a5b6f,901236e6..46cac34c
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@@ -25,10 -25,10 +25,14 @@@
  
  #include "libnetlink.h"
  
 +#ifndef SOL_NETLINK
 +#define SOL_NETLINK 270
 +#endif
 +
+ #ifndef MIN
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
+ #endif
+ 
  int rcvbuf = 1024 * 1024;
  
  void rtnl_close(struct rtnl_handle *rth)