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

Commit fb5fe277 authored by George Kadianakis's avatar George Kadianakis Committed by Greg Kroah-Hartman
Browse files

staging: fix rtl8192e compilation errors with mac80211 



This patch series fixes compilation problems that were caused by
function naming conflicts between the rtl8192e driver and the
mac80211 stack.

Signed-off-by: George Kadianakis <desnacked at gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df574b8e

drivers/staging/rtl8192e/ieee80211.h

+6 −6
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ enum _ReasonCode{ 
#define ieee80211_rx_mgt		ieee80211_rx_mgt_rsl



#define ieee80211_get_beacon		ieee80211_get_beacon_rsl

#define ieee80211_wake_queue		ieee80211_wake_queue_rsl

#define ieee80211_stop_queue		ieee80211_stop_queue_rsl

#define ieee80211_rtl_wake_queue		ieee80211_rtl_wake_queue_rsl

#define ieee80211_rtl_stop_queue		ieee80211_rtl_stop_queue_rsl

#define ieee80211_reset_queue		ieee80211_reset_queue_rsl

#define ieee80211_softmac_stop_protocol	ieee80211_softmac_stop_protocol_rsl

#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rsl
@@ -2435,13 +2435,13 @@ extern int ieee80211_encrypt_fragment( 
	struct sk_buff *frag,

	int hdr_len);



extern int ieee80211_xmit(struct sk_buff *skb,

extern int ieee80211_rtl_xmit(struct sk_buff *skb,

			  struct net_device *dev);

extern void ieee80211_txb_free(struct ieee80211_txb *);





/* ieee80211_rx.c */

extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,

extern int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,

			struct ieee80211_rx_stats *rx_stats);

extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,

			     struct ieee80211_hdr_4addr *header,
@@ -2502,8 +2502,8 @@ extern void ieee80211_stop_protocol(struct ieee80211_device *ieee); 
extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);

extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);

extern void ieee80211_reset_queue(struct ieee80211_device *ieee);

extern void ieee80211_wake_queue(struct ieee80211_device *ieee);

extern void ieee80211_stop_queue(struct ieee80211_device *ieee);

extern void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee);

extern void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee);

extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);

extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);

extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);

drivers/staging/rtl8192e/ieee80211/ieee80211.h

+6 −6
Original line number Diff line number Diff line
@@ -333,8 +333,8 @@ enum _ReasonCode{ 
#define ieee80211_rx_mgt		ieee80211_rx_mgt_rsl



#define ieee80211_get_beacon		ieee80211_get_beacon_rsl

#define ieee80211_wake_queue		ieee80211_wake_queue_rsl

#define ieee80211_stop_queue		ieee80211_stop_queue_rsl

#define ieee80211_rtl_wake_queue		ieee80211_rtl_wake_queue_rsl

#define ieee80211_rtl_stop_queue		ieee80211_rtl_stop_queue_rsl

#define ieee80211_reset_queue		ieee80211_reset_queue_rsl

#define ieee80211_softmac_stop_protocol	ieee80211_softmac_stop_protocol_rsl

#define ieee80211_softmac_start_protocol ieee80211_softmac_start_protocol_rsl
@@ -2546,13 +2546,13 @@ extern int ieee80211_encrypt_fragment( 
	struct sk_buff *frag,

	int hdr_len);



extern int ieee80211_xmit(struct sk_buff *skb,

extern int ieee80211_rtl_xmit(struct sk_buff *skb,

			  struct net_device *dev);

extern void ieee80211_txb_free(struct ieee80211_txb *);





/* ieee80211_rx.c */

extern int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,

extern int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,

			struct ieee80211_rx_stats *rx_stats);

extern void ieee80211_rx_mgt(struct ieee80211_device *ieee,

			     struct ieee80211_hdr_4addr *header,
@@ -2613,8 +2613,8 @@ extern void ieee80211_stop_protocol(struct ieee80211_device *ieee); 
extern void ieee80211_softmac_start_protocol(struct ieee80211_device *ieee);

extern void ieee80211_softmac_stop_protocol(struct ieee80211_device *ieee);

extern void ieee80211_reset_queue(struct ieee80211_device *ieee);

extern void ieee80211_wake_queue(struct ieee80211_device *ieee);

extern void ieee80211_stop_queue(struct ieee80211_device *ieee);

extern void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee);

extern void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee);

extern struct sk_buff *ieee80211_get_beacon(struct ieee80211_device *ieee);

extern void ieee80211_start_send_beacons(struct ieee80211_device *ieee);

extern void ieee80211_stop_send_beacons(struct ieee80211_device *ieee);

drivers/staging/rtl8192e/ieee80211/ieee80211_module.c

+5 −5
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) 
	ieee = (struct ieee80211_device *)dev->priv;

#endif

#if 0

	dev->hard_start_xmit = ieee80211_xmit;

	dev->hard_start_xmit = ieee80211_rtl_xmit;

#endif



	memset(ieee, 0, sizeof(struct ieee80211_device)+sizeof_priv);
@@ -333,7 +333,7 @@ extern void ieee80211_crypto_ccmp_exit(void); 
extern int ieee80211_crypto_wep_init(void);

extern void ieee80211_crypto_wep_exit(void);



int __init ieee80211_init(void)

int __init ieee80211_rtl_init(void)

{

	struct proc_dir_entry *e;

	int retval;
@@ -389,7 +389,7 @@ int __init ieee80211_init(void) 
	return 0;

}



void __exit ieee80211_exit(void)

void __exit ieee80211_rtl_exit(void)

{

	if (ieee80211_proc) {

		remove_proc_entry("debug_level", ieee80211_proc);
@@ -412,8 +412,8 @@ module_param(debug, int, 0444); 
MODULE_PARM_DESC(debug, "debug output mask");





//module_exit(ieee80211_exit);

//module_init(ieee80211_init);

//module_exit(ieee80211_rtl_exit);

//module_init(ieee80211_rtl_init);

#endif

#endif

drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c

+1 −1
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ u8 parse_subframe(struct sk_buff *skb, 
/* All received frames are sent to this function. @skb contains the frame in

 * IEEE 802.11 format, i.e., in the format it was sent over air.

 * This function is called only as a tasklet (software IRQ). */

int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,

int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,

		 struct ieee80211_rx_stats *rx_stats)

{

	struct net_device *dev = ieee->dev;

drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c

+12 −12
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ void ieee80211_stop_scan(struct ieee80211_device *ieee) 
}



/* called with ieee->lock held */

void ieee80211_start_scan(struct ieee80211_device *ieee)

void ieee80211_rtl_start_scan(struct ieee80211_device *ieee)

{

#ifdef ENABLE_DOT11D

	if(IS_DOT11D_ENABLE(ieee) )
@@ -1430,7 +1430,7 @@ void ieee80211_associate_step1(struct ieee80211_device *ieee) 
	}

}



void ieee80211_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen)

void ieee80211_rtl_auth_challenge(struct ieee80211_device *ieee, u8 *challenge, int chlen)

{

	u8 *c;

	struct sk_buff *skb;
@@ -2262,7 +2262,7 @@ ieee80211_rx_frame_softmac(struct ieee80211_device *ieee, struct sk_buff *skb, 


								ieee80211_associate_step2(ieee);

							}else{

								ieee80211_auth_challenge(ieee, challenge, chlen);

								ieee80211_rtl_auth_challenge(ieee, challenge, chlen);

							}

						}else{

							ieee->softmac_stats.rx_auth_rs_err++;
@@ -2376,7 +2376,7 @@ void ieee80211_softmac_xmit(struct ieee80211_txb *txb, struct ieee80211_device * 
			 * to check it any more.

			 * */

			//printk("error:no descriptor left@queue_index %d\n", queue_index);

			//ieee80211_stop_queue(ieee);

			//ieee80211_rtl_stop_queue(ieee);

#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE

			skb_queue_tail(&ieee->skb_drv_aggQ[queue_index], txb->fragments[i]);

#else
@@ -2440,7 +2440,7 @@ void ieee80211_reset_queue(struct ieee80211_device *ieee) 


}



void ieee80211_wake_queue(struct ieee80211_device *ieee)

void ieee80211_rtl_wake_queue(struct ieee80211_device *ieee)

{



	unsigned long flags;
@@ -2481,7 +2481,7 @@ exit : 
}





void ieee80211_stop_queue(struct ieee80211_device *ieee)

void ieee80211_rtl_stop_queue(struct ieee80211_device *ieee)

{

	//unsigned long flags;

	//spin_lock_irqsave(&ieee->lock,flags);
@@ -2706,7 +2706,7 @@ void ieee80211_start_bss(struct ieee80211_device *ieee) 


	if (ieee->state == IEEE80211_NOLINK){

		ieee->actscanning = true;

		ieee80211_start_scan(ieee);

		ieee80211_rtl_start_scan(ieee);

	}

	spin_unlock_irqrestore(&ieee->lock, flags);

}
@@ -2775,7 +2775,7 @@ void ieee80211_associate_retry_wq(struct ieee80211_device *ieee) 
	{

		ieee->is_roaming= false;

		ieee->actscanning = true;

		ieee80211_start_scan(ieee);

		ieee80211_rtl_start_scan(ieee);

	}

	spin_unlock_irqrestore(&ieee->lock, flags);
@@ -3497,8 +3497,8 @@ void notify_wx_assoc_event(struct ieee80211_device *ieee) 


#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))

//EXPORT_SYMBOL(ieee80211_get_beacon);

//EXPORT_SYMBOL(ieee80211_wake_queue);

//EXPORT_SYMBOL(ieee80211_stop_queue);

//EXPORT_SYMBOL(ieee80211_rtl_wake_queue);

//EXPORT_SYMBOL(ieee80211_rtl_stop_queue);

//EXPORT_SYMBOL(ieee80211_reset_queue);

//EXPORT_SYMBOL(ieee80211_softmac_stop_protocol);

//EXPORT_SYMBOL(ieee80211_softmac_start_protocol);
@@ -3518,8 +3518,8 @@ void notify_wx_assoc_event(struct ieee80211_device *ieee) 
//EXPORT_SYMBOL(ieee80211_start_scan_syncro);

#else

EXPORT_SYMBOL_NOVERS(ieee80211_get_beacon);

EXPORT_SYMBOL_NOVERS(ieee80211_wake_queue);

EXPORT_SYMBOL_NOVERS(ieee80211_stop_queue);

EXPORT_SYMBOL_NOVERS(ieee80211_rtl_wake_queue);

EXPORT_SYMBOL_NOVERS(ieee80211_rtl_stop_queue);

EXPORT_SYMBOL_NOVERS(ieee80211_reset_queue);

EXPORT_SYMBOL_NOVERS(ieee80211_softmac_stop_protocol);

EXPORT_SYMBOL_NOVERS(ieee80211_softmac_start_protocol);