diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-10 12:11:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-10 12:11:16 -0700 |
| commit | 3b2b69efeca734b78bc85fd02253b0465bb2bec7 (patch) | |
| tree | 57fd8b5b0e9c04f24f5f9ec70ceb0a706cecfb47 /drivers/net | |
| parent | 2e2d5d767c9ddb2b10d74f2c20a257101c7070eb (diff) | |
| parent | 26273939ace935dd7553b31d279eab30b40f7b9a (diff) | |
| download | op-kernel-dev-3b2b69efeca734b78bc85fd02253b0465bb2bec7.zip op-kernel-dev-3b2b69efeca734b78bc85fd02253b0465bb2bec7.tar.gz | |
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')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bcmsysport.c | 2 | ||||
| -rw-r--r-- | drivers/net/geneve.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index bf9ca3c..b3a2141 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -457,6 +457,8 @@ static void bcm_sysport_get_stats(struct net_device *dev, else p = (char *)priv; + if (priv->is_lite && !bcm_sysport_lite_stat_valid(s->type)) + continue; p += s->stat_offset; if (s->stat_sizeof == sizeof(u64)) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 745d57ae..8b8565d 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; } |
