Gentoo Attachment #107577 for bug #161895

View | Details | Raw Unified
Collapse All | Expand All

(-) rtl8187_linuxdrv_V1.1.orig/beta-8187/r8180_rtl8225.h (+1 lines)

Lines 33-38	Link Here

void rtl8225_host_usb_init(struct net_device *dev);

void rtl8225_host_usb_init(struct net_device *dev);

void write_rtl8225(struct net_device *dev, u8 adr, u16 data);

void write_rtl8225(struct net_device *dev, u8 adr, u16 data);

void rtl8225z2_rf_set_mode(struct net_device *dev) ;

void rtl8225z2_rf_set_mode(struct net_device *dev) ;

void rtl8185_rf_pins_enable(struct net_device *dev);

#define RTL8225_RF_MAX_SENS 6

#define RTL8225_RF_MAX_SENS 6

#define RTL8225_RF_DEF_SENS 4

#define RTL8225_RF_DEF_SENS 4

(-) rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187.h (-1 / +4 lines)

Lines 26-32	Link Here

#include <linux/module.h>

#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/config.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/sched.h>

#include <linux/sched.h>

Lines 250-255	Link Here

typedef enum{

typedef enum{

	LOW_PRIORITY ,

	LOW_PRIORITY ,

	NORM_PRIORITY

	NORM_PRIORITY

	} priority_t;

	} priority_t;

Lines 284-287	Link Here

void write_phy_cck(struct net_device *dev, u8 adr, u32 data);

void write_phy_cck(struct net_device *dev, u8 adr, u32 data);

void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);

void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data);

void rtl8185_tx_antenna(struct net_device *dev, u8 ant);

void rtl8185_tx_antenna(struct net_device *dev, u8 ant);

void rtl8187_set_rxconf(struct net_device *dev);

void rtl8180_set_mode(struct net_device *dev,int mode);

#endif

#endif

(-) rtl8187_linuxdrv_V1.1.orig/beta-8187/r8187_core.c (-5 / +5 lines)

Lines 658-664	Link Here

	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));

	write_nic_dword(dev,TX_CONF,tx | (TX_LOOPBACK_NONE<<TX_LOOPBACK_SHIFT));

#endif

#endif

void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs);

void rtl8187_rx_isr(struct urb *rx_urb);

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

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

Lines 1028-1034	Link Here

void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs)

void rtl8187_rx_isr(struct urb *rx_urb)

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

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

Lines 1267-1273	Link Here

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

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

void rtl8187_lptx_isr(struct urb *tx_urb, struct pt_regs *regs)

void rtl8187_lptx_isr(struct urb *tx_urb)

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

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

	struct r8180_priv *priv = ieee80211_priv(dev);

	struct r8180_priv *priv = ieee80211_priv(dev);

Lines 1366-1372	Link Here

void rtl8187_nptx_isr(struct urb *tx_urb, struct pt_regs *regs)

void rtl8187_nptx_isr(struct urb *tx_urb)

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

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

	struct r8180_priv *priv = ieee80211_priv(dev);

	struct r8180_priv *priv = ieee80211_priv(dev);

Lines 2382-2388	Link Here

	dev->do_ioctl = rtl8180_ioctl;

	dev->do_ioctl = rtl8180_ioctl;

	dev->set_multicast_list = r8180_set_multicast;

	dev->set_multicast_list = r8180_set_multicast;

	dev->set_mac_address = r8180_set_mac_adr;

	dev->set_mac_address = r8180_set_mac_adr;

	dev->get_wireless_stats = r8180_get_wireless_stats;

	dev->get_stats = rtl8180_stats;

	dev->type=ARPHRD_ETHER;

	dev->type=ARPHRD_ETHER;

	if (dev_alloc_name(dev, ifname) < 0){

	if (dev_alloc_name(dev, ifname) < 0){

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt.c (-1 / +1 lines)

Lines 11-17	Link Here

*/

*/

#include <linux/config.h>

#include <linux/version.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_ccmp.c (-1 / +1 lines)

Lines 9-15	Link Here

 * more details.

 * more details.

*/

*/

#include <linux/config.h>

#include <linux/version.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_tkip.c (-1 / +1 lines)

Lines 9-15	Link Here

 * more details.

 * more details.

*/

*/

#include <linux/config.h>

#include <linux/version.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_crypt_wep.c (-1 / +1 lines)

Lines 9-15	Link Here

 * more details.

 * more details.

*/

*/

#include <linux/config.h>

#include <linux/version.h>

#include <linux/version.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_module.c (-1 / +1 lines)

Lines 31-37	Link Here

*******************************************************************************/

*******************************************************************************/

#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/config.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/if_arp.h>

#include <linux/if_arp.h>

#include <linux/in6.h>

#include <linux/in6.h>

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_rx.c (-1 / +1 lines)

Lines 22-28	Link Here

#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/config.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/if_arp.h>

#include <linux/if_arp.h>

#include <linux/in6.h>

#include <linux/in6.h>

(-) rtl8187_linuxdrv_V1.1.orig/ieee80211/ieee80211_tx.c (-1 / +1 lines)

Lines 32-38	Link Here

******************************************************************************/

******************************************************************************/

#include <linux/compiler.h>

#include <linux/compiler.h>

#include <linux/config.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/if_arp.h>

#include <linux/if_arp.h>

#include <linux/in6.h>

#include <linux/in6.h>

Attachment #107577: Fixes four problems in the current source for bug #161895