git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sis900.c
diff --git
a/drivers/net/sis900.c
b/drivers/net/sis900.c
index
ec95e49
..
fa3a460
100644
(file)
--- a/
drivers/net/sis900.c
+++ b/
drivers/net/sis900.c
@@
-1766,7
+1766,7
@@
static int sis900_rx(struct net_device *net_dev)
skb = sis_priv->rx_skbuff[entry];
net_dev->stats.rx_dropped++;
goto refill_rx_ring;
- }
+ }
/* This situation should never happen, but due to
some unknow bugs, it is possible that