diff options
| author | David S. Miller | 2019-07-09 04:48:57 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-09 04:48:57 +0200 |
| commit | af144a983402f7fd324ce556d9f9011a8b3e01fe (patch) | |
| tree | 7a0250b960a36976bc683789d9fe86b9f60a97a5 /include/uapi/linux/bpf.h | |
| parent | skbuff: increase verbosity when dumping skb data (diff) | |
| parent | tcp: Reset bytes_acked and bytes_received when disconnecting (diff) | |
| download | kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.gz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.tar.xz kernel-qcow2-linux-af144a983402f7fd324ce556d9f9011a8b3e01fe.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two cases of overlapping changes, nothing fancy.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/bpf.h')
| -rw-r--r-- | include/uapi/linux/bpf.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index c318385aba51..5695ab53e354 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3193,6 +3193,7 @@ struct bpf_prog_info { char name[BPF_OBJ_NAME_LEN]; __u32 ifindex; __u32 gpl_compatible:1; + __u32 :31; /* alignment pad */ __u64 netns_dev; __u64 netns_ino; __u32 nr_jited_ksyms; |