diff options
| author | James Ketrenos | 2005-09-21 19:23:41 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2005-09-22 05:00:57 +0200 |
| commit | 0dacca1f0a53938dd7d5ba35c692bd1a3356d504 (patch) | |
| tree | 1c3e6ddedd1032ef26a4e0f45e8d3b1fa3fd8d96 /drivers/net/wireless/ipw2200.c | |
| parent | [PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211's hard_sta... (diff) | |
| download | kernel-qcow2-linux-0dacca1f0a53938dd7d5ba35c692bd1a3356d504.tar.gz kernel-qcow2-linux-0dacca1f0a53938dd7d5ba35c692bd1a3356d504.tar.xz kernel-qcow2-linux-0dacca1f0a53938dd7d5ba35c692bd1a3356d504.zip | |
[PATCH] ieee80211: Updated ipw2200 to be compatible with ieee80211_hdr changes
tree 9f86c7b4f59249c05c96c360dfaa817995e8a44f
parent 9b09701b2c6254f2fddb009004a14eb5a908714f
author James Ketrenos <jketreno@linux.intel.com> 1126714305 -0500
committer James Ketrenos <jketreno@linux.intel.com> 1127316074 -0500
Updated ipw2200 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/ipw2200.c')
| -rw-r--r-- | drivers/net/wireless/ipw2200.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 86feef732dbb..34f005229ddb 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c @@ -4904,7 +4904,7 @@ static void ipw_rx(struct ipw_priv *priv) { struct ipw_rx_mem_buffer *rxb; struct ipw_rx_packet *pkt; - struct ieee80211_hdr *header; + struct ieee80211_hdr_4addr *header; u32 r, w, i; u8 network_packet; @@ -4967,8 +4967,9 @@ static void ipw_rx(struct ipw_priv *priv) #endif header = - (struct ieee80211_hdr *)(rxb->skb->data + - IPW_RX_FRAME_SIZE); + (struct ieee80211_hdr_4addr *)(rxb->skb-> + data + + IPW_RX_FRAME_SIZE); /* TODO: Check Ad-Hoc dest/source and make sure * that we are actually parsing these packets * correctly -- we should probably use the @@ -6325,7 +6326,7 @@ we need to heavily modify the ieee80211_skb_to_txb. static inline void ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb) { - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) + struct ieee80211_hdr_3addr *hdr = (struct ieee80211_hdr_3addr *) txb->fragments[0]->data; int i = 0; struct tfd_frame *tfd; |