diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-24 22:47:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-24 22:47:27 +0200 |
| commit | 13209a8f7304a34158f4366e8ea07a1965c05ac7 (patch) | |
| tree | f25ba4846fe02a32d4a14ef1a6be3227363da919 /net/ipv4/nexthop.c | |
| parent | ethtool: propagate get_coalesce return value (diff) | |
| parent | Merge tag 'efi-urgent-2020-05-24' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.xz linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/nexthop.c')
| -rw-r--r-- | net/ipv4/nexthop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index c337e73e02dd..143011f9b580 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -292,6 +292,7 @@ out: return 0; nla_put_failure: + nlmsg_cancel(skb, nlh); return -EMSGSIZE; } @@ -482,7 +483,7 @@ static int nh_check_attr_group(struct net *net, struct nlattr *tb[], return -EINVAL; } } - for (i = NHA_GROUP + 1; i < __NHA_MAX; ++i) { + for (i = NHA_GROUP_TYPE + 1; i < __NHA_MAX; ++i) { if (!tb[i]) continue; if (tb[NHA_FDB]) |