leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] ieee80211: Updated ipw2100 to be compatible with ieee80211_hdr changes

Browse Source 
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>
This commit is contained in:
James Ketrenos 2005-09-21 12:23:25 -05:00 committed by Jeff Garzik
parent a3536c839f
commit 99a4b232b6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ipw2100.c
View File

@ -2948,7 +2948,7 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv)
int next = txq->next; int next = txq->next;
int i = 0; int i = 0;
struct ipw2100_data_header *ipw_hdr; struct ipw2100_data_header *ipw_hdr;
struct ieee80211_hdr *hdr; struct ieee80211_hdr_3addr *hdr;
while (!list_empty(&priv->tx_pend_list)) { while (!list_empty(&priv->tx_pend_list)) {
/* if there isn't enough space in TBD queue, then /* 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; packet->index = txq->next;
ipw_hdr = packet->info.d_struct.data; 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; fragments[0]->data;
if (priv->ieee->iw_mode == IW_MODE_INFRA) { if (priv->ieee->iw_mode == IW_MODE_INFRA) {

2
drivers/net/wireless/ipw2100.h
View File

@ -808,7 +808,7 @@ struct ipw2100_priv {
struct ipw2100_rx { struct ipw2100_rx {
union { union {
unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH]; unsigned char payload[IPW_RX_NIC_BUFFER_LENGTH];
struct ieee80211_hdr header; struct ieee80211_hdr_4addr header;
u32 status; u32 status;
struct ipw2100_notification notification; struct ipw2100_notification notification;
struct ipw2100_cmd_header command; struct ipw2100_cmd_header command;