lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tokenring: convert to netdev_tx_t

Browse Source 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2009-08-31 19:50:46 +00:00
committed by David S. Miller
parent 25a79c41ce
commit 61a8410854
6 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/tokenring/lanstreamer.c
View File

@@ -203,7 +203,8 @@ static int streamer_ioctl(struct net_device *, struct ifreq *, int);
static int streamer_reset(struct net_device *dev);
static int streamer_open(struct net_device *dev);
static int streamer_xmit(struct sk_buff *skb, struct net_device *dev);
static netdev_tx_t streamer_xmit(struct sk_buff *skb,
struct net_device *dev);
static int streamer_close(struct net_device *dev);
static void streamer_set_rx_mode(struct net_device *dev);
static irqreturn_t streamer_interrupt(int irq, void *dev_id);
@@ -1141,7 +1142,8 @@ static irqreturn_t streamer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
static int streamer_xmit(struct sk_buff *skb, struct net_device *dev)
static netdev_tx_t streamer_xmit(struct sk_buff *skb,
struct net_device *dev)
{
struct streamer_private *streamer_priv =
netdev_priv(dev);