Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says: ==================== pull-request: bpf-next 2017-12-07 The following pull-request contains BPF updates for your net-next tree. The main changes are: 1) Detailed documentation of BPF development process from Daniel. 2) Addition of is_fullsock, snd_cwnd and srtt_us fields to bpf_sock_ops from Lawrence. 3) Minor follow up for bpf_skb_set_tunnel_key() from William. ====================

David S. Miller committed 8 years ago

Commit 62cd2772 parents 124da8f 47adc5b6 files · +572 −5Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/bpf.h+6−0

@@ -941,6 +941,12 @@ struct bpf_sock_ops { · 940 unmodified lines
941	941	__u32 local_ip6[4]; /* Stored in network byte order */
942	942	__u32 remote_port; /* Stored in network byte order */
943	943	__u32 local_port; /* stored in host byte order */
	944	+ __u32 is_fullsock; /* Some TCP fields are only valid if
	945	+ * there is a full socket. If not, the
	946	+ * fields read as zero.
	947	+ */
	948	+ __u32 snd_cwnd;
	949	+ __u32 srtt_us; /* Averaged RTT << 3 in usecs */
944	950	};
945	951
946	952	/* List of known BPF sock_ops operators.