diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 11:33:59 +1000 |
| commit | 4f130f0d56141feae10c8a1140a74f8d227c0638 (patch) | |
| tree | 845fb5ac2d240489ad4b68af6ca57aa34b71e048 /drivers/net/cxgb3/sge.c | |
| parent | 81957a36b93cd372fb4cfb476c0481d4a9c08ded (diff) | |
| parent | 55f9d6786de2f9cf37db50dbe8ae16f887f3ad7f (diff) | |
Merge commit 'net/master'
Diffstat (limited to 'drivers/net/cxgb3/sge.c')
| -rw-r--r-- | drivers/net/cxgb3/sge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 29c79eb43beb..f86612857a73 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c @@ -1216,7 +1216,7 @@ static inline void t3_stop_tx_queue(struct netdev_queue *txq, * * Add a packet to an SGE Tx queue. Runs with softirqs disabled. */ -int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) +netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) { int qidx; unsigned int ndesc, pidx, credits, gen, compl; |