diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-03 13:41:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-03 13:41:45 -0500 |
| commit | 73186df8d7fa574345f0ad626ebe89649f8308a5 (patch) | |
| tree | 9e6ed2c499cb5cbbcc79415602f9114503bb6931 /drivers/net/ppp | |
| parent | 0c63d80c3fac4e6eb0f01dff756e47bc7cd50092 (diff) | |
| parent | ebac62fe3d24c0ce22dd83afa7b07d1a2aaef44d (diff) | |
| download | linux-73186df8d7fa574345f0ad626ebe89649f8308a5.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor overlapping changes in net/ipv4/ipmr.c, in 'net' we were
fixing the "BH-ness" of the counter bumps whilst in 'net-next'
the functions were modified to take an explicit 'net' parameter.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ppp')
| -rw-r--r-- | drivers/net/ppp/ppp_generic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index ed00446759b2..9a863c6a6a33 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c @@ -721,10 +721,8 @@ static long ppp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) val &= 0xffff; } vj = slhc_init(val2+1, val+1); - if (!vj) { - netdev_err(ppp->dev, - "PPP: no memory (VJ compressor)\n"); - err = -ENOMEM; + if (IS_ERR(vj)) { + err = PTR_ERR(vj); break; } ppp_lock(ppp); |