diff options
| author | James Ketrenos <jketreno@linux.intel.com> | 2005-09-21 13:23:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-21 23:00:57 -0400 |
| commit | 3a5becf720d6346ffca2d6be6473f603b39322a2 (patch) | |
| tree | 0084320b04b04b2d61e4630505803104251205a6 /drivers/net/wireless | |
| parent | 99a4b232b6682a847c70d877e4a3c15e9138c8f6 (diff) | |
[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>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 8dc80f806c34..ad7f8cd76db9 100644 --- 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, | |||
| 3269 | return IRQ_NONE; | 3269 | return IRQ_NONE; |
| 3270 | } | 3270 | } |
| 3271 | 3271 | ||
| 3272 | static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev) | 3272 | static int ipw2100_tx(struct ieee80211_txb *txb, struct net_device *dev, |
| 3273 | int pri) | ||
| 3273 | { | 3274 | { |
| 3274 | struct ipw2100_priv *priv = ieee80211_priv(dev); | 3275 | struct ipw2100_priv *priv = ieee80211_priv(dev); |
| 3275 | struct list_head *element; | 3276 | struct list_head *element; |