diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-04 13:38:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-04 13:38:31 -0700 |
| commit | e990b37b906b6137d353ef2a918e15e5763d70ec (patch) | |
| tree | e802458ee43d4b0a2b6d39eb25929858ceb7fd61 /drivers/net/caif | |
| parent | 34624d6631b6b3a1df16407a847286bb6233a96b (diff) | |
| parent | 23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/caif')
| -rw-r--r-- | drivers/net/caif/caif_serial.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/caif/caif_serial.c b/drivers/net/caif/caif_serial.c index 73c7e03617ec..3df0c0f8b8bf 100644 --- a/drivers/net/caif/caif_serial.c +++ b/drivers/net/caif/caif_serial.c @@ -167,8 +167,8 @@ static inline void debugfs_tx(struct ser_device *ser, const u8 *data, int size) #endif -static unsigned int ldisc_receive(struct tty_struct *tty, - const u8 *data, char *flags, int count) +static void ldisc_receive(struct tty_struct *tty, const u8 *data, + char *flags, int count) { struct sk_buff *skb = NULL; struct ser_device *ser; @@ -215,8 +215,6 @@ static unsigned int ldisc_receive(struct tty_struct *tty, } else ++ser->dev->stats.rx_dropped; update_tty_status(ser); - - return count; } static int handle_tx(struct ser_device *ser) |