summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkirjanov@gmail.com <kirjanov@gmail.com>2010-02-24 11:25:33 +0100
committerDavid S. Miller <davem@davemloft.net>2010-02-26 11:08:47 +0100
commit41a655ba5654e47847505c164f77f8190ca9ed27 (patch)
treeed2a522363e0cf18e8e3b0f6d0466977a02772e0
parentsis190: handle DMA mapping errors (diff)
downloadlinux-41a655ba5654e47847505c164f77f8190ca9ed27.tar.xz
linux-41a655ba5654e47847505c164f77f8190ca9ed27.zip
greth: convert to netdev_tx_t
Convert to netdev_tx_t Signed-off-by: Denis Kirjanov <kirjanov@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/greth.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index d2032339f6de..d75b46141603 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -66,8 +66,10 @@ module_param(greth_edcl, int, 0);
MODULE_PARM_DESC(greth_edcl, "GRETH EDCL usage indicator. Set to 1 if EDCL is used.");
static int greth_open(struct net_device *dev);
-static int greth_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static int greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev);
+static netdev_tx_t greth_start_xmit(struct sk_buff *skb,
+ struct net_device *dev);
+static netdev_tx_t greth_start_xmit_gbit(struct sk_buff *skb,
+ struct net_device *dev);
static int greth_rx(struct net_device *dev, int limit);
static int greth_rx_gbit(struct net_device *dev, int limit);
static void greth_clean_tx(struct net_device *dev);
@@ -379,7 +381,8 @@ static int greth_close(struct net_device *dev)
return 0;
}
-static int greth_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t
+greth_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
struct greth_private *greth = netdev_priv(dev);
struct greth_bd *bdp;
@@ -441,7 +444,8 @@ out:
}
-static int greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t
+greth_start_xmit_gbit(struct sk_buff *skb, struct net_device *dev)
{
struct greth_private *greth = netdev_priv(dev);
struct greth_bd *bdp;