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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/inaky/wimax
[safe/jmp/linux-2.6]
/
drivers
/
net
/
wimax
/
i2400m
/
netdev.c
diff --git
a/drivers/net/wimax/i2400m/netdev.c
b/drivers/net/wimax/i2400m/netdev.c
index
7d7b5ef
..
94742e1
100644
(file)
--- a/
drivers/net/wimax/i2400m/netdev.c
+++ b/
drivers/net/wimax/i2400m/netdev.c
@@
-253,7
+253,6
@@
void i2400m_net_wake_stop(struct i2400m *i2400m)
kfree_skb(wake_tx_skb);
}
d_fnend(3, dev, "(i2400m %p) = void\n", i2400m);
- return;
}
@@
-432,7
+431,6
@@
void i2400m_tx_timeout(struct net_device *net_dev)
* this, there might be data pending to be sent or not...
*/
net_dev->stats.tx_errors++;
- return;
}