diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 21:11:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 21:11:16 +0200 |
| commit | 3b2b69efeca734b78bc85fd02253b0465bb2bec7 (patch) | |
| tree | 57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47 /drivers/net/geneve.c | |
| parent | Merge branch 'rtnetlink-fix-initial-rtnl-pushdown-fallout' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.xz linux-3b2b69efeca734b78bc85fd02253b0465bb2bec7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Mainline had UFO fixes, but UFO is removed in net-next so we
take the HEAD hunks.
Minor context conflict in bcmsysport statistics bug fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/geneve.c')
| -rw-r--r-- | drivers/net/geneve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 745d57ae95d7..8b8565dd2afb 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -1099,7 +1099,7 @@ static int geneve_validate(struct nlattr *tb[], struct nlattr *data[], if (data[IFLA_GENEVE_ID]) { __u32 vni = nla_get_u32(data[IFLA_GENEVE_ID]); - if (vni >= GENEVE_VID_MASK) + if (vni >= GENEVE_N_VID) return -ERANGE; } |