From: Ido Schimmel Date: Thu, 7 Apr 2022 07:35:33 +0000 (+0300) Subject: net/sched: flower: Avoid overwriting error messages X-Git-Tag: v5.19-rc1~159^2~366^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd23e0e250c6a7a7fd8a2ec9ab4253299471c163;p=thirdparty%2Fkernel%2Flinux.git net/sched: flower: Avoid overwriting error messages The various error paths of tc_setup_offload_action() now report specific error messages. Remove the generic messages to avoid overwriting the more specific ones. Before: # tc filter add dev dummy0 ingress pref 1 proto ip flower skip_sw dst_ip 198.51.100.1 action police rate 100Mbit burst 10000 Error: cls_flower: Failed to setup flow action. We have an error talking to the kernel After: # tc filter add dev dummy0 ingress pref 1 proto ip flower skip_sw dst_ip 198.51.100.1 action police rate 100Mbit burst 10000 Error: act_police: Offload not supported when conform/exceed action is "reclassify". We have an error talking to the kernel Signed-off-by: Ido Schimmel Reviewed-by: Petr Machata Signed-off-by: David S. Miller --- diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index acf827b0e30a6..87e030dfc3283 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c @@ -468,8 +468,6 @@ static int fl_hw_replace_filter(struct tcf_proto *tp, cls_flower.common.extack); if (err) { kfree(cls_flower.rule); - NL_SET_ERR_MSG_MOD(cls_flower.common.extack, - "Failed to setup flow action"); return skip_sw ? err : 0; } @@ -2358,8 +2356,6 @@ static int fl_reoffload(struct tcf_proto *tp, bool add, flow_setup_cb_t *cb, cls_flower.common.extack); if (err) { kfree(cls_flower.rule); - NL_SET_ERR_MSG_MOD(cls_flower.common.extack, - "Failed to setup flow action"); if (tc_skip_sw(f->flags)) { __fl_put(f); return err;