Commit 2a784784 authored by Luc Van Oostenryck's avatar Luc Van Oostenryck Committed by David S. Miller

cxgb4vf: fix t4vf_eth_xmit()'s return type

The method ndo_start_xmit() is defined as returning an 'netdev_tx_t',
which is a typedef for an enum type, but the implementation in this
driver returns an 'int'.

Fix this by returning 'netdev_tx_t' in this driver too.
Signed-off-by: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 433f17a9
...@@ -562,7 +562,7 @@ int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *, ...@@ -562,7 +562,7 @@ int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *,
unsigned int); unsigned int);
void t4vf_free_sge_resources(struct adapter *); void t4vf_free_sge_resources(struct adapter *);
int t4vf_eth_xmit(struct sk_buff *, struct net_device *); netdev_tx_t t4vf_eth_xmit(struct sk_buff *, struct net_device *);
int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *, int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *,
const struct pkt_gl *); const struct pkt_gl *);
......
...@@ -1154,7 +1154,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n) ...@@ -1154,7 +1154,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n)
* *
* Add a packet to an SGE Ethernet TX queue. Runs with softirqs disabled. * Add a packet to an SGE Ethernet TX queue. Runs with softirqs disabled.
*/ */
int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev) netdev_tx_t t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
u32 wr_mid; u32 wr_mid;
u64 cntrl, *end; u64 cntrl, *end;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment