Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0dacca1f authored by James Ketrenos's avatar James Ketrenos Committed by Jeff Garzik
Browse files

[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: default avatarJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 3a5becf7

drivers/net/wireless/ipw2200.c

+5 −4
Original line number Diff line number Diff line
@@ -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,7 +4967,8 @@ static void ipw_rx(struct ipw_priv *priv) 
#endif



				header =

				    (struct ieee80211_hdr *)(rxb->skb->data +

				    (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
@@ -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;

drivers/net/wireless/ipw2200.h

+2 −2
Original line number Diff line number Diff line
@@ -1654,12 +1654,12 @@ static const long ipw_frequencies[] = { 


#define IPW_MAX_CONFIG_RETRIES 10



static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)

static inline u32 frame_hdr_len(struct ieee80211_hdr_4addr *hdr)

{

	u32 retval;

	u16 fc;



	retval = sizeof(struct ieee80211_hdr);

	retval = sizeof(struct ieee80211_hdr_3addr);

	fc = le16_to_cpu(hdr->frame_ctl);



	/*