Attachment #107577 for bug #161895

Lines 33-38 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/beta-8187/r8180_rtl8225.h (+1 lines)
33	void rtl8225_host_usb_init(struct net_device *dev);	33	void rtl8225_host_usb_init(struct net_device *dev);
34	void write_rtl8225(struct net_device *dev, u8 adr, u16 data);	34	void write_rtl8225(struct net_device *dev, u8 adr, u16 data);
35	void rtl8225z2_rf_set_mode(struct net_device *dev) ;	35	void rtl8225z2_rf_set_mode(struct net_device *dev) ;
		36	void rtl8185_rf_pins_enable(struct net_device *dev);
36		37
37	#define RTL8225_RF_MAX_SENS 6	38	#define RTL8225_RF_MAX_SENS 6
38	#define RTL8225_RF_DEF_SENS 4	39	#define RTL8225_RF_DEF_SENS 4

Lines 26-32 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187.h (-1 / +4 lines)
26		26
27	#include <linux/module.h>	27	#include <linux/module.h>
28	#include <linux/kernel.h>	28	#include <linux/kernel.h>
29	#include <linux/config.h>	29
30	#include <linux/init.h>	30	#include <linux/init.h>
31	#include <linux/ioport.h>	31	#include <linux/ioport.h>
32	#include <linux/sched.h>	32	#include <linux/sched.h>
Lines 250-255 Link Here
250	typedef enum{	250	typedef enum{
251	LOW_PRIORITY ,	251	LOW_PRIORITY ,
252	NORM_PRIORITY	252	NORM_PRIORITY
		253
253	} priority_t;	254	} priority_t;
254		255
255		256
Lines 284-287 Link Here
284	void write_phy_cck(struct net_device *dev, u8 adr, u32 data);	285	void write_phy_cck(struct net_device *dev, u8 adr, u32 data);
285	void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);	286	void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);
286	void rtl8185_tx_antenna(struct net_device *dev, u8 ant);	287	void rtl8185_tx_antenna(struct net_device *dev, u8 ant);
		288	void rtl8187_set_rxconf(struct net_device *dev);
		289	void rtl8180_set_mode(struct net_device *dev,int mode);
287	#endif	290	#endif




	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
#endif
}
void rtl8187_rx_isr(struct urb *rx_urb);


void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)

}
		

void rtl8187_rx_isr(struct urb *rx_urb)
{

	struct net_device *dev = (struct net_device*)rx_urb->context;


void rtl8180_try_wake_queue(struct net_device *dev, int pri);

void rtl8187_lptx_isr(struct urb *tx_urb)
{
	struct net_device *dev = (struct net_device*)tx_urb->context;
	struct r8180_priv *priv = ieee80211_priv(dev);

	
}

void rtl8187_nptx_isr(struct urb *tx_urb)
{
	struct net_device *dev = (struct net_device*)tx_urb->context;
	struct r8180_priv *priv = ieee80211_priv(dev);

	dev->do_ioctl = rtl8180_ioctl;
	dev->set_multicast_list = r8180_set_multicast;
	dev->set_mac_address = r8180_set_mac_adr;
	dev->get_stats = rtl8180_stats;
	dev->type=ARPHRD_ETHER;
	
	if (dev_alloc_name(dev, ifname) < 0){

Lines 11-17 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt.c (-1 / +1 lines)
11	*	11	*
12	*/	12	*/
13		13
14	#include <linux/config.h>	14
15	#include <linux/version.h>	15	#include <linux/version.h>
16	#include <linux/module.h>	16	#include <linux/module.h>
17	#include <linux/init.h>	17	#include <linux/init.h>

Lines 9-15 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_ccmp.c (-1 / +1 lines)
9	* more details.	9	* more details.
10	*/	10	*/
11		11
12	#include <linux/config.h>	12
13	#include <linux/version.h>	13	#include <linux/version.h>
14	#include <linux/module.h>	14	#include <linux/module.h>
15	#include <linux/init.h>	15	#include <linux/init.h>

Lines 9-15 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_tkip.c (-1 / +1 lines)
9	* more details.	9	* more details.
10	*/	10	*/
11		11
12	#include <linux/config.h>	12
13	#include <linux/version.h>	13	#include <linux/version.h>
14	#include <linux/module.h>	14	#include <linux/module.h>
15	#include <linux/init.h>	15	#include <linux/init.h>

Lines 9-15 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_wep.c (-1 / +1 lines)
9	* more details.	9	* more details.
10	*/	10	*/
11		11
12	#include <linux/config.h>	12
13	#include <linux/version.h>	13	#include <linux/version.h>
14	#include <linux/module.h>	14	#include <linux/module.h>
15	#include <linux/init.h>	15	#include <linux/init.h>

Lines 31-37 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_module.c (-1 / +1 lines)
31	*******************************************************************************/	31	*******************************************************************************/
32		32
33	#include <linux/compiler.h>	33	#include <linux/compiler.h>
34	#include <linux/config.h>	34
35	#include <linux/errno.h>	35	#include <linux/errno.h>
36	#include <linux/if_arp.h>	36	#include <linux/if_arp.h>
37	#include <linux/in6.h>	37	#include <linux/in6.h>

Lines 22-28 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_rx.c (-1 / +1 lines)
22		22
23		23
24	#include <linux/compiler.h>	24	#include <linux/compiler.h>
25	#include <linux/config.h>	25
26	#include <linux/errno.h>	26	#include <linux/errno.h>
27	#include <linux/if_arp.h>	27	#include <linux/if_arp.h>
28	#include <linux/in6.h>	28	#include <linux/in6.h>

Lines 32-38 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_tx.c (-1 / +1 lines)
32	******************************************************************************/	32	******************************************************************************/
33		33
34	#include <linux/compiler.h>	34	#include <linux/compiler.h>
35	#include <linux/config.h>	35
36	#include <linux/errno.h>	36	#include <linux/errno.h>
37	#include <linux/if_arp.h>	37	#include <linux/if_arp.h>
38	#include <linux/in6.h>	38	#include <linux/in6.h>

Return to bug 161895

Lines 658-664 Link Here

(-)rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187_core.c (-5 / +5 lines)
658	write_nic_dword(dev,TX_CONF,tx \| (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));	658	write_nic_dword(dev,TX_CONF,tx \| (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));
659	#endif	659	#endif
660	}	660	}
661	void rtl8187_rx_isr(struct urb rx_urb, struct pt_regs regs);	661	void rtl8187_rx_isr(struct urb *rx_urb);
662		662
663		663
664	void rtl8187_rx_urbsubmit(struct net_device dev, struct urb rx_urb)	664	void rtl8187_rx_urbsubmit(struct net_device dev, struct urb rx_urb)
Lines 1028-1034 Link Here
1028	}	1028	}
1029		1029
1030		1030
1031	void rtl8187_rx_isr(struct urb rx_urb, struct pt_regs regs)	1031	void rtl8187_rx_isr(struct urb *rx_urb)
1032	{	1032	{
1033		1033
1034	struct net_device dev = (struct net_device)rx_urb->context;	1034	struct net_device dev = (struct net_device)rx_urb->context;
Lines 1267-1273 Link Here
1267		1267
1268	void rtl8180_try_wake_queue(struct net_device *dev, int pri);	1268	void rtl8180_try_wake_queue(struct net_device *dev, int pri);
1269		1269
1270	void rtl8187_lptx_isr(struct urb tx_urb, struct pt_regs regs)	1270	void rtl8187_lptx_isr(struct urb *tx_urb)
1271	{	1271	{
1272	struct net_device dev = (struct net_device)tx_urb->context;	1272	struct net_device dev = (struct net_device)tx_urb->context;
1273	struct r8180_priv *priv = ieee80211_priv(dev);	1273	struct r8180_priv *priv = ieee80211_priv(dev);
Lines 1366-1372 Link Here
1366		1366
1367	}	1367	}
1368		1368
1369	void rtl8187_nptx_isr(struct urb tx_urb, struct pt_regs regs)	1369	void rtl8187_nptx_isr(struct urb *tx_urb)
1370	{	1370	{
1371	struct net_device dev = (struct net_device)tx_urb->context;	1371	struct net_device dev = (struct net_device)tx_urb->context;
1372	struct r8180_priv *priv = ieee80211_priv(dev);	1372	struct r8180_priv *priv = ieee80211_priv(dev);
Lines 2382-2388 Link Here
2382	dev->do_ioctl = rtl8180_ioctl;	2382	dev->do_ioctl = rtl8180_ioctl;
2383	dev->set_multicast_list = r8180_set_multicast;	2383	dev->set_multicast_list = r8180_set_multicast;
2384	dev->set_mac_address = r8180_set_mac_adr;	2384	dev->set_mac_address = r8180_set_mac_adr;
2385	dev->get_wireless_stats = r8180_get_wireless_stats;	2385	dev->get_stats = rtl8180_stats;
2386	dev->type=ARPHRD_ETHER;	2386	dev->type=ARPHRD_ETHER;
2387		2387
2388	if (dev_alloc_name(dev, ifname) < 0){	2388	if (dev_alloc_name(dev, ifname) < 0){