projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'thinkpad' into release
[linux-2.6-block.git]
/
drivers
/
net
/
3c505.c
diff --git
a/drivers/net/3c505.c
b/drivers/net/3c505.c
index f71b3540275540bb927446d6958265d642e7f8bf..a21c9d15ef8a53cfd6678c92a4136d23f3a09c3a 100644
(file)
--- a/
drivers/net/3c505.c
+++ b/
drivers/net/3c505.c
@@
-976,7
+976,7
@@
static int elp_open(struct net_device *dev)
*
******************************************************/
*
******************************************************/
-static
bool
send_packet(struct net_device *dev, struct sk_buff *skb)
+static
netdev_tx_t
send_packet(struct net_device *dev, struct sk_buff *skb)
{
elp_device *adapter = netdev_priv(dev);
unsigned long target;
{
elp_device *adapter = netdev_priv(dev);
unsigned long target;
@@
-1067,7
+1067,7
@@
static void elp_timeout(struct net_device *dev)
*
******************************************************/
*
******************************************************/
-static
in
t elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static
netdev_tx_
t elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
unsigned long flags;
elp_device *adapter = netdev_priv(dev);
{
unsigned long flags;
elp_device *adapter = netdev_priv(dev);
@@
-1101,7
+1101,7
@@
static int elp_start_xmit(struct sk_buff *skb, struct net_device *dev)
prime_rx(dev);
spin_unlock_irqrestore(&adapter->lock, flags);
netif_start_queue(dev);
prime_rx(dev);
spin_unlock_irqrestore(&adapter->lock, flags);
netif_start_queue(dev);
- return
0
;
+ return
NETDEV_TX_OK
;
}
/******************************************************
}
/******************************************************