aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/ipw2200.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 3f8372daf46a..3838f9f9a47a 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -10459,12 +10459,12 @@ static void ipw_handle_promiscuous_tx(struct ipw_priv *priv,
10459} 10459}
10460#endif 10460#endif
10461 10461
10462static int ipw_net_hard_start_xmit(struct libipw_txb *txb, 10462static netdev_tx_t ipw_net_hard_start_xmit(struct libipw_txb *txb,
10463 struct net_device *dev, int pri) 10463 struct net_device *dev, int pri)
10464{ 10464{
10465 struct ipw_priv *priv = libipw_priv(dev); 10465 struct ipw_priv *priv = libipw_priv(dev);
10466 unsigned long flags; 10466 unsigned long flags;
10467 int ret; 10467 netdev_tx_t ret;
10468 10468
10469 IPW_DEBUG_TX("dev->xmit(%d bytes)\n", txb->payload_size); 10469 IPW_DEBUG_TX("dev->xmit(%d bytes)\n", txb->payload_size);
10470 spin_lock_irqsave(&priv->lock, flags); 10470 spin_lock_irqsave(&priv->lock, flags);
@@ -11602,7 +11602,8 @@ static int ipw_prom_stop(struct net_device *dev)
11602 return 0; 11602 return 0;
11603} 11603}
11604 11604
11605static int ipw_prom_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) 11605static netdev_tx_t ipw_prom_hard_start_xmit(struct sk_buff *skb,
11606 struct net_device *dev)
11606{ 11607{
11607 IPW_DEBUG_INFO("prom dev->xmit\n"); 11608 IPW_DEBUG_INFO("prom dev->xmit\n");
11608 dev_kfree_skb(skb); 11609 dev_kfree_skb(skb);