diff options
Diffstat (limited to 'drivers/net/cxgb3')
-rw-r--r-- | drivers/net/cxgb3/adapter.h | 2 | ||||
-rw-r--r-- | drivers/net/cxgb3/sge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h index 74723f2e7431..2b1aea6aa558 100644 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h | |||
@@ -309,7 +309,7 @@ void t3_stop_sge_timers(struct adapter *adap); | |||
309 | void t3_free_sge_resources(struct adapter *adap); | 309 | void t3_free_sge_resources(struct adapter *adap); |
310 | void t3_sge_err_intr_handler(struct adapter *adapter); | 310 | void t3_sge_err_intr_handler(struct adapter *adapter); |
311 | irq_handler_t t3_intr_handler(struct adapter *adap, int polling); | 311 | irq_handler_t t3_intr_handler(struct adapter *adap, int polling); |
312 | int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev); | 312 | netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev); |
313 | int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb); | 313 | int t3_mgmt_tx(struct adapter *adap, struct sk_buff *skb); |
314 | void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p); | 314 | void t3_update_qset_coalesce(struct sge_qset *qs, const struct qset_params *p); |
315 | int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, | 315 | int t3_sge_alloc_qset(struct adapter *adapter, unsigned int id, int nports, |
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, | |||
1216 | * | 1216 | * |
1217 | * Add a packet to an SGE Tx queue. Runs with softirqs disabled. | 1217 | * Add a packet to an SGE Tx queue. Runs with softirqs disabled. |
1218 | */ | 1218 | */ |
1219 | int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) | 1219 | netdev_tx_t t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) |
1220 | { | 1220 | { |
1221 | int qidx; | 1221 | int qidx; |
1222 | unsigned int ndesc, pidx, credits, gen, compl; | 1222 | unsigned int ndesc, pidx, credits, gen, compl; |