net driver updates for .28
Subsystems (9)
PATCH 1/1 net driver updates for .28
Please pull from 'davem-next' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-next
to receive the following updates:
drivers/net/3c505.c | 4 +- drivers/net/Kconfig | 14 +- drivers/net/arcnet/arcnet.c | 18 +- drivers/net/arcnet/com20020.c | 16 +- drivers/net/ax88796.c | 14 +- drivers/net/bfin_mac.c | 8 +- drivers/net/bonding/bond_main.c | 6 + drivers/net/bonding/bonding.h | 2 +- drivers/net/cxgb3/cxgb3_offload.c | 8 +- drivers/net/cxgb3/sge.c | 35 - drivers/net/e100.c | 2 +- drivers/net/ehea/ehea.h | 4 +- drivers/net/ehea/ehea_main.c | 26 +- drivers/net/enc28j60.c | 56 +- drivers/net/ibm_newemac/phy.c | 2 +- drivers/net/ixgb/ixgb.h | 2 +- drivers/net/ixgbe/ixgbe.h | 72 +- drivers/net/ixgbe/ixgbe_82598.c | 628 +++++++++++++--- drivers/net/ixgbe/ixgbe_common.c | 972 ++++++++++++++++--------- drivers/net/ixgbe/ixgbe_common.h | 62 +- drivers/net/ixgbe/ixgbe_ethtool.c | 303 ++++---- drivers/net/ixgbe/ixgbe_main.c | 1318 +++++++++++++++++++--------------- drivers/net/ixgbe/ixgbe_phy.c | 244 +++---- drivers/net/ixgbe/ixgbe_phy.h | 63 ++- drivers/net/ixgbe/ixgbe_type.h | 528 +++++++++----- drivers/net/meth.c | 2 +- drivers/net/mipsnet.c | 2 +- drivers/net/myri10ge/myri10ge.c | 381 +++++++++-- drivers/net/netx-eth.c | 2 +- drivers/net/netxen/netxen_nic.h | 2 +- drivers/net/netxen/netxen_nic_main.c | 20 +- drivers/net/pci-skeleton.c | 4 +- drivers/net/r6040.c | 4 +- drivers/net/r8169.c | 2 +- drivers/net/s2io.c | 40 +- drivers/net/sfc/efx.c | 18 +- drivers/net/sfc/falcon.c | 260 ++++---- drivers/net/sfc/falcon.h | 1 + drivers/net/sfc/falcon_hwdefs.h | 1 - drivers/net/sfc/falcon_io.h | 1 - drivers/net/sfc/falcon_xmac.c | 88 +--- drivers/net/sfc/net_driver.h | 8 +- drivers/net/sfc/sfe4001.c | 12 - drivers/net/sfc/tenxpress.c | 69 +-- drivers/net/sfc/tx.c | 2 +- drivers/net/sfc/workarounds.h | 2 - drivers/net/sfc/xfp_phy.c | 1 - drivers/net/smc911x.c | 68 +- drivers/net/smc91x.c | 40 +- drivers/net/sundance.c | 95 ++- drivers/net/tehuti.h | 8 +- drivers/net/tsi108_eth.c | 6 +- drivers/net/ucc_geth.c | 116 ++-- drivers/net/usb/hso.c | 326 ++++++--- drivers/net/usb/mcs7830.c | 2 +- drivers/net/usb/pegasus.c | 20 +- drivers/net/via-velocity.h | 2 +- drivers/net/wan/cycx_drv.c | 6 +- drivers/net/wan/cycx_x25.c | 12 +- drivers/net/wan/dscc4.c | 2 +- drivers/net/wan/pc300_tty.c | 2 +- include/linux/pci_ids.h | 10 + 62 files changed, 3684 insertions(+), 2360 deletions(-)
Alexander Duyck (3):
ixgbe: correctly add and remove napi queues
ixgbe: whitespace/formatting cleanup
ixgbe: make compilation with LRO optional
Ben Hutchings (11):
sfc: Add check for memory allocation failure in falcon_probe_nic()
sfc: Fix memory BAR release call on error path
sfc: Remove workaround for old firmware bug
sfc: Serialise tenxpress_special_reset() with statistics fetches
sfc: Make queue flushes more reliable
sfc: Stop generating bogus events in tenxpress_check_hw()
sfc: Insert read memory barrier after checking MAC statistics flag
sfc: Disable interrupts after a fatal interrupt occurs until reset
sfc: Remove obsolete comment about PCI modes
sfc: Use CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS where appropriate
sfc: Fix type of FALCON_SPI_MAX_LEN
Brice Goglin (5):
myri10ge: Stop scaring people when DCA is built but absent
myri10ge: Rename DCA-related firmware counters
myri10ge: Add Toeplitz-hashing related routines
myri10ge: Add multiqueue TX support
myri10ge: use DCA if DCA is compiled as a module
Dan Nicholson (1):
sundance: set carrier status on link change events
Denis Joseph Barrow (1):
[netdrvr] usb/hso: throttle to prevent loss of serial data
Dhananjay Phadke (2):
netxen: add pci ids
netxen: enable msi-x for quad-gig boards
Divy Le Ray (1):
cxgb3 - remove duplicate tests in lro
Florian Fainelli (1):
r6040: fix bad usage of udelay
Francois Romieu (1):
r8169: select MII in Kconfig
Hannes Hering (1):
ehea: Enable DLPAR memory remove
Harvey Harrison (1):
drivers/net: replace __FUNCTION__ with __func__
Jeff Kirsher (2):
ixgbe: fix pci_resource allocation as in other drivers
ixgbe: bump version
Jesse Brandeburg (23):
ixgbe: fix bug where using wake queue instead of start
ixgbe: fix dca defines to not have spaces
ixgbe: fix multicast address update
ixgbe: Update watchdog thread to accomodate longerlink_up events
ixgbe: link change interrupt was not causing link event
ixgbe: fix bug with shared interrupts
ixgbe: limit small mtu to minimum for ipv4 support
ixgbe: fix ethtool register dump
ixgbe: fix ethtool disable csum for ipv6
ixgbe: fix initial interrupt throttle settings
ixgbe: fix bug with lots of tx queues
ixgbe: recycle pages in packet split mode
ixgbe: add device support for XF LR adapters
ixgbe: fix ring reallocation in ethtool
ixgbe: lro stats were not counted on first ethtool -Scall
ixgbe: add clean rx many routine
ixgbe: update to latest common code module
ixgbe: refresh the ixgbe_down function
ixgbe: move set_num_queues and call it after msix failure
ixgbe: cleanup defines
ixgbe: lower stack space usage
ixgbe: xmit frame refactor
ixgbe: fix DCA dependency in Kconfig
Magnus Damm (1):
smc911x: remove duplicate debug printout
Peter P Waskiewicz (1):
ixgbe: Whitespace, copyright update and version number change patch
Sebastien Dugue (1):
ehea: fix mutex and spinlock use
Stephen Hemminger (1):
bonding: add more ethtool support
Steve Hodgson (2):
sfc: Don't use EFX_OWORD_FIELD on an event (64-bit, quad-word)
sfc: Don't include net_driver.h from falcon_io.h
drivers/net/3c505.c +2 -2
@@ -130,12 +130,12 @@ static const char filename[] = __FILE__;static const char timeout_msg[] ="*** timeout at %s:%s (line %d) ***\n" ;#define TIMEOUT_MSG (lineno) \ - printk(timeout_msg, filename,__FUNCTION__,(lineno)) + printk(timeout_msg, filename,__func__,(lineno))static const char invalid_pcb_msg[] ="*** invalid pcb length %d at %s:%s (line %d) ***\n" ;#define INVALID_PCB_MSG (len) \ - printk(invalid_pcb_msg, (len),filename,__FUNCTION__,__LINE__) + printk(invalid_pcb_msg, (len),filename,__func__,__LINE__)static char search_msg[]__initdata =KERN_INFO "%s: Looking for 3c505 adapter at address %#x..." ;
drivers/net/Kconfig +13 -1
@@ -2046,6 +2046,7 @@ config R8169 tristate "Realtek 8169 gigabit ethernet support" depends on PCI select CRC32 + select MII ---help--- Say Y here if you have a Realtek 8169 PCI Gigabit Ethernet adapter.
@@ -2380,7 +2381,7 @@ config EHEA config IXGBE tristate "Intel(R) 10GbE PCI Express adapters support" depends on PCI && INET - select INET_LRO + select INTEL_IOATDMA ---help--- This driver supports Intel(R) 10GbE PCI Express family of adapters. For more information on how to identify your adapter, go
@@ -2396,6 +2397,16 @@ config IXGBE To compile this driver as a module, choose M here. The module will be called ixgbe. +config IXGBE_LRO + bool "Use software LRO" + depends on IXGBE && INET + select INET_LRO + default y + ---help--- + Say Y here if you want to use large receive offload. + + If in doubt, say N. + config IXGB tristate "Intel(R) PRO/10GbE support" depends on PCI
@@ -2432,6 +2443,7 @@ config MYRI10GE select FW_LOADER select CRC32 select INET_LRO + select INTEL_IOATDMA ---help--- This driver supports Myricom Myri-10G Dual Protocol interface in Ethernet mode. If the eeprom on your board is not recent enough,
drivers/net/arcnet/arcnet.c +9 -9
@@ -442,24 +442,24 @@ static int arcnet_open(struct net_device *dev)BUGMSG (D_NORMAL ,"WARNING! Station address FF may confuse " "DOS networking programs!\n" ); -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);if (ASTATUS () & RESETflag) { -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);ACOMMAND (CFLAGScmd | RESETclear); } -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);/* make sure we're ready to receive IRQ's. */ AINTMASK (0 );udelay (1 );/* give it time to set the mask before * we reset it again. (may not even be * necessary) */ -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__); lp->intmask = NORXflag | RECONflag;AINTMASK (lp->intmask); -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);netif_start_queue (dev);
@@ -670,14 +670,14 @@ static int arcnet_send_packet(struct sk_buff *skb, struct net_device *dev) freeskb =0 ; } -BUGMSG (D_DEBUG ,"%s: %d: %s, status: %x\n" ,__FILE__,__LINE__,__FUNCTION__,ASTATUS ()); +BUGMSG (D_DEBUG ,"%s: %d: %s, status: %x\n" ,__FILE__,__LINE__,__func__,ASTATUS ());/* make sure we didn't ignore a TX IRQ while we were in here */ AINTMASK (0 ); -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__); lp->intmask |= TXFREEflag|EXCNAKflag;AINTMASK (lp->intmask); -BUGMSG (D_DEBUG ,"%s: %d: %s, status: %x\n" ,__FILE__,__LINE__,__FUNCTION__,ASTATUS ()); +BUGMSG (D_DEBUG ,"%s: %d: %s, status: %x\n" ,__FILE__,__LINE__,__func__,ASTATUS ());spin_unlock_irqrestore (&lp->lock, flags);if (freeskb) {
@@ -798,7 +798,7 @@ irqreturn_t arcnet_interrupt(int irq, void *dev_id) diagstatus = (status >>8 ) &0xFF ;BUGMSG (D_DEBUG ,"%s: %d: %s: status=%x\n" , - __FILE__,__LINE__,__FUNCTION__,status); + __FILE__,__LINE__,__func__,status); didsomething =0 ;/*
drivers/net/arcnet/com20020.c +8 -8
@@ -238,15 +238,15 @@ static int com20020_reset(struct net_device *dev, int really_reset)u_char inbyte;BUGMSG (D_DEBUG ,"%s: %d: %s: dev: %p, lp: %p, dev->name: %s\n" , - __FILE__,__LINE__,__FUNCTION__,dev,lp,dev->name); + __FILE__,__LINE__,__func__,dev,lp,dev->name);BUGMSG (D_INIT ,"Resetting %s (status=%02Xh)\n" , dev->name,ASTATUS ()); -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__); lp->config = TXENcfg | (lp->timeout <<3 ) | (lp->backplane <<2 );/* power-up defaults */ SETCONF ; -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);if (really_reset) {/* reset the card */
@@ -254,22 +254,22 @@ static int com20020_reset(struct net_device *dev, int really_reset)mdelay (RESETtime *2 );/* COM20020 seems to be slower sometimes */ }/* clear flags & end reset */ -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);ACOMMAND (CFLAGScmd | RESETclear | CONFIGclear);/* verify that the ARCnet signature byte is present */ -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);com20020_copy_from_card (dev,0 ,0 , &inbyte,1 ); -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);if (inbyte != TESTvalue) { -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);BUGMSG (D_NORMAL ,"reset failed: TESTvalue not present.\n" );return 1 ; }/* enable extended (512-byte) packets */ ACOMMAND (CONFIGcmd | EXTconf); -BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__FUNCTION__); +BUGMSG (D_DEBUG ,"%s: %d: %s\n" ,__FILE__,__LINE__,__func__);/* done! return success. */ return 0 ;
drivers/net/ax88796.c +7 -7
@@ -153,7 +153,7 @@ static void ax_reset_8390(struct net_device *dev)while ((ei_inb (addr +EN0_ISR ) &ENISR_RESET ) ==0 ) {if (jiffies - reset_start_time >2 *HZ /100 ) {dev_warn (&ax->dev->dev,"%s: %s did not complete.\n" , - __FUNCTION__, dev->name); + __func__, dev->name);break ; } }
@@ -173,7 +173,7 @@ static void ax_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,if (ei_status.dmaing) {dev_err (&ax->dev->dev,"%s: DMAing conflict in %s " "[DMAstat:%d][irqlock:%d].\n" , - dev->name, __FUNCTION__, + dev->name, __func__, ei_status.dmaing, ei_status.irqlock);return ; }
@@ -215,7 +215,7 @@ static void ax_block_input(struct net_device *dev, int count,dev_err (&ax->dev->dev,"%s: DMAing conflict in %s " "[DMAstat:%d][irqlock:%d].\n" , - dev->name, __FUNCTION__, + dev->name, __func__, ei_status.dmaing, ei_status.irqlock);return ; }
@@ -260,7 +260,7 @@ static void ax_block_output(struct net_device *dev, int count,if (ei_status.dmaing) {dev_err (&ax->dev->dev,"%s: DMAing conflict in %s." "[DMAstat:%d][irqlock:%d]\n" , - dev->name, __FUNCTION__, + dev->name, __func__, ei_status.dmaing, ei_status.irqlock);return ; }
@@ -396,7 +396,7 @@ ax_phy_issueaddr(struct net_device *dev, int phy_addr, int reg, int opc) {if (phy_debug)pr_debug ("%s: dev %p, %04x, %04x, %d\n" , - __FUNCTION__, dev, phy_addr, reg, opc); + __func__, dev, phy_addr, reg, opc);ax_mii_ei_outbits (dev,0x3f ,6 );/* pre-amble */ ax_mii_ei_outbits (dev,1 ,2 );/* frame-start */
@@ -422,7 +422,7 @@ ax_phy_read(struct net_device *dev, int phy_addr, int reg)spin_unlock_irqrestore (&ei_local->page_lock, flags);if (phy_debug) -pr_debug ("%s: %04x.%04x => read %04x\n" , __FUNCTION__, +pr_debug ("%s: %04x.%04x => read %04x\n" , __func__, phy_addr, reg, result);return result;
@@ -436,7 +436,7 @@ ax_phy_write(struct net_device *dev, int phy_addr, int reg, int value)unsigned long flags;dev_dbg (&ax->dev->dev,"%s: %p, %04x, %04x %04x\n" , - __FUNCTION__, dev, phy_addr, reg, value); + __func__, dev, phy_addr, reg, value);spin_lock_irqsave (&ei->page_lock, flags);
drivers/net/bfin_mac.c +4 -4
@@ -811,7 +811,7 @@ static void bfin_mac_enable(void) {u32 opmode; -pr_debug ("%s: %s\n" ,DRV_NAME , __FUNCTION__); +pr_debug ("%s: %s\n" ,DRV_NAME , __func__);/* Set RX DMA */ bfin_write_DMA1_NEXT_DESC_PTR (&(rx_list_head->desc_a));
@@ -847,7 +847,7 @@ static void bfin_mac_enable(void)/* Our watchdog timed out. Called by the networking layer */ static void bfin_mac_timeout (struct net_device *dev) { -pr_debug ("%s: %s\n" , dev->name, __FUNCTION__); +pr_debug ("%s: %s\n" , dev->name, __func__);bfin_mac_disable ();
@@ -949,7 +949,7 @@ static int bfin_mac_open(struct net_device *dev) {struct bfin_mac_local *lp =netdev_priv (dev);int retval; -pr_debug ("%s: %s\n" , dev->name, __FUNCTION__); +pr_debug ("%s: %s\n" , dev->name, __func__);/* * Check that the address is valid. If its not, refuse
@@ -989,7 +989,7 @@ static int bfin_mac_open(struct net_device *dev)static int bfin_mac_close (struct net_device *dev) {struct bfin_mac_local *lp =netdev_priv (dev); -pr_debug ("%s: %s\n" , dev->name, __FUNCTION__); +pr_debug ("%s: %s\n" , dev->name, __func__);netif_stop_queue (dev);netif_carrier_off (dev);
drivers/net/bonding/bond_main.c +6 -0
@@ -4493,6 +4493,12 @@ static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,static const struct ethtool_ops bond_ethtool_ops = { .get_drvinfo = bond_ethtool_get_drvinfo, + .get_link = ethtool_op_get_link, + .get_tx_csum = ethtool_op_get_tx_csum, + .get_sg = ethtool_op_get_sg, + .get_tso = ethtool_op_get_tso, + .get_ufo = ethtool_op_get_ufo, + .get_flags = ethtool_op_get_flags, };/*
drivers/net/bonding/bonding.h +1 -1
@@ -32,7 +32,7 @@#ifdef BONDING_DEBUG #define dprintk(fmt, args...) \ printk(KERN_DEBUG \ - DRV_NAME ": %s() %d: " fmt, __FUNCTION__, __LINE__ , ## args ) + DRV_NAME ": %s() %d: " fmt, __func__, __LINE__ , ## args )#else #define dprintk(fmt, args...)#endif /* BONDING_DEBUG */
drivers/net/cxgb3/cxgb3_offload.c +4 -4
@@ -1018,7 +1018,7 @@ static void set_l2t_ix(struct t3cdev *tdev, u32 tid, struct l2t_entry *e) skb =alloc_skb (sizeof (*req),GFP_ATOMIC );if (!skb) { -printk (KERN_ERR "%s: cannot allocate skb!\n" , __FUNCTION__); +printk (KERN_ERR "%s: cannot allocate skb!\n" , __func__);return ; } skb->priority =CPL_PRIORITY_CONTROL ;
@@ -1049,14 +1049,14 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new)return ;if (!is_offloading (newdev)) {printk (KERN_WARNING "%s: Redirect to non-offload " -"device ignored.\n" , __FUNCTION__); +"device ignored.\n" , __func__);return ; } tdev =dev2t3cdev (olddev);BUG_ON (!tdev);if (tdev !=dev2t3cdev (newdev)) {printk (KERN_WARNING "%s: Redirect to different " -"offload device ignored.\n" , __FUNCTION__); +"offload device ignored.\n" , __func__);return ; }
@@ -1064,7 +1064,7 @@ void cxgb_redirect(struct dst_entry *old, struct dst_entry *new) e =t3_l2t_get (tdev, new->neighbour, newdev);if (!e) {printk (KERN_ERR "%s: couldn't allocate new l2t entry!\n" , - __FUNCTION__); + __func__);return ; }
drivers/net/cxgb3/sge.c +0 -35
@@ -1937,38 +1937,6 @@ static inline int lro_frame_ok(const struct cpl_rx_pkt *p) eh->h_proto ==htons (ETH_P_IP ) && ih->ihl == (sizeof (*ih) >>2 ); } -#define TCP_FLAG_MASK (TCP_FLAG_CWR | TCP_FLAG_ECE | TCP_FLAG_URG |\ - TCP_FLAG_ACK | TCP_FLAG_PSH | TCP_FLAG_RST |\ - TCP_FLAG_SYN | TCP_FLAG_FIN) -#define TSTAMP_WORD ((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |\ - (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP) - -/** -* lro_segment_ok - check if a TCP segment is eligible for LRO -* @tcph: the TCP header of the packet -* -* Returns true if a TCP packet is eligible for LRO. This requires that -* the packet have only the ACK flag set and no TCP options besides -* time stamps. -*/ -static inline int lro_segment_ok (const struct tcphdr *tcph) -{ -int optlen; - -if (unlikely ((tcp_flag_word (tcph) &TCP_FLAG_MASK ) !=TCP_FLAG_ACK )) -return 0 ; - - optlen = (tcph->doff <<2 ) -sizeof (*tcph); -if (optlen) { -const u32 *opt = (const u32 *)(tcph +1 ); - -if (optlen !=TCPOLEN_TSTAMP_ALIGNED || - *opt !=htonl (TSTAMP_WORD ) || !opt[2 ]) -return 0 ; - } -return 1 ; -} -static int t3_get_lro_header (void **eh,void **iph,void **tcph,u64 *hdr_flags,void *priv) {
@@ -1981,9 +1949,6 @@ static int t3_get_lro_header(void **eh, void **iph, void **tcph, *iph = (struct iphdr *)((struct ethhdr *)*eh +1 ); *tcph = (struct tcphdr *)((struct iphdr *)*iph +1 ); -if (!lro_segment_ok (*tcph)) -return -1 ; - *hdr_flags =LRO_IPV4 |LRO_TCP ;return 0 ; }
drivers/net/e100.c +1 -1
@@ -191,7 +191,7 @@ MODULE_PARM_DESC(use_io, "Force use of i/o access mode"); #define DPRINTK(nlevel, klevel, fmt, args...) \ (void)((NETIF_MSG_##nlevel & nic->msg_enable) && \ printk(KERN_##klevel PFX "%s: %s: " fmt, nic->netdev->name, \ - __FUNCTION__ , ## args)) + __func__ , ## args))#define INTEL_8255X_ETHERNET_DEVICE (device_id, ich) {\ PCI_VENDOR_ID_INTEL, device_id, PCI_ANY_ID, PCI_ANY_ID, \
drivers/net/ehea/ehea.h +2 -2
@@ -40,13 +40,13 @@#include <asm/io.h> #define DRV_NAME "ehea" -#define DRV_VERSION "EHEA_0092" +#define DRV_VERSION "EHEA_0093"/* eHEA capability flags */ #define DLPAR_PORT_ADD_REM 1#define DLPAR_MEM_ADD 2#define DLPAR_MEM_REM 4 -#define EHEA_CAPABILITIES (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD) +#define EHEA_CAPABILITIES (DLPAR_PORT_ADD_REM | DLPAR_MEM_ADD | DLPAR_MEM_REM)#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
drivers/net/ehea/ehea_main.c +4 -22
@@ -219,9 +219,11 @@ static void ehea_update_firmware_handles(void) } out_update: +mutex_lock (&ehea_fw_handles.lock);kfree (ehea_fw_handles.arr); ehea_fw_handles.arr = arr; ehea_fw_handles.num_entries = i; +mutex_unlock (&ehea_fw_handles.lock); }static void ehea_update_bcmc_registrations (void )
@@ -293,9 +295,11 @@ static void ehea_update_bcmc_registrations(void) } out_update: +spin_lock (&ehea_bcmc_regs.lock);kfree (ehea_bcmc_regs.arr); ehea_bcmc_regs.arr = arr; ehea_bcmc_regs.num_entries = i; +spin_unlock (&ehea_bcmc_regs.lock); }static struct net_device_stats *ehea_get_stats (struct net_device *dev)
@@ -1770,8 +1774,6 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa)memcpy (dev->dev_addr, mac_addr->sa_data, dev->addr_len); -spin_lock (&ehea_bcmc_regs.lock); -/* Deregister old MAC in pHYP */ if (port->state ==EHEA_PORT_UP ) { ret =ehea_broadcast_reg_helper (port,H_DEREG_BCMC );
@@ -1792,7 +1794,6 @@ static int ehea_set_mac_addr(struct net_device *dev, void *sa) out_upregs:ehea_update_bcmc_registrations (); -spin_unlock (&ehea_bcmc_regs.lock); out_free:kfree (cb0); out:
@@ -1954,8 +1955,6 @@ static void ehea_set_multicast_list(struct net_device *dev) }ehea_promiscuous (dev,0 ); -spin_lock (&ehea_bcmc_regs.lock); -if (dev->flags &IFF_ALLMULTI ) {ehea_allmulti (dev,1 ); goto out;
@@ -1985,7 +1984,6 @@ static void ehea_set_multicast_list(struct net_device *dev) } out:ehea_update_bcmc_registrations (); -spin_unlock (&ehea_bcmc_regs.lock);return ; }
@@ -2466,8 +2464,6 @@ static int ehea_up(struct net_device *dev)if (port->state ==EHEA_PORT_UP )return 0 ; -mutex_lock (&ehea_fw_handles.lock); - ret =ehea_port_res_setup (port, port->num_def_qps, port->num_add_tx_qps);if (ret) {
@@ -2504,8 +2500,6 @@ static int ehea_up(struct net_device *dev) } } -spin_lock (&ehea_bcmc_regs.lock); - ret =ehea_broadcast_reg_helper (port,H_REG_BCMC );if (ret) { ret = -EIO ;
@@ -2527,10 +2521,8 @@ out:ehea_info ("Failed starting %s. ret=%i" , dev->name, ret);ehea_update_bcmc_registrations (); -spin_unlock (&ehea_bcmc_regs.lock);ehea_update_firmware_handles (); -mutex_unlock (&ehea_fw_handles.lock);return ret; }
@@ -2580,9 +2572,6 @@ static int ehea_down(struct net_device *dev)if (port->state ==EHEA_PORT_DOWN )return 0 ; -mutex_lock (&ehea_fw_handles.lock); - -spin_lock (&ehea_bcmc_regs.lock);ehea_drop_multicast_list (dev);ehea_broadcast_reg_helper (port,H_DEREG_BCMC );
@@ -2591,7 +2580,6 @@ static int ehea_down(struct net_device *dev) port->state =EHEA_PORT_DOWN ;ehea_update_bcmc_registrations (); -spin_unlock (&ehea_bcmc_regs.lock); ret =ehea_clean_all_portres (port);if (ret)
@@ -2599,7 +2587,6 @@ static int ehea_down(struct net_device *dev) dev->name, ret);ehea_update_firmware_handles (); -mutex_unlock (&ehea_fw_handles.lock);return ret; }
@@ -3378,7 +3365,6 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,ehea_error ("Invalid ibmebus device probed" );return -EINVAL ; } -mutex_lock (&ehea_fw_handles.lock); adapter =kzalloc (sizeof (*adapter),GFP_KERNEL );if (!adapter) {
@@ -3462,7 +3448,6 @@ out_free_ad: out:ehea_update_firmware_handles (); -mutex_unlock (&ehea_fw_handles.lock);return ret; }
@@ -3481,8 +3466,6 @@ static int __devexit ehea_remove(struct of_device *dev)flush_scheduled_work (); -mutex_lock (&ehea_fw_handles.lock); -ibmebus_free_irq (adapter->neq->attr.ist1, adapter);tasklet_kill (&adapter->neq_tasklet);
@@ -3492,7 +3475,6 @@ static int __devexit ehea_remove(struct of_device *dev)kfree (adapter);ehea_update_firmware_handles (); -mutex_unlock (&ehea_fw_handles.lock);return 0 ; }
drivers/net/enc28j60.c +28 -28
223 lines not on this page · raw message
drivers/net/ibm_newemac/phy.c +1 -1
@@ -321,7 +321,7 @@ static struct mii_phy_def bcm5248_phy_def = {static int m88e1111_init (struct mii_phy *phy) { -pr_debug ("%s: Marvell 88E1111 Ethernet\n" , __FUNCTION__); +pr_debug ("%s: Marvell 88E1111 Ethernet\n" , __func__);phy_write (phy,0x14 ,0x0ce3 );phy_write (phy,0x18 ,0x4101 );phy_write (phy,0x09 ,0x0e00 );
drivers/net/ixgb/ixgb.h +1 -1
@@ -85,7 +85,7 @@ struct ixgb_adapter; #define DPRINTK(nlevel, klevel, fmt, args...) \ (void)((NETIF_MSG_##nlevel & adapter->msg_enable) && \ printk(KERN_##klevel PFX "%s: %s: " fmt, adapter->netdev->name, \ - __FUNCTION__ , ## args)) + __func__ , ## args))/* TX/RX descriptor defines */
drivers/net/ixgbe/ixgbe.h +34 -38
176 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_82598.c +519 -109
821 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_common.c +637 -335
1,273 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_common.h +35 -27
62 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_ethtool.c +159 -144
303 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_main.c +752 -566
1,318 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_phy.c +89 -155
244 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_phy.h +47 -16
63 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_type.h +340 -188
528 lines not on this page · raw message
drivers/net/myri10ge/myri10ge.c +330 -51
381 lines not on this page · raw message
drivers/net/sfc/falcon.c +138 -122
260 lines not on this page · raw message
drivers/net/sfc/falcon_xmac.c +1 -87
88 lines not on this page · raw message
drivers/net/sfc/tenxpress.c +11 -58
69 lines not on this page · raw message
drivers/net/smc911x.c +33 -35
68 lines not on this page · raw message
drivers/net/sundance.c +62 -33
95 lines not on this page · raw message
drivers/net/ucc_geth.c +58 -58
116 lines not on this page · raw message
drivers/net/usb/hso.c +234 -92
326 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Miller
maintainerFrom: Jeff Garzik <[email protected]>
Date: Sat, 13 Sep 2008 22:22:36 -0400
Quoted 4 lines
Please pull from 'davem-next' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-next
to receive the following updates:
Jeff, I pulled this and I was going to push back out but I couldn't because there are two or three changes in here I think have major problems.
First, the two myri10ge patches that do the Toeplitz TX hashing stuff.
--------------------
myri10ge: Add Toeplitz-hashing related routines
myri10ge uses a Toeplitz hashing. Add the corresponding select_queue() method without using it yet.
myri10ge: Add multiqueue TX support
Add multiqueue TX support to myri10ge, using Toeplitz hashing.
--------------------
No, that is crap. I didn't create the ->select_tx_queue() callback so that each and every damn multiqueue driver will override the generic TX hash function in order to try and make the TX hashing match the RX hashing.
That's not what it's for.
The callback exists for things like wireless where the queues have a meaning other than flow seperation.
We (specifically Herbert Xu and myself) know that for routing and firewalling applications matching the TX queue to the same hashing namespace of the RX multiqueueing is desirable for best performance.
But we will do that generically by allowing the driver on the receive side to record the RX hash used (or alternatively, if the exact RSS hash isn't obtainable, the RX queue index itself) and on TX we will use this information to select the TX queue properly.
Next, a bad IXGBE change:
--------------------
ixgbe: make compilation with LRO optional
The current ixgbe forces LRO to always be enabled. This patch makes this optional due to the fact so that LRO can be disabled in cases where it is not desirable such as routing or bridging.
--------------------
Ummm, no. This is completely unnecessary and it's another thing we don't want every damn driver doing. It is almost as bad as making NAPI configurable.
If the user enables forwarding or bridging, the kernel automatically disable LRO on the appropriate interfaces.
Jeff, please rebuild your tree with those three patches removed and I'll repull. Those patches were near or at the end of the group of changes for their effected drivers, so there should be absolutely zero conflicts or merge windows when you do this tree rebuild.
Thanks!
Quoted 10 lines · David Miller
No, that is crap. I didn't create the ->select_tx_queue() callback so that each and every damn multiqueue driver will override the generic TX hash function in order to try and make the TX hashing match the RX hashing.
That's not what it's for.
The callback exists for things like wireless where the queues have a meaning other than flow seperation.
Quoted 9 lines
We (specifically Herbert Xu and myself) know that for routing and firewalling applications matching the TX queue to the same hashing namespace of the RX multiqueueing is desirable for best performance.
But we will do that generically by allowing the driver on the receive side to record the RX hash used (or alternatively, if the exact RSS hash isn't obtainable, the RX queue index itself) and on TX we will use this information to select the TX queue properly.
Ok, I'll resend without the select_queue stuff. But you should really document the above explanation. The only documentation we found was "Devices or device layers can set this to control the queue selection performed by dev_pick_tx()." in the git-log...
Brice
David Miller
maintainerFrom: Brice Goglin <[email protected]>
Date: Sat, 20 Sep 2008 09:28:24 +0200
Quoted 4 lines
Ok, I'll resend without the
select_queuestuff. But you should really document the above explanation. The only documentation we found was "Devices or device layers can set this to control the queue selection performed bydev_pick_tx()." in the git-log...
Sure.
On your part, I would suggest that when you run into a problem that many other multiqueue drivers will likely face, that you bring it up here for discussion instead of implementing localized solutions :-)