summaryrefslogtreecommitdiff
path: root/drivers/net/geneve.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-08-10 22:11:16 +0300
committerDavid S. Miller <davem@davemloft.net>2017-08-10 22:11:16 +0300
commit3b2b69efeca734b78bc85fd02253b0465bb2bec7 (patch)
tree57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47 /drivers/net/geneve.c
parent2e2d5d767c9ddb2b10d74f2c20a257101c7070eb (diff)
parent26273939ace935dd7553b31d279eab30b40f7b9a (diff)
downloadlinux-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.xz
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.c2
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;
}