diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-11 13:59:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-11 13:59:43 +0100 |
| commit | 2f2f523a31b8dd289394a2690c03a025b1de6e47 (patch) | |
| tree | 0bbb2227da26836b396a243472edef1edcc3bf70 /lib | |
| parent | 14d5042fdcd703bd08b3cc829aed4f39d448f398 (diff) | |
| parent | b0ee52316847cf279a1028334117985a5d633c0c (diff) | |
Merge 4.4.299 into android-4.4-p
Changes in 4.4.299
bpf, test: fix ld_abs + vlan push/pop stress test
Bluetooth: btusb: Apply QCA Rome patches for some ATH3012 models
ieee802154: atusb: fix uninit value in atusb_set_extended_addr
mac80211: initialize variable have_higher_than_11mbit
i40e: Fix incorrect netdev's real number of RX/TX queues
sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc
xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate
rndis_host: support Hytera digital radios
phonet: refcount leak in pep_sock_accep
scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown()
ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate
net: udp: fix alignment problem in udp4_seq_show()
mISDN: change function names to avoid conflicts
power: reset: ltc2952: Fix use of floating point literals
Linux 4.4.299
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0272e2e79cebce38fdb9ecb51f62be9d9effed7a
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/test_bpf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_bpf.c b/lib/test_bpf.c index cf2880d2ce3f..1a0d1e771e6c 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -4556,7 +4556,7 @@ static struct bpf_test tests[] = { { }, INTERNAL, { 0x34 }, - { { 1, 0xbef } }, + { { ETH_HLEN, 0xbef } }, .fill_helper = bpf_fill_ld_abs_vlan_push_pop, }, /* |