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

Commit b6b1ac69 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

Staging: r8187se: Fix compile error from wireless-testing commit 7044cc56 



In wireless-testing, commit 7044cc56 added struct ieee80211_hdr_3addr
to include/linux/ieee80211.h. This definition collides with one that is
in the r8187se driver in staging.

The conflict is resolved by changing r8187se to use the definition from
include/linuc/ieee80211.h.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a0f2e0fc

drivers/staging/rtl8187se/ieee80211/ieee80211.h

+0 −9
Original line number Diff line number Diff line
@@ -482,15 +482,6 @@ struct ieee80211_header_data { 
	u16 seq_ctrl;

};



struct ieee80211_hdr_3addr {

	u16 frame_ctl;

	u16 duration_id;

	u8 addr1[ETH_ALEN];

	u8 addr2[ETH_ALEN];

	u8 addr3[ETH_ALEN];

	u16 seq_ctl;

} __attribute__ ((packed));



struct ieee80211_hdr_4addr {

	u16 frame_ctl;

	u16 duration_id;

drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c

+12 −12
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee 


			enqueue_mgmt(ieee,skb);

		}else{

			header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0]<<4);

			header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0]<<4);



			if (ieee->seq_ctrl[0] == 0xFFF)

				ieee->seq_ctrl[0] = 0;
@@ -220,7 +220,7 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *ieee 
		spin_unlock_irqrestore(&ieee->lock, flags);

		spin_lock_irqsave(&ieee->mgmt_tx_lock, flags);



		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);

		header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);



		if (ieee->seq_ctrl[0] == 0xFFF)

			ieee->seq_ctrl[0] = 0;
@@ -246,7 +246,7 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *i 


	if(single){



		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);

		header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);



		if (ieee->seq_ctrl[0] == 0xFFF)

			ieee->seq_ctrl[0] = 0;
@@ -259,7 +259,7 @@ inline void softmac_ps_mgmt_xmit(struct sk_buff *skb, struct ieee80211_device *i 


	}else{



		header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);

		header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);



		if (ieee->seq_ctrl[0] == 0xFFF)

			ieee->seq_ctrl[0] = 0;
@@ -287,7 +287,7 @@ inline struct sk_buff *ieee80211_disassociate_skb( 
		return NULL;



	disass = (struct ieee80211_disassoc_frame *) skb_put(skb,sizeof(struct ieee80211_disassoc_frame));

	disass->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_DISASSOC);

	disass->header.frame_control = cpu_to_le16(IEEE80211_STYPE_DISASSOC);

	disass->header.duration_id = 0;



	memcpy(disass->header.addr1, beacon->bssid, ETH_ALEN);
@@ -905,7 +905,7 @@ struct sk_buff* ieee80211_assoc_resp(struct ieee80211_device *ieee, u8 *dest) 
	assoc = (struct ieee80211_assoc_response_frame *)

		skb_put(skb,sizeof(struct ieee80211_assoc_response_frame));



	assoc->header.frame_ctl = cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP);

	assoc->header.frame_control = cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP);

	memcpy(assoc->header.addr1, dest,ETH_ALEN);

	memcpy(assoc->header.addr3, ieee->dev->dev_addr, ETH_ALEN);

	memcpy(assoc->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
@@ -981,7 +981,7 @@ struct sk_buff* ieee80211_null_func(struct ieee80211_device *ieee,short pwr) 
	memcpy(hdr->addr2, ieee->dev->dev_addr, ETH_ALEN);

	memcpy(hdr->addr3, ieee->current_network.bssid, ETH_ALEN);



	hdr->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA |

	hdr->frame_control = cpu_to_le16(IEEE80211_FTYPE_DATA |

		IEEE80211_STYPE_NULLFUNC | IEEE80211_FCTL_TODS |

		(pwr ? IEEE80211_FCTL_PM:0));
@@ -1084,7 +1084,7 @@ inline struct sk_buff *ieee80211_association_req(struct ieee80211_network *beaco 
		skb_put(skb, sizeof(struct ieee80211_assoc_request_frame));





	hdr->header.frame_ctl = IEEE80211_STYPE_ASSOC_REQ;

	hdr->header.frame_control = IEEE80211_STYPE_ASSOC_REQ;

	hdr->header.duration_id= 37; //FIXME

	memcpy(hdr->header.addr1, beacon->bssid, ETH_ALEN);

	memcpy(hdr->header.addr2, ieee->dev->dev_addr, ETH_ALEN);
@@ -1786,11 +1786,11 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, 


		tasklet_schedule(&ieee->ps_task);



	if(WLAN_FC_GET_STYPE(header->frame_ctl) != IEEE80211_STYPE_PROBE_RESP &&

		WLAN_FC_GET_STYPE(header->frame_ctl) != IEEE80211_STYPE_BEACON)

	if (WLAN_FC_GET_STYPE(header->frame_control) != IEEE80211_STYPE_PROBE_RESP &&

		WLAN_FC_GET_STYPE(header->frame_control) != IEEE80211_STYPE_BEACON)

		ieee->last_rx_ps_time = jiffies;



	switch (WLAN_FC_GET_STYPE(header->frame_ctl)) {

	switch (WLAN_FC_GET_STYPE(header->frame_control)) {



		case IEEE80211_STYPE_ASSOC_RESP:

		case IEEE80211_STYPE_REASSOC_RESP:
@@ -2064,7 +2064,7 @@ void ieee80211_wake_queue(struct ieee80211_device *ieee) 


			header = (struct ieee80211_hdr_3addr  *) skb->data;



			header->seq_ctl = cpu_to_le16(ieee->seq_ctrl[0] << 4);

			header->seq_ctrl = cpu_to_le16(ieee->seq_ctrl[0] << 4);



			if (ieee->seq_ctrl[0] == 0xFFF)

				ieee->seq_ctrl[0] = 0;

drivers/staging/rtl8187se/r8180_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1909,7 +1909,7 @@ rate) 
	struct r8180_priv *priv = (struct r8180_priv *)ieee80211_priv(dev);

	int mode;

	struct ieee80211_hdr_3addr  *h = (struct ieee80211_hdr_3addr  *) skb->data;

	short morefrag = (h->frame_ctl) & IEEE80211_FCTL_MOREFRAGS;

	short morefrag = (h->frame_control) & IEEE80211_FCTL_MOREFRAGS;

	unsigned long flags;

	int priority;
@@ -2177,7 +2177,7 @@ short rtl8180_tx(struct net_device *dev, u8* txbuf, int len, int priority, 
				TxDescDuration = ThisFrameTime + aSifsTime + AckTime;

			}



			if(!(frag_hdr->frame_ctl & IEEE80211_FCTL_MOREFRAGS)) { //no more fragment

			if (!(frag_hdr->frame_control & IEEE80211_FCTL_MOREFRAGS)) {

				// ThisFrame-ACK.

				Duration = aSifsTime + AckTime;

			} else { // One or more fragments remained.