Gentoo Attachment #107708 for bug #161895

View | Details | Raw Unified
Collapse All | Expand All

(-) ../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/r8180_wx.c (-2 / +2 lines)

Lines 664-670	Link Here

};

};

#if WIRELESS_EXT >= 17

#if WIRELESS_EXT >= 17

static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)

static struct iw_statistics *r8180_get_stats(struct net_device *dev)

       struct r8180_priv *priv = ieee80211_priv(dev);

       struct r8180_priv *priv = ieee80211_priv(dev);

Lines 680-686	Link Here

	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),

	.num_private = sizeof(r8180_private_handler) / sizeof(iw_handler),

 	.num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),

 	.num_private_args = sizeof(r8180_private_args) / sizeof(struct iw_priv_args),

#if WIRELESS_EXT >= 17

#if WIRELESS_EXT >= 17

	.get_wireless_stats = r8180_get_wireless_stats,

	.get_wireless_stats = r8180_get_stats,

#endif

#endif

	.private_args = (struct iw_priv_args *)r8180_private_args,

	.private_args = (struct iw_priv_args *)r8180_private_args,

};

};

(-) ../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/r8187_core.c (-7 / +7 lines)

Lines 266-272	Link Here

//irqreturn_t rtl8180_interrupt(int irq, void *netdev, struct pt_regs *regs);

//irqreturn_t rtl8180_interrupt(int irq, void *netdev);

//void set_nic_rxring(struct net_device *dev);

//void set_nic_rxring(struct net_device *dev);

//void set_nic_txring(struct net_device *dev);

//void set_nic_txring(struct net_device *dev);

static struct net_device_stats *rtl8180_stats(struct net_device *dev);

static struct net_device_stats *rtl8180_stats(struct net_device *dev);

Lines 408-414	Link Here

static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)

static struct iw_statistics *r8180_get_stats(struct net_device *dev)

       struct r8180_priv *priv = ieee80211_priv(dev);

       struct r8180_priv *priv = ieee80211_priv(dev);

Lines 678-684	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 1048-1054	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;

	struct r8180_priv *priv = ieee80211_priv(dev);

	struct r8180_priv *priv = ieee80211_priv(dev);

Lines 1225-1231	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 1324-1330	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 2418-2424	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 = r8180_get_stats;

	dev->type=ARPHRD_ETHER;

	dev->type=ARPHRD_ETHER;

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

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

(-) ../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/r8187.h (-1 / +2 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/autoconf.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 285-289	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 rtl8180_set_mode(struct net_device *dev,int mode);

void rtl8187_set_rxconf(struct net_device *dev);

void rtl8187_set_rxconf(struct net_device *dev);

#endif

#endif

(-) ../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/beta-8187/tags (-5 / +5 lines)

Lines 1118-1125	Link Here

ps_timeout	ieee80211.h	/^	int ps_timeout;$/;"	m	struct:ieee80211_device

ps_timeout	ieee80211.h	/^	int ps_timeout;$/;"	m	struct:ieee80211_device

ps_tl	ieee80211.h	/^	u32 ps_tl;$/;"	m	struct:ieee80211_device

ps_tl	ieee80211.h	/^	u32 ps_tl;$/;"	m	struct:ieee80211_device

queue_stop	ieee80211.h	/^	short queue_stop;$/;"	m	struct:ieee80211_device

queue_stop	ieee80211.h	/^	short queue_stop;$/;"	m	struct:ieee80211_device

r8180_get_wireless_stats	r8180_wx.c	/^static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)$/;"	f	file:

r8180_get_stats	r8180_wx.c	/^static struct iw_statistics *r8180_get_stats(struct net_device *dev)$/;"	f	file:

r8180_get_wireless_stats	r8187_core.c	/^static struct iw_statistics *r8180_get_wireless_stats(struct net_device *dev)$/;"	f	file:

r8180_get_stats	r8187_core.c	/^static struct iw_statistics *r8180_get_stats(struct net_device *dev)$/;"	f	file:

r8180_priv	r8187.h	/^typedef struct r8180_priv$/;"	s

r8180_priv	r8187.h	/^typedef struct r8180_priv$/;"	s

r8180_priv	r8187.h	/^}r8180_priv;$/;"	t

r8180_priv	r8187.h	/^}r8180_priv;$/;"	t

r8180_private_args	r8180_wx.c	/^static const struct iw_priv_args r8180_private_args[] = { $/;"	v	file:

r8180_private_args	r8180_wx.c	/^static const struct iw_priv_args r8180_private_args[] = { $/;"	v	file:

Lines 1228-1238	Link Here

rtl8187_beacon_stop	r8187_core.c	/^void rtl8187_beacon_stop(struct net_device *dev)$/;"	f

rtl8187_beacon_stop	r8187_core.c	/^void rtl8187_beacon_stop(struct net_device *dev)$/;"	f

rtl8187_beacon_tx	r8187_core.c	/^void rtl8187_beacon_tx(struct net_device *dev)$/;"	f

rtl8187_beacon_tx	r8187_core.c	/^void rtl8187_beacon_tx(struct net_device *dev)$/;"	f

rtl8187_link_change	r8187_core.c	/^void rtl8187_link_change(struct net_device *dev)$/;"	f

rtl8187_link_change	r8187_core.c	/^void rtl8187_link_change(struct net_device *dev)$/;"	f

rtl8187_lptx_isr	r8187_core.c	/^void rtl8187_lptx_isr(struct urb *tx_urb, struct pt_regs *regs)$/;"	f

rtl8187_lptx_isr	r8187_core.c	/^void rtl8187_lptx_isr(struct urb *tx_urb)$/;"	f

rtl8187_net_update	r8187_core.c	/^void rtl8187_net_update(struct net_device *dev)$/;"	f

rtl8187_net_update	r8187_core.c	/^void rtl8187_net_update(struct net_device *dev)$/;"	f

rtl8187_nptx_isr	r8187_core.c	/^void rtl8187_nptx_isr(struct urb *tx_urb, struct pt_regs *regs)$/;"	f

rtl8187_nptx_isr	r8187_core.c	/^void rtl8187_nptx_isr(struct urb *tx_urb)$/;"	f

rtl8187_rx_initiate	r8187_core.c	/^void rtl8187_rx_initiate(struct net_device *dev)$/;"	f

rtl8187_rx_initiate	r8187_core.c	/^void rtl8187_rx_initiate(struct net_device *dev)$/;"	f

rtl8187_rx_isr	r8187_core.c	/^void rtl8187_rx_isr(struct urb *rx_urb, struct pt_regs *regs)$/;"	f

rtl8187_rx_isr	r8187_core.c	/^void rtl8187_rx_isr(struct urb *rx_urb)$/;"	f

rtl8187_rx_urbsubmit	r8187_core.c	/^void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)$/;"	f

rtl8187_rx_urbsubmit	r8187_core.c	/^void rtl8187_rx_urbsubmit(struct net_device *dev, struct urb* rx_urb)$/;"	f

rtl8187_set_rate	r8187_core.c	/^void rtl8187_set_rate(struct net_device *dev)$/;"	f

rtl8187_set_rate	r8187_core.c	/^void rtl8187_set_rate(struct net_device *dev)$/;"	f

rtl8187_set_rxconf	r8187_core.c	/^void rtl8187_set_rxconf(struct net_device *dev)$/;"	f

rtl8187_set_rxconf	r8187_core.c	/^void rtl8187_set_rxconf(struct net_device *dev)$/;"	f

(-) ../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt.c (-1 / +1 lines)

Lines 11-17	Link Here

*/

*/

#include <linux/config.h>

#include <linux/autoconf.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-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt_ccmp.c (-1 / +1 lines)

Lines 9-15	Link Here

 * more details.

 * more details.

*/

*/

#include <linux/config.h>

#include <linux/autoconf.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-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt_tkip.c (-1 / +1 lines)

Lines 9-15	Link Here

 * more details.

 * more details.

*/

*/

#include <linux/config.h>

#include <linux/autoconf.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-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_crypt_wep.c (-1 / +1 lines)

Lines 9-15	Link Here

 * more details.

 * more details.

*/

*/

#include <linux/config.h>

#include <linux/autoconf.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-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/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/autoconf.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-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/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/autoconf.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-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/ieee80211/ieee80211_softmac_wx.c (-1 / +1 lines)

Lines 356-362	Link Here

	spin_lock_irqsave(&ieee->lock, flags);

	spin_lock_irqsave(&ieee->lock, flags);

	if (wrqu->essid.flags && wrqu->essid.length) {

	if (wrqu->essid.flags && wrqu->essid.length) {

		len = ((wrqu->essid.length-1) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length-1) : IW_ESSID_MAX_SIZE;

		len = ((wrqu->essid.length) < IW_ESSID_MAX_SIZE) ? (wrqu->essid.length) : IW_ESSID_MAX_SIZE;

		strncpy(ieee->current_network.ssid, extra, len);

		strncpy(ieee->current_network.ssid, extra, len);

		ieee->current_network.ssid_len = len;

		ieee->current_network.ssid_len = len;

(-) ../../../rtl8187-1.10-orig/work/rtl8187_linux_26.1010.0622.2006/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/autoconf.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 #107708: kernel-2.6.19.patch for bug #161895