diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-08 14:05:59 -0500 |
| commit | 7f46b1343f723f98634a5dcee47856b2000079ed (patch) | |
| tree | ed22b6298c8dd2f687890a0d79abcd1d273b5f81 /drivers/net/slip.h | |
| parent | b8c31da64165b8566fc6e1c9c826f76e7b98ff02 (diff) | |
| parent | 9e42d0cf5020aaf217433cad1a224745241d212a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/slip.h')
| -rw-r--r-- | drivers/net/slip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/slip.h b/drivers/net/slip.h index 853e0f6ec710..9ea5c11287d2 100644 --- a/drivers/net/slip.h +++ b/drivers/net/slip.h | |||
| @@ -75,7 +75,7 @@ struct slip { | |||
| 75 | unsigned long tx_errors; /* Planned stuff */ | 75 | unsigned long tx_errors; /* Planned stuff */ |
| 76 | unsigned long rx_dropped; /* No memory for skb */ | 76 | unsigned long rx_dropped; /* No memory for skb */ |
| 77 | unsigned long tx_dropped; /* When MTU change */ | 77 | unsigned long tx_dropped; /* When MTU change */ |
| 78 | unsigned long rx_over_errors; /* Frame bigger then SLIP buf. */ | 78 | unsigned long rx_over_errors; /* Frame bigger than SLIP buf. */ |
| 79 | #ifdef SL_INCLUDE_CSLIP | 79 | #ifdef SL_INCLUDE_CSLIP |
| 80 | unsigned long tx_compressed; | 80 | unsigned long tx_compressed; |
| 81 | unsigned long rx_compressed; | 81 | unsigned long rx_compressed; |