mirror_ubuntu-kernels/drivers/net/ethernet/mscc
Jakub Kicinski 46d5e62dd3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
xdp_return_frame_bulk() needs to pass a xdp_buff
to __xdp_return().

strlcpy got converted to strscpy but here it makes no
functional difference, so just keep the right code.

Conflicts:
	net/netfilter/nf_tables_api.c

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-12-11 22:29:38 -08:00
..
Kconfig net: mscc: ocelot: rethink Kconfig dependencies again 2020-07-16 12:46:00 -07:00
Makefile net: mscc: ocelot: rename ocelot_ace.{c, h} to ocelot_vcap.{c,h} 2020-06-20 17:25:23 -07:00
ocelot_flower.c net: mscc: ocelot: offload VLAN mangle action to VCAP IS1 2020-10-11 11:19:04 -07:00
ocelot_io.c net: mscc: ocelot: introduce a new ocelot_target_{read,write} API 2020-09-29 18:26:12 -07:00
ocelot_net.c net: mscc: ocelot: deny changing the native VLAN from the prepare phase 2020-11-02 17:09:07 -08:00
ocelot_police.c net: mscc: ocelot: move net_device related functions to ocelot_net.c 2020-06-20 17:25:23 -07:00
ocelot_police.h net: mscc: ocelot: unexpose ocelot_vcap_policer_{add,del} 2020-06-20 17:25:23 -07:00
ocelot_ptp.c net: mscc: ocelot: make ocelot_init_timestamp take a const struct ptp_clock_info 2020-09-18 17:52:40 -07:00
ocelot_qs.h
ocelot_rew.h
ocelot_vcap.c net: mscc: ocelot: relax ocelot_exclusive_mac_etype_filter_rules() 2020-10-02 15:40:30 -07:00
ocelot_vcap.h net: mscc: ocelot: offload egress VLAN rewriting to VCAP ES0 2020-10-02 15:40:30 -07:00
ocelot_vsc7514.c net: mscc: ocelot: fix dropping of unknown IPv4 multicast on Seville 2020-12-05 15:41:34 -08:00
ocelot.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2020-12-11 22:29:38 -08:00
ocelot.h net: mscc: ocelot: support L2 multicast entries 2020-10-30 18:25:56 -07:00