Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338441
b: refs/heads/master
c: a547e5e
h: refs/heads/master
i:
  338439: 6db754d
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed Nov 21, 2012
1 parent 197ac55 commit 7d7cf74
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1e619a1bf9ac878e6a984e4e279ccf712a65bc23
refs/heads/master: a547e5e0d8b85ccc640756eb40b3dd6b33796cf8
6 changes: 3 additions & 3 deletions trunk/drivers/staging/dgrp/dgrp_net_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -2495,7 +2495,7 @@ static void dgrp_receive(struct nd_struct *nd)

/*
* Fabricate and insert a data packet header to
* preceed the remaining data when it comes in.
* preced the remaining data when it comes in.
*/

if (remain < plen) {
Expand Down Expand Up @@ -2664,7 +2664,7 @@ static void dgrp_receive(struct nd_struct *nd)
}

/*
* Handle delayed response arrival preceeding
* Handle delayed response arrival preceding
* the open response we are waiting for.
*/

Expand Down Expand Up @@ -3502,7 +3502,7 @@ void dgrp_poll_handler(unsigned long arg)
/*
* Decrement statistics. These are only for use with
* KME, so don't worry that the operations are done
* unlocked, and so the results are occassionally wrong.
* unlocked, and so the results are occasionally wrong.
*/

nd->nd_read_count -= (nd->nd_read_count +
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/dgrp/dgrp_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ static void drp_param(struct ch_struct *ch)
/*
* From the POSIX.1 spec (7.1.2.6): "If {_POSIX_VDISABLE}
* is defined for the terminal device file, and the value
* of one of the changable special control characters (see
* of one of the changeable special control characters (see
* 7.1.1.9) is {_POSIX_VDISABLE}, that function shall be
* disabled, that is, no input data shall be recognized as
* the disabled special character."
Expand Down Expand Up @@ -2699,7 +2699,7 @@ static int dgrp_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
- looking at the tty_ioctl code, these command all call our
tty_set_termios at the driver's end, when a TCSETA* is sent,
it is expecting the tty to have a termio structure,
NOT a termios stucture. These two structures differ in size
NOT a termios structure. These two structures differ in size
and the tty_ioctl code does a conversion before processing them both.
- we should treat the TCSETAW TCSETAF ioctls the same, and let
the tty_ioctl code do the conversion stuff.
Expand Down Expand Up @@ -2996,7 +2996,7 @@ static void dgrp_tty_start(struct tty_struct *tty)
}

/*
* Stop the reciever
* Stop the receiver
*/
static void dgrp_tty_input_stop(struct tty_struct *tty)
{
Expand Down

0 comments on commit 7d7cf74

Please sign in to comment.