On Tue, Sep 17, 2019 at 1:02 PM Davide Caratti <dcara...@redhat.com> wrote: > > 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: 5c5670fae430 ("net/sched: Introduce sample tc action")
Reviewed-by: Yotam Gigi <yotam...@gmail.com> > Signed-off-by: Davide Caratti <dcara...@redhat.com> > --- > net/sched/act_sample.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c > index 10229124a992..86344fd2ff1f 100644 > --- a/net/sched/act_sample.c > +++ b/net/sched/act_sample.c > @@ -146,6 +146,7 @@ static bool tcf_sample_dev_ok_push(struct net_device *dev) > case ARPHRD_TUNNEL6: > case ARPHRD_SIT: > case ARPHRD_IPGRE: > + case ARPHRD_IP6GRE: > case ARPHRD_VOID: > case ARPHRD_NONE: > return false; > -- > 2.21.0 >