Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two easy cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -476,7 +476,7 @@ static int ip6addrlbl_valid_dump_req(const struct nlmsghdr *nlh,
|
||||
}
|
||||
|
||||
if (nlmsg_attrlen(nlh, sizeof(*ifal))) {
|
||||
NL_SET_ERR_MSG_MOD(extack, "Invalid data after header for address label dump requewst");
|
||||
NL_SET_ERR_MSG_MOD(extack, "Invalid data after header for address label dump request");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user