diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /drivers/net/r6040.c | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index e3ebd90ae65..200a363c3bf 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -535,7 +535,7 @@ static int r6040_rx(struct net_device *dev, int limit) | |||
| 535 | /* RX dribble */ | 535 | /* RX dribble */ |
| 536 | if (err & DSC_RX_ERR_DRI) | 536 | if (err & DSC_RX_ERR_DRI) |
| 537 | dev->stats.rx_frame_errors++; | 537 | dev->stats.rx_frame_errors++; |
| 538 | /* Buffer lenght exceeded */ | 538 | /* Buffer length exceeded */ |
| 539 | if (err & DSC_RX_ERR_BUF) | 539 | if (err & DSC_RX_ERR_BUF) |
| 540 | dev->stats.rx_length_errors++; | 540 | dev->stats.rx_length_errors++; |
| 541 | /* Packet too long */ | 541 | /* Packet too long */ |