Commit 9c7d05eb authored by Jeff Garzik's avatar Jeff Garzik

Merge pobox.com:/garz/repo/linux-2.6

into pobox.com:/garz/repo/netdev-2.6/janitor
parents df886b22 bf263ccc
...@@ -228,16 +228,6 @@ static inline void outb_command(unsigned char val, unsigned int base_addr) ...@@ -228,16 +228,6 @@ static inline void outb_command(unsigned char val, unsigned int base_addr)
outb(val, base_addr + PORT_COMMAND); outb(val, base_addr + PORT_COMMAND);
} }
static inline unsigned int inw_data(unsigned int base_addr)
{
return inw(base_addr + PORT_DATA);
}
static inline void outw_data(unsigned int val, unsigned int base_addr)
{
outw(val, base_addr + PORT_DATA);
}
static inline unsigned int backlog_next(unsigned int n) static inline unsigned int backlog_next(unsigned int n)
{ {
return (n + 1) % BACKLOG_SIZE; return (n + 1) % BACKLOG_SIZE;
......
...@@ -277,6 +277,7 @@ MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); ...@@ -277,6 +277,7 @@ MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver " MODULE_DESCRIPTION("3Com 3c59x/3c9xx ethernet driver "
DRV_VERSION " " DRV_RELDATE); DRV_VERSION " " DRV_RELDATE);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_PARM(debug, "i"); MODULE_PARM(debug, "i");
MODULE_PARM(global_options, "i"); MODULE_PARM(global_options, "i");
......
...@@ -598,6 +598,7 @@ struct rtl8139_private { ...@@ -598,6 +598,7 @@ struct rtl8139_private {
MODULE_AUTHOR ("Jeff Garzik <jgarzik@pobox.com>"); MODULE_AUTHOR ("Jeff Garzik <jgarzik@pobox.com>");
MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver"); MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
module_param(multicast_filter_limit, int, 0); module_param(multicast_filter_limit, int, 0);
module_param_array(media, int, NULL, 0); module_param_array(media, int, NULL, 0);
......
...@@ -1114,7 +1114,6 @@ EXPORT_SYMBOL(ei_interrupt); ...@@ -1114,7 +1114,6 @@ EXPORT_SYMBOL(ei_interrupt);
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
EXPORT_SYMBOL(ei_poll); EXPORT_SYMBOL(ei_poll);
#endif #endif
EXPORT_SYMBOL(ei_tx_timeout);
EXPORT_SYMBOL(NS8390_init); EXPORT_SYMBOL(NS8390_init);
EXPORT_SYMBOL(__alloc_ei_netdev); EXPORT_SYMBOL(__alloc_ei_netdev);
......
...@@ -130,7 +130,6 @@ static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000; ...@@ -130,7 +130,6 @@ static const int ad_delta_in_ticks = (AD_TIMER_INTERVAL * HZ) / 1000;
static u16 __get_link_speed(struct port *port); static u16 __get_link_speed(struct port *port);
static u8 __get_duplex(struct port *port); static u8 __get_duplex(struct port *port);
static inline void __initialize_port_locks(struct port *port); static inline void __initialize_port_locks(struct port *port);
static inline void __deinitialize_port_locks(struct port *port);
//conversions //conversions
static void __ntohs_lacpdu(struct lacpdu *lacpdu); static void __ntohs_lacpdu(struct lacpdu *lacpdu);
static u16 __ad_timer_to_ticks(u16 timer_type, u16 Par); static u16 __ad_timer_to_ticks(u16 timer_type, u16 Par);
...@@ -445,15 +444,6 @@ static inline void __initialize_port_locks(struct port *port) ...@@ -445,15 +444,6 @@ static inline void __initialize_port_locks(struct port *port)
spin_lock_init(&(SLAVE_AD_INFO(port->slave).rx_machine_lock)); spin_lock_init(&(SLAVE_AD_INFO(port->slave).rx_machine_lock));
} }
/**
* __deinitialize_port_locks - deinitialize a port's RX machine spinlock
* @port: the port we're looking at
*
*/
static inline void __deinitialize_port_locks(struct port *port)
{
}
//conversions //conversions
/** /**
* __ntohs_lacpdu - convert the contents of a LACPDU to host byte order * __ntohs_lacpdu - convert the contents of a LACPDU to host byte order
......
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
MODULE_DESCRIPTION(DRV_DESCRIPTION); MODULE_DESCRIPTION(DRV_DESCRIPTION);
MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_AUTHOR(DRV_COPYRIGHT);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
static int debug = 3; static int debug = 3;
module_param(debug, int, 0); module_param(debug, int, 0);
......
...@@ -362,6 +362,7 @@ MODULE_PARM(rx_copybreak, "i"); ...@@ -362,6 +362,7 @@ MODULE_PARM(rx_copybreak, "i");
MODULE_PARM(use_dac, "i"); MODULE_PARM(use_dac, "i");
MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot."); MODULE_PARM_DESC(use_dac, "Enable PCI DAC. Unsafe on 32 bit PCI slot.");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(RTL8169_VERSION);
static int rtl8169_open(struct net_device *dev); static int rtl8169_open(struct net_device *dev);
static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev); static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev);
......
...@@ -135,13 +135,6 @@ static inline int is_my_addr(const struct s_smc *smc, ...@@ -135,13 +135,6 @@ static inline int is_my_addr(const struct s_smc *smc,
*(short *)(&smc->mib.m[MAC0].fddiMACSMTAddress.a[4])) ; *(short *)(&smc->mib.m[MAC0].fddiMACSMTAddress.a[4])) ;
} }
static inline int is_zero(const struct fddi_addr *addr)
{
return(*(short *)(&addr->a[0]) == 0 &&
*(short *)(&addr->a[2]) == 0 &&
*(short *)(&addr->a[4]) == 0 ) ;
}
static inline int is_broadcast(const struct fddi_addr *addr) static inline int is_broadcast(const struct fddi_addr *addr)
{ {
return(*(u_short *)(&addr->a[0]) == 0xffff && return(*(u_short *)(&addr->a[0]) == 0xffff &&
......
...@@ -56,6 +56,7 @@ KERN_INFO DRV_NAME " PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")\n"; ...@@ -56,6 +56,7 @@ KERN_INFO DRV_NAME " PCI Ethernet driver v" DRV_VERSION " (" DRV_RELDATE ")\n";
MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>"); MODULE_AUTHOR("Jeff Garzik <jgarzik@pobox.com>");
MODULE_DESCRIPTION("Intel/Digital 21040/1 series PCI Ethernet driver"); MODULE_DESCRIPTION("Intel/Digital 21040/1 series PCI Ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
static int debug = -1; static int debug = -1;
MODULE_PARM (debug, "i"); MODULE_PARM (debug, "i");
......
...@@ -1987,6 +1987,7 @@ static struct pci_driver dmfe_driver = { ...@@ -1987,6 +1987,7 @@ static struct pci_driver dmfe_driver = {
MODULE_AUTHOR("Sten Wang, sten_wang@davicom.com.tw"); MODULE_AUTHOR("Sten Wang, sten_wang@davicom.com.tw");
MODULE_DESCRIPTION("Davicom DM910X fast ethernet driver"); MODULE_DESCRIPTION("Davicom DM910X fast ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_PARM(debug, "i"); MODULE_PARM(debug, "i");
MODULE_PARM(mode, "i"); MODULE_PARM(mode, "i");
......
...@@ -115,6 +115,7 @@ static int csr0 = 0x00A00000 | 0x4800; ...@@ -115,6 +115,7 @@ static int csr0 = 0x00A00000 | 0x4800;
MODULE_AUTHOR("The Linux Kernel Team"); MODULE_AUTHOR("The Linux Kernel Team");
MODULE_DESCRIPTION("Digital 21*4* Tulip ethernet driver"); MODULE_DESCRIPTION("Digital 21*4* Tulip ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_PARM(tulip_debug, "i"); MODULE_PARM(tulip_debug, "i");
MODULE_PARM(max_interrupt_work, "i"); MODULE_PARM(max_interrupt_work, "i");
MODULE_PARM(rx_copybreak, "i"); MODULE_PARM(rx_copybreak, "i");
......
...@@ -144,6 +144,7 @@ KERN_INFO " http://www.scyld.com/network/drivers.html\n"; ...@@ -144,6 +144,7 @@ KERN_INFO " http://www.scyld.com/network/drivers.html\n";
MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver"); MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_VERSION);
MODULE_PARM(max_interrupt_work, "i"); MODULE_PARM(max_interrupt_work, "i");
MODULE_PARM(debug, "i"); MODULE_PARM(debug, "i");
......
...@@ -93,6 +93,7 @@ static int csr0 = 0x00A00000 | 0x4800; ...@@ -93,6 +93,7 @@ static int csr0 = 0x00A00000 | 0x4800;
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -116,13 +117,16 @@ KERN_INFO " unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE ...@@ -116,13 +117,16 @@ KERN_INFO " unofficial 2.4.x kernel port, version " DRV_VERSION ", " DRV_RELDATE
MODULE_AUTHOR("Donald Becker <becker@scyld.com>"); MODULE_AUTHOR("Donald Becker <becker@scyld.com>");
MODULE_DESCRIPTION("Xircom CBE-100 ethernet driver"); MODULE_DESCRIPTION("Xircom CBE-100 ethernet driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_VERSION(DRV_VERSION);
MODULE_PARM(debug, "i"); module_param(debug, int, 0);
MODULE_PARM(max_interrupt_work, "i"); module_param(max_interrupt_work, int, 0);
MODULE_PARM(rx_copybreak, "i"); module_param(rx_copybreak, int, 0);
MODULE_PARM(csr0, "i"); module_param(csr0, int, 0);
MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i");
MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); static int num_units;
module_param_array(options, num_units, int, 0);
module_param_array(full_duplex, num_units, int, 0);
#define RUN_AT(x) (jiffies + (x)) #define RUN_AT(x) (jiffies + (x))
......
...@@ -1687,8 +1687,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile u32 * ready, ...@@ -1687,8 +1687,7 @@ typhoon_rx(struct typhoon *tp, struct basic_ring *rxRing, volatile u32 * ready,
skb = rxb->skb; skb = rxb->skb;
dma_addr = rxb->dma_addr; dma_addr = rxb->dma_addr;
rxaddr += sizeof(struct rx_desc); typhoon_inc_rx_index(&rxaddr, 1);
rxaddr %= RX_ENTRIES * sizeof(struct rx_desc);
if(rx->flags & TYPHOON_RX_ERROR) { if(rx->flags & TYPHOON_RX_ERROR) {
typhoon_recycle_rx_skb(tp, idx); typhoon_recycle_rx_skb(tp, idx);
......
...@@ -291,10 +291,10 @@ struct velocity_td_info { ...@@ -291,10 +291,10 @@ struct velocity_td_info {
dma_addr_t buf_dma; dma_addr_t buf_dma;
}; };
enum { enum velocity_owner {
OWNED_BY_HOST = 0, OWNED_BY_HOST = 0,
OWNED_BY_NIC = 1 OWNED_BY_NIC = 1
} velocity_owner; };
/* /*
......
...@@ -113,9 +113,6 @@ static inline void openwin(card_t *card, u8 page) ...@@ -113,9 +113,6 @@ static inline void openwin(card_t *card, u8 page)
} }
#define close_windows(card) {} /* no hardware support */
#include "hd6457x.c" #include "hd6457x.c"
......
...@@ -159,11 +159,6 @@ static __inline__ void openwin(card_t *card, u8 page) ...@@ -159,11 +159,6 @@ static __inline__ void openwin(card_t *card, u8 page)
} }
static __inline__ void close_windows(card_t *card)
{
outb(inb(card->io + N2_PCR) & ~PCR_ENWIN, card->io + N2_PCR);
}
#include "hd6457x.c" #include "hd6457x.c"
......
...@@ -155,10 +155,6 @@ static void join_net(u_long local); ...@@ -155,10 +155,6 @@ static void join_net(u_long local);
static void start_net(u_long local); static void start_net(u_long local);
/* void start_net(ray_dev_t *local); */ /* void start_net(ray_dev_t *local); */
/* Create symbol table for registering with kernel in init_module */
EXPORT_SYMBOL(ray_dev_ioctl);
EXPORT_SYMBOL(ray_rx);
/*===========================================================================*/ /*===========================================================================*/
/* Parameters that can be set with 'insmod' */ /* Parameters that can be set with 'insmod' */
/* Bit map of interrupts to choose from */ /* Bit map of interrupts to choose from */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment