Skip to content

Commit 2a78478

Browse files
lucvoodavem330
authored andcommitted
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: Luc Van Oostenryck <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 433f17a commit 2a78478

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/net/ethernet/chelsio/cxgb4vf/adapter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ int t4vf_sge_alloc_eth_txq(struct adapter *, struct sge_eth_txq *,
562562
unsigned int);
563563
void t4vf_free_sge_resources(struct adapter *);
564564

565-
int t4vf_eth_xmit(struct sk_buff *, struct net_device *);
565+
netdev_tx_t t4vf_eth_xmit(struct sk_buff *, struct net_device *);
566566
int t4vf_ethrx_handler(struct sge_rspq *, const __be64 *,
567567
const struct pkt_gl *);
568568

drivers/net/ethernet/chelsio/cxgb4vf/sge.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ static inline void txq_advance(struct sge_txq *tq, unsigned int n)
11541154
*
11551155
* Add a packet to an SGE Ethernet TX queue. Runs with softirqs disabled.
11561156
*/
1157-
int t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
1157+
netdev_tx_t t4vf_eth_xmit(struct sk_buff *skb, struct net_device *dev)
11581158
{
11591159
u32 wr_mid;
11601160
u64 cntrl, *end;

0 commit comments

Comments
 (0)