[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211's hard_start_xmit...

tree ee48cbe413b795d6be454b9baf4f3bd3d74814cb
parent 49856b147763bd6847e0d8f53aee1ddd61385638
author James Ketrenos <jketreno@linux.intel.com> 1126716634 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127316024 -0500

Updated ipw2100 to be compatible with ieee80211's hard_start_xmit change.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 8dc80f806c34d295dfec82901762a279fc5d795f..ad7f8cd76db9041376b19a024a74dc38ac5854b4 100644 (file)
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -3269,7 +3269,8 @@ static irqreturn_t ipw2100_interrupt(int irq, void *data,
        return IRQ_NONE;
 }
 
-static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev)
+static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev,
+                     int pri)
 {
        struct ipw2100_priv *priv = ieee80211_priv(dev);
        struct list_head *element;