p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net sched actions: fix misleading text strings in pedit action 

Change "tc filter pedit .." to "tc actions pedit .." in error
messages to clearly refer to pedit action.

Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Roman Mashak <mrv@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roman Mashak 2018-06-27 13:33:34 -04:00 committed by David S. Miller
parent 6ff7586e38
commit 95b0d2dc13
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sched/act_pedit.c
View File

@ -305,7 +305,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
rc = pedit_skb_hdr_offset(skb, htype, &hoffset); rc = pedit_skb_hdr_offset(skb, htype, &hoffset);
if (rc) { if (rc) {
pr_info("tc filter pedit bad header type specified (0x%x)\n", pr_info("tc action pedit bad header type specified (0x%x)\n",
htype); htype);
goto bad; goto bad;
} }
@ -314,7 +314,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
char *d, _d; char *d, _d;
if (!offset_valid(skb, hoffset + tkey->at)) { if (!offset_valid(skb, hoffset + tkey->at)) {
pr_info("tc filter pedit 'at' offset %d out of bounds\n", pr_info("tc action pedit 'at' offset %d out of bounds\n",
hoffset + tkey->at); hoffset + tkey->at);
goto bad; goto bad;
} }
@ -326,12 +326,12 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
} }
if (offset % 4) { if (offset % 4) {
pr_info("tc filter pedit offset must be on 32 bit boundaries\n"); pr_info("tc action pedit offset must be on 32 bit boundaries\n");
goto bad; goto bad;
} }
if (!offset_valid(skb, hoffset + offset)) { if (!offset_valid(skb, hoffset + offset)) {
pr_info("tc filter pedit offset %d out of bounds\n", pr_info("tc action pedit offset %d out of bounds\n",
hoffset + offset); hoffset + offset);
goto bad; goto bad;
} }
@ -349,7 +349,7 @@ static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
val = (*ptr + tkey->val) & ~tkey->mask; val = (*ptr + tkey->val) & ~tkey->mask;
break; break;
default: default:
pr_info("tc filter pedit bad command (%d)\n", pr_info("tc action pedit bad command (%d)\n",
cmd); cmd);
goto bad; goto bad;
} }