diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 14:37:22 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-06-08 14:37:22 -0600 |
| commit | b6336ca2982ccac98d9d017426c53ff1e13c017f (patch) | |
| tree | 26d7c5b1999cab1db6d2178d37a366a10a22ba7f /drivers/net/wan/x25_asy.c | |
| parent | a80fd9db0e1909a03e5d5a29e2e73001e38d12f5 (diff) | |
| parent | 59c5f46fbe01a00eedf54a23789634438bb80603 (diff) | |
Merge remote-tracking branch 'origin' into spi/merge
Diffstat (limited to 'drivers/net/wan/x25_asy.c')
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 40398bf7d03..24297b274cd 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -517,18 +517,17 @@ static int x25_asy_close(struct net_device *dev) * and sent on to some IP layer for further processing. */ -static unsigned int x25_asy_receive_buf(struct tty_struct *tty, +static void x25_asy_receive_buf(struct tty_struct *tty, const unsigned char *cp, char *fp, int count) { struct x25_asy *sl = tty->disc_data; - int bytes = count; if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev)) return; /* Read the characters out of the buffer */ - while (bytes--) { + while (count--) { if (fp && *fp++) { if (!test_and_set_bit(SLF_ERROR, &sl->flags)) sl->dev->stats.rx_errors++; @@ -537,8 +536,6 @@ static unsigned int x25_asy_receive_buf(struct tty_struct *tty, } x25_asy_unesc(sl, *cp++); } - - return count; } /* |