commit 3a5becf720d6346ffca2d6be6473f603b39322a2
author James Ketrenos <jketreno@linux.intel.com> Wed Sep 21 12:23:37 2005 -0500
committer Jeff Garzik <jgarzik@pobox.com> Wed Sep 21 23:00:57 2005 -0400
tree 0084320b04b04b2d61e4630505803104251205a6
parent 99a4b232b6682a847c70d877e4a3c15e9138c8f6

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

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>

drivers/net/wireless/ipw2100.c

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index 8dc80f8..ad7f8cd 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -3269,7 +3269,8 @@
 	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;