Davide Caratti 92974a1d00 net/sched: act_sample: don't push mac header on ip6gre ingress ... current 'sample' action doesn't push the mac header of ingress packets if they are received by a layer 3 tunnel (like gre or sit); but it forgot to check for gre over ipv6, so the following script: # tc q a dev $d clsact # tc f a dev $d ingress protocol ip flower ip_proto icmp action sample \ > group 100 rate 1 # psample -v -g 100 dumps everything, including outer header and mac, when $d is a gre tunnel over ipv6. Fix this adding a missing label for ARPHRD_IP6GRE devices. Fixes: 5c5670fae4 ("net/sched: Introduce sample tc action") Signed-off-by: Davide Caratti <dcaratti@redhat.com> Reviewed-by: Yotam Gigi <yotam.gi@gmail.com> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>		2019-09-20 17:01:59 -07:00
..
6lowpan	6lowpan: no need to check return value of debugfs_create functions	2019-07-06 12:50:01 +02:00
9p	9p pull request for inclusion in 5.13	2019-07-12 17:31:19 -07:00
802	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
8021q	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
appletalk	net: Use skb_frag_off accessors	2019-07-30 14:21:32 -07:00
atm	pppoatm: use %*ph to print small buffer	2019-09-05 12:33:28 +02:00
ax25	ax25: fix inconsistent lock state in ax25_destroy_timer	2019-06-16 14:22:37 -07:00
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-02 11:20:17 -07:00
bluetooth	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2019-09-18 12:34:53 -07:00
bpf	bpf/flow_dissector: support flags in BPF_PROG_TEST_RUN	2019-07-25 18:00:41 -07:00
bpfilter	Kbuild updates for v5.3	2019-07-12 16:03:16 -07:00
bridge	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
caif	…
can	can: add support of SAE J1939 protocol	2019-09-04 14:22:33 +02:00
ceph	libceph: don't call crypto_free_sync_skcipher() on a NULL tfm	2019-08-28 12:33:46 +02:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2019-09-18 12:34:53 -07:00
dcb	…
dccp	proc/sysctl: add shared variables for range check	2019-07-18 17:08:07 -07:00
decnet	…
dns_resolver	Revert "Merge tag 'keys-acl-20190703' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs"	2019-07-10 18:43:43 -07:00
dsa	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2019-09-17 23:51:10 +02:00
ethernet	…
hsr	hsr: switch ->dellink() to ->ndo_uninit()	2019-07-11 14:37:45 -07:00
ieee802154	LED updates for 5.4-rc1	2019-09-17 18:40:42 -07:00
ife	…
ipv4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next	2019-09-18 12:34:53 -07:00
ipv6	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2019-09-17 23:51:10 +02:00
iucv	net/af_iucv: mark expected switch fall-throughs	2019-07-29 10:26:14 -07:00
kcm	kcm: use BPF_PROG_RUN	2019-09-06 10:04:31 -07:00
key	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-07-08 19:48:57 -07:00
l2tp	compat_ioctl: pppoe: fix PPPOEIOCSFWD handling	2019-07-30 14:42:13 -07:00
l3mdev	ipv6: convert major tx path to use RT6_LOOKUP_F_DST_NOREF	2019-06-23 13:24:17 -07:00
lapb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-17 20:20:36 -07:00
llc	…
mac80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
mac802154	…
mpls	ipv4: mpls: fix mpls_xmit for iptunnel	2019-08-25 14:34:08 -07:00
ncsi	net/ncsi: Disable global multicast filter	2019-09-19 18:04:40 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
netlabel	netlabel: remove redundant assignment to pointer iter	2019-09-01 11:45:02 -07:00
netlink	net: remove empty netlink_tap_exit_net	2019-06-14 19:50:33 -07:00
netrom	netrom: hold sock when setting skb->destructor	2019-07-24 15:49:05 -07:00
nfc	NFC: fix attrs checks in netlink interface	2019-07-29 08:56:26 -07:00
nsh	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
openvswitch	net: openvswitch: Set OvS recirc_id from tc chain index	2019-09-06 14:59:18 +02:00
packet	net/packet: fix race in tpacket_snd()	2019-08-15 13:59:48 -07:00
phonet	…
psample	net: sched: take reference to psample group in flow_action infra	2019-09-16 09:18:03 +02:00
qrtr	net: qrtr: fix memort leak in qrtr_tun_write_iter	2019-09-12 11:58:44 +01:00
rds	Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net	2019-09-17 23:51:10 +02:00
rfkill	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
rose	…
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
sched	net/sched: act_sample: don't push mac header on ip6gre ingress	2019-09-20 17:01:59 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
smc	net/smc: make sure EPOLLOUT is raised	2019-08-20 12:25:14 -07:00
strparser	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-06-22 08:59:24 -04:00
sunrpc	Merge branch 'work.mount-base' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2019-09-18 13:15:58 -07:00
switchdev	…
tipc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
tls	net/tls: align non temporal copy to cache lines	2019-09-07 18:10:34 +02:00
unix	…
vmw_vsock	vsock/virtio: a better comment on credit update	2019-09-05 09:53:01 +02:00
wimax	wimax: no need to check return value of debugfs_create functions	2019-08-10 15:25:47 -07:00
wireless	We have a number of changes, but things are settling down:	2019-09-11 14:57:17 +01:00
x25	…
xdp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next	2019-09-06 16:49:17 +02:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2019-09-15 14:17:27 +02:00
Kconfig	devlink: Add packet trap infrastructure	2019-08-17 12:40:08 -07:00
Makefile	…
compat.c	…
socket.c	Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2019-07-19 10:42:02 -07:00
sysctl_net.c	…