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 branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...
[safe/jmp/linux-2.6]
/
drivers
/
net
/
ps3_gelic_net.c
diff --git
a/drivers/net/ps3_gelic_net.c
b/drivers/net/ps3_gelic_net.c
index
13d1c0a
..
e565039
100644
(file)
--- a/
drivers/net/ps3_gelic_net.c
+++ b/
drivers/net/ps3_gelic_net.c
@@
-556,7
+556,6
@@
static int gelic_net_stop(struct net_device *netdev)
{
struct gelic_net_card *card = netdev_priv(netdev);
- netif_poll_disable(netdev);
netif_stop_queue(netdev);
/* turn off DMA, force end */