summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJames Ketrenos <jketreno@linux.intel.com>2005-09-21 12:23:43 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-09-21 23:00:57 -0400
commitc8d42d1ae4518091a20f7212b0591a0f4b0e8ca0 (patch)
treec79676c91d5f8fc12b7ef54625e1bcff8bdab14f /drivers/net
parent0dacca1f0a53938dd7d5ba35c692bd1a3356d504 (diff)
downloadtalos-obmc-linux-c8d42d1ae4518091a20f7212b0591a0f4b0e8ca0.tar.gz
talos-obmc-linux-c8d42d1ae4518091a20f7212b0591a0f4b0e8ca0.zip
[PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211's hard_start_xmit change.
tree 713b6ff3311decfe42d5209f7b2508736d144b85 parent 6465beff0e89779330450dffc2a5e6dc5154eebf author James Ketrenos <jketreno@linux.intel.com> 1126716726 -0500 committer James Ketrenos <jketreno@linux.intel.com> 1127316162 -0500 Updated ipw2200 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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/ipw2200.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 34f005229ddb..7ea9bd58f65f 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6449,7 +6449,7 @@ static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb)
}
static int ipw_net_hard_start_xmit(struct ieee80211_txb *txb,
- struct net_device *dev)
+ struct net_device *dev, int pri)
{
struct ipw_priv *priv = ieee80211_priv(dev);
unsigned long flags;
OpenPOWER on IntegriCloud