net driver updates
Subsystems (4)
PATCH 1/1 net driver updates
Please pull from the 'upstream' branch of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to obtain the following changes:
drivers/net/Kconfig | 9 drivers/net/chelsio/common.h | 4 drivers/net/chelsio/cxgb2.c | 2 drivers/net/e1000/e1000_hw.h | 2 drivers/net/mv643xx_eth.c | 139 +--- drivers/net/mv643xx_eth.h | 4 drivers/net/ne3210.c | 9 drivers/net/phy/Kconfig | 2 drivers/net/phy/mdio_bus.c | 2 drivers/net/s2io.c | 14 drivers/net/sis190.c | 131 ++- drivers/net/tulip/uli526x.c | 2 drivers/net/wireless/Kconfig | 38 - drivers/net/wireless/Makefile | 2 drivers/net/wireless/ipw2100.c | 69 +- drivers/net/wireless/ipw2200.h | 1 drivers/net/wireless/orinoco.c | 93 +- drivers/net/wireless/orinoco_cs.c | 1 drivers/net/wireless/orinoco_nortel.c | 324 +++++++++ drivers/net/wireless/spectrum_cs.c | 1120 ++++++++++++++++++++++++++++++++++ net/core/ethtool.c | 2 21 files changed, 1736 insertions(+), 234 deletions(-)
Adrian Bunk:
drivers/net/ne3210.c: cleanups
Al Viro:
(15/22) Kconfig fix (82596)
Dale Farnsworth:
mv643xx: fix skb memory leak
mv643xx: fix outstanding tx skb counter
mv643xx: Disable per port bandwidth limits
mv643xx: Fix promiscuous mode handling
mv643xx: add netpoll api support
Francois Romieu:
sis190: unmask the link change events
sis190: recent chipsets from SiS include a RGMII
sis190: make 10Mbps the default when handling the StationControl register
sis190: RGMII Tx internal delay fiddling
sis190: basic sis191 support
Pavel Roskin:
orinoco: Change orinoco_translate_scan() to return error code on error.
orinoco: Remove entry for Intel PRO/Wireless 2011B.
orinoco: Fix memory leak on error in processing hostscan frames.
orinoco: Optimize orinoco_join_ap()
orinoco: Remove EXPERIMENTAL mark from PLX_HERMES, TMD_HERMES and PCI_HERMES.
orinoco: New driver - orinoco_nortel.
orinoco: New driver - spectrum_cs.
Peter Chubb:
'mdio_bus_exit' in discarded section .text.exit
[email protected]:
(1/7) chelsio sparse annotations
(2/7) iomem annotations (e1000)
(3/7) iomem annotations (s2io)
(4/7) missing include (uli526x)
(5/7) iomem annotations, NULL noise removal (ipw2100) (6/7) missing include (ipw2200)
(7/7) __user annotations (ethtool)
[email protected]:
Kconfig fix (PHYLIB vs. s390)
drivers/net/Kconfig +6 -3
@@ -397,7 +397,7 @@ config SUN3LANCE If you're not building a kernel for a Sun 3, say N. config SUN3_82586 - tristate "Sun3 on-board Intel 82586 support" + bool "Sun3 on-board Intel 82586 support" depends on NET_ETHERNET && SUN3 help This driver enables support for the on-board Intel 82586 based
@@ -1924,12 +1924,15 @@ config R8169_VLAN If in doubt, say Y. config SIS190 - tristate "SiS190 gigabit ethernet support" + tristate "SiS190/SiS191 gigabit ethernet support" depends on PCI select CRC32 select MII ---help--- - Say Y here if you have a SiS 190 PCI Gigabit Ethernet adapter. + Say Y here if you have a SiS 190 PCI Fast Ethernet adapter or + a SiS 191 PCI Gigabit Ethernet adapter. Both are expected to + appear in lan on motherboard designs which are based on SiS 965 + and SiS 966 south bridge. To compile this driver as a module, choose M here: the module will be called sis190. This is recommended.
drivers/net/chelsio/common.h +2 -2
@@ -88,7 +88,7 @@ struct t1_rx_mode {static inline u8 *t1_get_next_mcaddr (struct t1_rx_mode *rm) { -u8 *addr =0 ; +u8 *addr =NULL ;if (rm->idx++ < rm->dev->mc_count) { addr = rm->list->dmi_addr;
@@ -190,7 +190,7 @@ struct sge;struct peespi ;struct adapter { -u8 *regs; +u8 __iomem *regs;struct pci_dev *pdev;unsigned long registered_device_map;unsigned long open_device_map;
drivers/net/chelsio/cxgb2.c +1 -1
@@ -824,7 +824,7 @@ static void cxgb_proc_cleanup(struct adastatic int t1_ioctl (struct net_device *dev,struct ifreq *req,int cmd) {struct adapter *adapter = dev->priv; -struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data; +struct mii_ioctl_data *data =if_mii (req);switch (cmd) {case SIOCGMIIPHY :
drivers/net/e1000/e1000_hw.h +1 -1
@@ -1270,7 +1270,7 @@ struct e1000_hw_stats {/* Structure containing variables used by the shared code (e1000_hw.c) */ struct e1000_hw { -uint8_t *hw_addr; +uint8_t __iomem *hw_addr;uint8_t *flash_address;e1000_mac_type mac_type;e1000_phy_type phy_type;
drivers/net/mv643xx_eth.c +60 -79
246 lines not on this page · raw message
drivers/net/mv643xx_eth.h +0 -4
@@ -408,10 +408,6 @@ static void eth_port_init(struct mv643xxstatic void eth_port_reset (unsigned int eth_port_num);static void eth_port_start (struct mv643xx_private *mp); -static void ethernet_set_config_reg (unsigned int eth_port_num, -unsigned int value); -static unsigned int ethernet_get_config_reg (unsigned int eth_port_num); -/* Port MAC address routines */ static void eth_port_uc_addr_set (unsigned int eth_port_num,unsigned char *p_addr);
drivers/net/ne3210.c +3 -6
@@ -26,9 +26,6 @@Updated to EISA probing API 5/2003 by Marc Zyngier. */ -static const char *version = -"ne3210.c: Driver revision v0.03, 30/09/98\n" ; -#include <linux/module.h> #include <linux/eisa.h> #include <linux/kernel.h>
@@ -197,7 +194,7 @@ static int __init ne3210_eisa_probe (str ei_status.priv = phys_mem;if (ei_debug >0 ) -printk (version); +printk ("ne3210 loaded.\n" ); ei_status.reset_8390 = &ne3210_reset_8390; ei_status.block_input = &ne3210_block_input;
@@ -360,12 +357,12 @@ MODULE_DESCRIPTION("NE3210 EISA EthernetMODULE_LICENSE ("GPL" );MODULE_DEVICE_TABLE (eisa, ne3210_ids); -int ne3210_init (void ) +static int ne3210_init (void ) {return eisa_driver_register (&ne3210_eisa_driver); } -void ne3210_cleanup (void ) +static void ne3210_cleanup (void ) {eisa_driver_unregister (&ne3210_eisa_driver); }
drivers/net/phy/Kconfig +1 -1
@@ -6,7 +6,7 @@ menu "PHY device support" config PHYLIB tristate "PHY Device support and infrastructure" - depends on NET_ETHERNET + depends on NET_ETHERNET && (BROKEN || !ARCH_S390) help Ethernet controllers are usually attached to PHY devices. This option provides infrastructure for
drivers/net/phy/mdio_bus.c +1 -1
@@ -170,7 +170,7 @@ int __init mdio_bus_init(void)return bus_register (&mdio_bus_type); } -void __exit mdio_bus_exit(void) +void mdio_bus_exit (void ) {bus_unregister (&mdio_bus_type); }
drivers/net/s2io.c +7 -7
@@ -686,7 +686,7 @@ static void free_shared_mem(struct s2io_static int s2io_verify_pci_mode (nic_t *nic) { -XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; +XENA_dev_config_t __iomem *bar0 = nic->bar0; registeru64 val64 =0 ;int mode;
@@ -704,7 +704,7 @@ static int s2io_verify_pci_mode(nic_t *n*/ static int s2io_print_pci_mode (nic_t *nic) { -XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; +XENA_dev_config_t __iomem *bar0 = nic->bar0; registeru64 val64 =0 ;int mode;struct config_param *config = &nic->config;
@@ -1403,7 +1403,7 @@ static int init_nic(struct s2io_nic *nicwriteq (0xffbbffbbffbbffbbULL , &bar0->mc_pause_thresh_q4q7);/* Disable RMAC PAD STRIPPING */ - add = (void *) &bar0->mac_cfg; + add = &bar0->mac_cfg; val64 =readq (&bar0->mac_cfg); val64 &= ~(MAC_CFG_RMAC_STRIP_PAD );writeq (RMAC_CFG_KEY (0x4C0D ), &bar0->rmac_cfg_key);
@@ -1934,7 +1934,7 @@ static int start_nic(struct s2io_nic *ni val64 |=0x0000800000000000ULL ;writeq (val64, &bar0->gpio_control); val64 =0x0411040400000000ULL ; -writeq (val64, (void __iomem *) ((u8 *) bar0 +0x2700 )); +writeq (val64, (void __iomem *)bar0 +0x2700 ); }/*
@@ -2395,7 +2395,7 @@ static int s2io_poll(struct net_device *int pkt_cnt =0 , org_pkts_to_process;mac_info_t *mac_control;struct config_param *config; -XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; +XENA_dev_config_t __iomem *bar0 = nic->bar0;u64 val64;int i;
@@ -2831,7 +2831,7 @@ void s2io_reset(nic_t * sp) val64 |=0x0000800000000000ULL ;writeq (val64, &bar0->gpio_control); val64 =0x0411040400000000ULL ; -writeq (val64, (void __iomem *) ((u8 *) bar0 +0x2700 )); +writeq (val64, (void __iomem *)bar0 +0x2700 ); }/*
@@ -3234,7 +3234,7 @@ s2io_alarm_handle(unsigned long data)static void s2io_txpic_intr_handle (nic_t *sp) { -XENA_dev_config_t *bar0 = (XENA_dev_config_t *) sp->bar0; +XENA_dev_config_t __iomem *bar0 = sp->bar0;u64 val64; val64 =readq (&bar0->pic_int_status);
drivers/net/sis190.c +86 -45
243 lines not on this page · raw message
drivers/net/tulip/uli526x.c +1 -1
@@ -21,7 +21,6 @@#include <linux/kernel.h> #include <linux/string.h> #include <linux/timer.h> -#include <linux/ptrace.h> #include <linux/errno.h> #include <linux/ioport.h> #include <linux/slab.h>
@@ -34,6 +33,7 @@#include <linux/skbuff.h> #include <linux/delay.h> #include <linux/spinlock.h> +#include <linux/dma-mapping.h> #include <asm/processor.h> #include <asm/bitops.h>
drivers/net/wireless/Kconfig +27 -11
@@ -289,8 +289,8 @@ config APPLE_AIRPORT a non-standard interface config PLX_HERMES - tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.) (EXPERIMENTAL)" - depends on PCI && HERMES && EXPERIMENTAL + tristate "Hermes in PLX9052 based PCI adaptor support (Netgear MA301 etc.)" + depends on PCI && HERMES help Enable support for PCMCIA cards supported by the "Hermes" (aka orinoco) driver when used in PLX9052 based PCI adaptors. These
@@ -299,12 +299,9 @@ config PLX_HERMES 802.11b PCMCIA cards can be used in desktop machines. The Netgear MA301 is such an adaptor. - Support for these adaptors is so far still incomplete and buggy. - You have been warned. - config TMD_HERMES - tristate "Hermes in TMD7160 based PCI adaptor support (EXPERIMENTAL)" - depends on PCI && HERMES && EXPERIMENTAL + tristate "Hermes in TMD7160 based PCI adaptor support" + depends on PCI && HERMES help Enable support for PCMCIA cards supported by the "Hermes" (aka orinoco) driver when used in TMD7160 based PCI adaptors. These
@@ -312,12 +309,18 @@ config TMD_HERMES PCI <-> PCMCIA bridge. Several vendors sell such adaptors so that 802.11b PCMCIA cards can be used in desktop machines. - Support for these adaptors is so far still incomplete and buggy. - You have been warned. +config NORTEL_HERMES + tristate "Nortel emobility PCI adaptor support" + depends on PCI && HERMES + help + Enable support for PCMCIA cards supported by the "Hermes" (aka + orinoco) driver when used in Nortel emobility PCI adaptors. These + adaptors are not full PCMCIA controllers, but act as a more limited + PCI <-> PCMCIA bridge. config PCI_HERMES - tristate "Prism 2.5 PCI 802.11b adaptor support (EXPERIMENTAL)" - depends on PCI && HERMES && EXPERIMENTAL + tristate "Prism 2.5 PCI 802.11b adaptor support" + depends on PCI && HERMES help Enable support for PCI and mini-PCI 802.11b wireless NICs based on the Prism 2.5 chipset. These are true PCI cards, not the 802.11b
@@ -372,6 +375,19 @@ config PCMCIA_HERMES configure your card and that /etc/pcmcia/wireless.opts works: <http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html>. +config PCMCIA_SPECTRUM + tristate "Symbol Spectrum24 Trilogy PCMCIA card support" + depends on NET_RADIO && PCMCIA && HERMES + ---help--- + + This is a driver for 802.11b cards using RAM-loadable Symbol + firmware, such as Symbol Wireless Networker LA4100, CompactFlash + cards by Socket Communications and Intel PRO/Wireless 2011B. + + This driver requires firmware download on startup. Utilities + for downloading Symbol firmware are available at + <http://sourceforge.net/projects/orinoco/> + config AIRO_CS tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards" depends on NET_RADIO && PCMCIA && (BROKEN || !M32R)
drivers/net/wireless/Makefile +2 -0
@@ -22,6 +22,8 @@ obj-$(CONFIG_APPLE_AIRPORT) += airport.o obj-$(CONFIG_PLX_HERMES) += orinoco_plx.o obj-$(CONFIG_PCI_HERMES) += orinoco_pci.o obj-$(CONFIG_TMD_HERMES) += orinoco_tmd.o +obj-$(CONFIG_NORTEL_HERMES) += orinoco_nortel.o +obj-$(CONFIG_PCMCIA_SPECTRUM) += spectrum_cs.o obj-$(CONFIG_AIRO) += airo.o obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o
drivers/net/wireless/ipw2100.c +35 -34
187 lines not on this page · raw message
drivers/net/wireless/ipw2200.h +1 -0
@@ -42,6 +42,7 @@#include <linux/etherdevice.h> #include <linux/delay.h> #include <linux/random.h> +#include <linux/dma-mapping.h> #include <linux/firmware.h> #include <linux/wireless.h>
drivers/net/wireless/orinoco.c +57 -36
148 lines not on this page · raw message
drivers/net/wireless/orinoco_cs.c +0 -1
@@ -604,7 +604,6 @@ static char version[] __initdata = DRIVEstatic struct pcmcia_device_id orinoco_cs_ids[] = {PCMCIA_DEVICE_MANF_CARD (0x000b ,0x7300 ), -PCMCIA_DEVICE_MANF_CARD (0x0089 ,0x0001 ),PCMCIA_DEVICE_MANF_CARD (0x0138 ,0x0002 ),PCMCIA_DEVICE_MANF_CARD (0x0156 ,0x0002 ),PCMCIA_DEVICE_MANF_CARD (0x01eb ,0x080a ),
drivers/net/wireless/orinoco_nortel.c new file +324 -0
324 lines not on this page · raw message
drivers/net/wireless/spectrum_cs.c new file +1120 -0
1,120 lines not on this page · raw message
net/core/ethtool.c +1 -1
@@ -695,7 +695,7 @@ static int ethtool_get_stats(struct net_return ret; } -static int ethtool_get_perm_addr (struct net_device *dev,void *useraddr) +static int ethtool_get_perm_addr (struct net_device *dev,void __user *useraddr) {struct ethtool_perm_addr epaddr;u8 *data;