From da3978d9857b48b7066d7d86571737051a945179 Mon Sep 17 00:00:00 2001 From: "kirjanov@gmail.com" Date: Wed, 24 Feb 2010 10:25:33 +0000 Subject: [PATCH] --- yaml --- r: 184506 b: refs/heads/master c: 41a655ba5654e47847505c164f77f8190ca9ed27 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/greth.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 491940b33d4d..7161813d662a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e382c3018ad19744d3c5d281daf4b0e9f052af66 +refs/heads/master: 41a655ba5654e47847505c164f77f8190ca9ed27 diff --git a/trunk/drivers/net/greth.c b/trunk/drivers/net/greth.c index d2032339f6de..d75b46141603 100644 --- a/trunk/drivers/net/greth.c +++ b/trunk/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 @@ 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_gbit(struct sk_buff *skb, struct net_device *dev) { struct greth_private *greth = netdev_priv(dev); struct greth_bd *bdp;