aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds2017-05-04 14:26:43 -0500
committerLinus Torvalds2017-05-04 14:26:43 -0500
commit4ac4d584886a4f47f8ff3bca0f32ff9a2987d3e5 (patch)
treef5fa439ec5f73d6b5cf9a5a3ffe9b53f70fa27b4 /lib
parent8d5e72dfdf0fa29a21143fd72746c6f43295ce9f (diff)
parent842be75c77cb72ee546a2b19da9c285fb3ded660 (diff)
downloadkernel-4ac4d584886a4f47f8ff3bca0f32ff9a2987d3e5.tar.gz
kernel-4ac4d584886a4f47f8ff3bca0f32ff9a2987d3e5.tar.xz
kernel-4ac4d584886a4f47f8ff3bca0f32ff9a2987d3e5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) The wireless rate info fix from Johannes Berg. 2) When a RAW socket is in hdrincl mode, we need to make sure that the user provided at least a minimally sized ipv4/ipv6 header. Fix from Alexander Potapenko. 3) We must emit IFLA_PHYS_PORT_NAME netlink attributes using nla_put_string() so that it is NULL terminated. 4) Fix a bug in TCP fastopen handling, wherein child sockets erroneously inherit the fastopen_req from the parent, and later can end up derefencing freed memory or doing a double free. From Eric Dumazet. 5) Don't clear out netdev stats at close time in tg3 driver, from YueHaibing. 6) Fix refcount leak in xt_CT, from Gao Feng. 7) In nft_set_bitmap() don't leak dummy elements, from Liping Zhang. 8) Fix deadlock due to taking the expectation lock twice, also from Liping Zhang. 9) Make xt_socket work again with ipv6, from Peter Tirsek. 10) Don't allow IPV6 to be used with IPVS if ipv6.disable=1, from Paolo Abeni. 11) Make the BPF loader more flexible wrt. changes to the bpf MAP entry layout. From Jesper Dangaard Brouer. 12) Fix ethtool reported device name in aquantia driver, from Pavel Belous. 13) Fix build failures due to the compile time size test not working in netfilter conntrack. From Geert Uytterhoeven. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (52 commits) cfg80211: make RATE_INFO_BW_20 the default ipv6: initialize route null entry in addrconf_init() qede: Fix possible misconfiguration of advertised autoneg value. qed: Fix overriding of supported autoneg value. qed*: Fix possible overflow for status block id field. rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string netvsc: make sure napi enabled before vmbus_open aquantia: Fix driver name reported by ethtool ipv4, ipv6: ensure raw socket message is big enough to hold an IP header net/sched: remove redundant null check on head tcp: do not inherit fastopen_req from parent forcedeth: remove unnecessary carrier status check ibmvnic: Move queue restarting in ibmvnic_tx_complete ibmvnic: Record SKB RX queue during poll ibmvnic: Continue skb processing after skb completion error ibmvnic: Check for driver reset first in ibmvnic_xmit ibmvnic: Wait for any pending scrqs entries at driver close ibmvnic: Clean up tx pools when closing ibmvnic: Whitespace correction in release_rx_pools ibmvnic: Delete napi's when releasing driver resources ...
Diffstat (limited to 'lib')
-rw-r--r--lib/test_bpf.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/test_bpf.c b/lib/test_bpf.c
index a0f66280ea50..889bc31785be 100644
--- a/lib/test_bpf.c
+++ b/lib/test_bpf.c
@@ -4769,8 +4769,8 @@ static struct bpf_test tests[] = {
4769 BPF_LD_IMM64(R1, 3), 4769 BPF_LD_IMM64(R1, 3),
4770 BPF_LD_IMM64(R2, 2), 4770 BPF_LD_IMM64(R2, 2),
4771 BPF_JMP_REG(BPF_JGE, R1, R2, 2), 4771 BPF_JMP_REG(BPF_JGE, R1, R2, 2),
4772 BPF_LD_IMM64(R0, 0xffffffffffffffffUL), 4772 BPF_LD_IMM64(R0, 0xffffffffffffffffULL),
4773 BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeUL), 4773 BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeULL),
4774 BPF_EXIT_INSN(), 4774 BPF_EXIT_INSN(),
4775 }, 4775 },
4776 INTERNAL, 4776 INTERNAL,
@@ -4784,7 +4784,7 @@ static struct bpf_test tests[] = {
4784 BPF_LD_IMM64(R1, 3), 4784 BPF_LD_IMM64(R1, 3),
4785 BPF_LD_IMM64(R2, 2), 4785 BPF_LD_IMM64(R2, 2),
4786 BPF_JMP_REG(BPF_JGE, R1, R2, 0), 4786 BPF_JMP_REG(BPF_JGE, R1, R2, 0),
4787 BPF_LD_IMM64(R0, 0xffffffffffffffffUL), 4787 BPF_LD_IMM64(R0, 0xffffffffffffffffULL),
4788 BPF_EXIT_INSN(), 4788 BPF_EXIT_INSN(),
4789 }, 4789 },
4790 INTERNAL, 4790 INTERNAL,
@@ -4798,8 +4798,8 @@ static struct bpf_test tests[] = {
4798 BPF_LD_IMM64(R1, 3), 4798 BPF_LD_IMM64(R1, 3),
4799 BPF_LD_IMM64(R2, 2), 4799 BPF_LD_IMM64(R2, 2),
4800 BPF_JMP_REG(BPF_JGE, R1, R2, 4), 4800 BPF_JMP_REG(BPF_JGE, R1, R2, 4),
4801 BPF_LD_IMM64(R0, 0xffffffffffffffffUL), 4801 BPF_LD_IMM64(R0, 0xffffffffffffffffULL),
4802 BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeUL), 4802 BPF_LD_IMM64(R0, 0xeeeeeeeeeeeeeeeeULL),
4803 BPF_EXIT_INSN(), 4803 BPF_EXIT_INSN(),
4804 }, 4804 },
4805 INTERNAL, 4805 INTERNAL,