diff options
| author | James Ketrenos <jketreno@linux.intel.com> | 2005-09-21 12:23:25 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-21 23:00:57 -0400 |
| commit | 99a4b232b6682a847c70d877e4a3c15e9138c8f6 (patch) | |
| tree | 7dacb727771de8dc9318beb81752f3c5f22adab2 /drivers/net/wireless | |
| parent | a3536c839f04682ed06c84a7f75968c27c6108c8 (diff) | |
[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211_hdr changes
tree 992b203395c50342f1cced415acae6177344e270
parent c59bb604a2ff4e40232ff0422e7adc44e3b007a0
author James Ketrenos <jketreno@linux.intel.com> 1126714006 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127315910 -0500
Updated ipw2100 to be compatible with ieee80211_hdr changes.
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 | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/ipw2100.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index e5cdb5bfabc8..8dc80f806c34 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -2948,7 +2948,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) int next = txq->next; int i = 0; struct ipw2100_data_header *ipw_hdr; - struct ieee80211_hdr *hdr; + struct ieee80211_hdr_3addr *hdr; while (!list_empty(&priv->tx_pend_list)) { /* if there isn't enough space in TBD queue, then @@ -2984,7 +2984,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) packet->index = txq->next; ipw_hdr = packet->info.d_struct.data; - hdr = (struct ieee80211_hdr *)packet->info.d_struct.txb-> + hdr = (struct ieee80211_hdr_3addr *)packet->info.d_struct.txb-> fragments[0]->data; if (priv->ieee->iw_mode == IW_MODE_INFRA) { diff --git a/drivers/net/wireless/ipw2100.h b/drivers/net/wireless/ipw2100.h index 2a3cdbd50168..c9e99ce15d66 100644 --- a/drivers/net/wireless/ipw2100.h +++ b/drivers/net/wireless/ipw2100.h @@ -808,7 +808,7 @@ struct ipw2100_priv { struct ipw2100_rx { union { unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH]; - struct ieee80211_hdr header; + struct ieee80211_hdr_4addr header; u32 status; struct ipw2100_notification notification; struct ipw2100_cmd_header command; |