diff options
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/x25_asy.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index 24297b274cd4..40398bf7d036 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
@@ -517,17 +517,18 @@ static int x25_asy_close(struct net_device *dev) | |||
517 | * and sent on to some IP layer for further processing. | 517 | * and sent on to some IP layer for further processing. |
518 | */ | 518 | */ |
519 | 519 | ||
520 | static void x25_asy_receive_buf(struct tty_struct *tty, | 520 | static unsigned int x25_asy_receive_buf(struct tty_struct *tty, |
521 | const unsigned char *cp, char *fp, int count) | 521 | const unsigned char *cp, char *fp, int count) |
522 | { | 522 | { |
523 | struct x25_asy *sl = tty->disc_data; | 523 | struct x25_asy *sl = tty->disc_data; |
524 | int bytes = count; | ||
524 | 525 | ||
525 | if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev)) | 526 | if (!sl || sl->magic != X25_ASY_MAGIC || !netif_running(sl->dev)) |
526 | return; | 527 | return; |
527 | 528 | ||
528 | 529 | ||
529 | /* Read the characters out of the buffer */ | 530 | /* Read the characters out of the buffer */ |
530 | while (count--) { | 531 | while (bytes--) { |
531 | if (fp && *fp++) { | 532 | if (fp && *fp++) { |
532 | if (!test_and_set_bit(SLF_ERROR, &sl->flags)) | 533 | if (!test_and_set_bit(SLF_ERROR, &sl->flags)) |
533 | sl->dev->stats.rx_errors++; | 534 | sl->dev->stats.rx_errors++; |
@@ -536,6 +537,8 @@ static void x25_asy_receive_buf(struct tty_struct *tty, | |||
536 | } | 537 | } |
537 | x25_asy_unesc(sl, *cp++); | 538 | x25_asy_unesc(sl, *cp++); |
538 | } | 539 | } |
540 | |||
541 | return count; | ||
539 | } | 542 | } |
540 | 543 | ||
541 | /* | 544 | /* |