summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ethtool: Specify what kind of coalescing struct ethtool_coalesce coversBen Hutchings2011-08-161-1/+1
| | | | | Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* ethtool: Reformat struct ethtool_coalesce comments into kernel-doc formatBen Hutchings2011-08-161-71/+64
| | | | | | | | This reorders and duplicates some wording, but should make no substantive changes. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: Fix sungem_phy sharing.David S. Miller2011-08-168-9/+12
| | | | | | | | | | | Since sungem_phy is used by multiple, unrelated, drivers make it build as a real module under drivers/net. depmod will pick up the symbol dependency and make sure sungem_phy.ko gets loaded any time sungem.ko or spider_net.ko is loaded. Tested-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* sungem: sungem_phy.h movedStephen Rothwell2011-08-151-1/+1
| | | | | Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: Move sungem_phy.h under include/linuxDavid S. Miller2011-08-143-2/+2
| | | | | | | | Fixes build failures of the spider_net driver because it tries to use a convoluted path to include this header. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* qeth: add support for af_iucv HiperSockets transportFrank Blaschka2011-08-136-61/+391
| | | | | | | | | | | | | | | | | | This patch extends the HiperSockets device driver to send and receive af_iucv traffic over HiperSockets transport. TX: Driver uses new asynchronous delivery of storage blocks to pass flow control/congestion information from the HiperSockets microcode to the af_iucv socket. RX: Memory for incoming traffic is preallocated and passed to HiperSockets layer. If receiver is not capable to clean its buffers shared with HiperSockets and pass new memory to the HiperSockets layer this will cause flow control/congestion events on the sender. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qeth: exploit asynchronous delivery of storage blocksEinar Lueck2011-08-132-43/+480
| | | | | | | | | | This patch exploits the QDIO support for asynchronous delivery of storage blocks for Hipersockets. The exploitation is not configured per default and may be enabled via the function qeth_configure_cq. Signed-off-by: Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qeth: support forced signal adapter indicationsEinar Lueck2011-08-131-1/+2
| | | | | | | | | This patch ensures that signal adapter commands are issued if they are indicated to be required. Signed-off-by: Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qdio: support forced signal adapter indicationsfrank.blaschka@de.ibm.com2011-08-133-13/+11
| | | | | | | | | | This patch ensures that signal adapter commands are issued if they are indicated to be required. Signed-off-by: Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qdio: support asynchronous delivery of storage blocksfrank.blaschka@de.ibm.com2011-08-137-80/+424
| | | | | | | | | | | This patch introduces support for asynchronous delivery of storage blocks for Hipersockets. Upper layers may exploit this functionality to reuse SBALs for which the delivery status is still pending. Signed-off-by: Einar Lueck <elelueck@de.ibm.com> Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* af_iucv: add HiperSockets transportUrsula Braun2011-08-132-72/+729
| | | | | | | | | | | | | | | | The current transport mechanism for af_iucv is the z/VM offered communications facility IUCV. To provide equivalent support when running Linux in an LPAR, HiperSockets transport is added to the AF_IUCV address family. It requires explicit binding of an AF_IUCV socket to a HiperSockets device. A new packet_type ETH_P_AF_IUCV is announced. An af_iucv specific transport header is defined preceding the skb data. A small protocol is implemented for connecting and for flow control/congestion management. Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Reviewed-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* if_ether: add new Ethernet Protocol ID for af_iucvFrank Blaschka2011-08-131-0/+1
| | | | | | | | Add a new ethertype for af_iucv over s/390 HiperSockets transport. Since HiperSockets is not a real ethernet hw this is not an officially registered ID. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* af_iucv: cleanup - use iucv_sk(sk) earlyUrsula Braun2011-08-131-21/+23
| | | | | | | | Code cleanup making make use of local variable for struct iucv_sock. Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* af_iucv: use loadable iucv interfaceFrank Blaschka2011-08-131-45/+74
| | | | | | | | For future af_iucv extensions the module should be able to run in LPAR mode too. For this we use the new dynamic loading iucv interface. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* iucv: kernel option for z/VM IUCV and HiperSocketsUrsula Braun2011-08-131-6/+8
| | | | | | | | | | When adding HiperSockets transport to AF_IUCV Sockets, af_iucv either depends on IUCV or QETH_L3 (or both). This patch introduces the necessary changes for kernel configuration. Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* iucv: introduce loadable iucv interfaceFrank Blaschka2011-08-132-1/+58
| | | | | | | This patch adds a symbol to dynamically load iucv functions. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qeth: do not apply priority queuing to HiperSocketsUrsula Braun2011-08-131-19/+21
| | | | | | | | | | | OSA cards can be configured to support 1 or 4 output queues. This does not apply to HiperSockets. This patch limits determination of the configured number of output queues to OSA cards only, but excludes HiperSockets. Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com> Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* qeth: l3 ipv6 vlan not working on shared OSA chpidFrank Blaschka2011-08-131-1/+0
| | | | | | | | | | In layer 3 mode IPv6 over VLAN does not work on newer OSA levels in case the sender and receiver run on the same (shared) OSA adapter. Keep vlan info in the skb so the qdio header is filled with the required vlan tag. Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* drivers/net: Kconfig and Makefile cleanupJeff Kirsher2011-08-134-2043/+6
| | | | | | | | | | | | | | | After the move of the Ethernet drivers into drivers/net/ethernet/ there was some leftover cleanup to do in the Kconfig and Makefile. Removed the 10/100, 1000, and 10GbE Kconfig menus. Removed the out-dated pci-skeleton.c file which was used an example driver. With the current networking features and structure, the file is no longer a good example to use for driver creation. CC: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* acenic: Move the Alteon driverJeff Kirsher2011-08-139-29/+55
| | | | | | | | | | Based on feedback from Alan Cox, the acenic driver moved to drivers/net/ethernet/alteon/ and made the necessary Kconfig and Makefile changes. CC: Jes Sorensen <jes@trained-monkey.org> CC: Alan Cox <alan@linux.intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* tile: Move the Tilera driverJeff Kirsher2011-08-128-15/+18
| | | | | | | | | | Move the Tilera driver into drivers/net/ethernet/tile and make the necessary Kconfig and Makefile changes. Updated the Kconfig so that the options defualt to y if TILE kernel. CC: Chris Metcalf <cmetcalf@tilera.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* xircom: Move the Xircom driverJeff Kirsher2011-08-127-10/+37
| | | | | | | | | Move the Xircom driver into drivers/net/ethernet/xircom/ and make the necessary Kconfig and Makefile changes. CC: <psheer@icon.co.za> CC: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* sh_eth: Move the Renesas SuperH driverJeff Kirsher2011-08-128-16/+25
| | | | | | | | Move the Renesas driver into drivers/net/ethernet/renesas/ and make the necessary Kconfig and Makefile changes. CC: Yoshihiro Shimoda <yoshihiro.shirmoda.uh@renesas.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* netx: Move the netx driverJeff Kirsher2011-08-125-11/+12
| | | | | | | | | Move the netx driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
* dm9000: Move the Davicom driverJeff Kirsher2011-08-128-29/+38
| | | | | | | | | | Move the Davicom driver into drivers/net/ethernet/davicom/ and make the necessary Kconfig and Makefile changes. CC: Ben Dooks <ben@simtec.co.uk> CC: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
* enc28j60: Move the Microchip driverJeff Kirsher2011-08-128-18/+44
| | | | | | | | Move the Microchip driver into drivers/net/ethernet/microchip/ and make the necessary Kconfig and Makefile changes. CC: Claudio Lanconelli <lanconelli.claudio@eptar.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* greth: Move the Aeroflex Gaisler driverJeff Kirsher2011-08-128-9/+18
| | | | | | | | Move the Aeroflex Gaisler driver into drivers/net/ethernet/aeroflex/ and make the necessary Kconfig and Makefile changes. CC: Kristoffer Glembo <kristoffer@gaisler.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* ethoc: Move the Avionic driverJeff Kirsher2011-08-125-11/+12
| | | | | | | | Move the Avionic driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* dnet: Move the Dave Ethernet driverJeff Kirsher2011-08-126-12/+13
| | | | | | | | Move the Dave Ethernet driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* hp100: Move the HP driverJeff Kirsher2011-08-129-13/+39
| | | | | | | | Move the HP driver into drivers/net/ethernet/hp/ and made the necessary Kconfig and Makefile changes. CC: Jaroslav Kysela <perex@perex.cz> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* starfire: Move the Adaptec driverJeff Kirsher2011-08-128-16/+42
| | | | | | | | Move the Adaptec driver into drivers/net/ethernet/adaptec/ and make the necessary Kconfig and Makefile changes. CC: Ion Badulescu <ionut@badula.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* forcedeth: Move the NVIDIA nForce driverJeff Kirsher2011-08-127-12/+38
| | | | | | | Move the nForce driver into drivers/net/ethernet/nvidia/ and make the necessary Kconfig and Makefile changes. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* fealnx: Move the Myson driverJeff Kirsher2011-08-125-10/+11
| | | | | | | | Move the Myson driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Donald Becker <becker@scyld.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* r6040: Move the RDC driverJeff Kirsher2011-08-128-15/+41
| | | | | | | | Move the RDC driver into drivers/net/ethernet/rdc/ and make the necessary Kconfig and Makefile changes. CC: Florian Fainelli <florian@openwrt.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* macb: Move the Atmel driverJeff Kirsher2011-08-1213-38/+53
| | | | | | | | | | | Move the Atmel driver into drivers/net/ethernet/cadence/ and make the necessary Kconfig and Makefile changes. CC: Nicolas Ferre <nicolas.ferre@atmel.com> CC: Jamie Iles <jamie@jamieiles.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
* bfin_mac: Move the Analog Devices Inc driverJeff Kirsher2011-08-129-48/+76
| | | | | | | | | Move the Analog Devices Inc driver into drivers/net/ethernet/adi/ and make the necessary Kconfig and Makefile changes. CC: <uclinux-dist-devel@blackfin.uclinux.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: Bob Liu <bob.liu@analog.com>
* lantiq: Move the Lantiq SoC driverJeff Kirsher2011-08-125-7/+7
| | | | | | | | | Move the Lantiq driver into drivers/net/ethernet/ and the necessary Kconfig and Makefile changes. CC: John Crispin <blogic@openwrt.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: John Crispin <blogic@openwrt.org>
* mipsnet: Move the MIPS driverJeff Kirsher2011-08-125-9/+10
| | | | | | | Move the MIPS drivers into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* korina: Move the IDT driverJeff Kirsher2011-08-125-8/+8
| | | | | | | | | | Move the IDT driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes CC: "IDT Inc." <rischelp@idt.com> CC: Felix Fietkau <nbd@openwrt.org> CC: Florian Fainelli <florian@openwrt.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* ipg: Move the IC Plus driverJeff Kirsher2011-08-129-12/+21
| | | | | | | | | | Move the IC Plus driver into drivers/net/ethernet/icplus/ and make the necessary Kconfig and Makefile changes. CC: <craig_rich@sundanceti.com> CC: <sorbica@icplus.com.tw> CC: <jesse@icplus.com.tw> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* xilinx/ll_temac: Move the Xilinx driversJeff Kirsher2011-08-1210-19/+44
| | | | | | | | | Move the Xilinx drivers into drivers/net/ethernet/xilinx/ and make the necessary Kconfig and Makefile changes. CC: John Williams <john.williams@petalogix.com> CC: "David H. Lynch Jr." <dhlii@dlasys.net> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* jme: Move the JME driverJeff Kirsher2011-08-127-14/+15
| | | | | | | | Move the JME driver into drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* octeon: Move the Cavium driverJeff Kirsher2011-08-128-6/+12
| | | | | | | | | Move the Cavium driver to drivers/net/ethernet/octeon/ and make the necessary Kconfig and Makefile changes. CC: David Daney <david.daney@cavium.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Acked-by: David Daney <david.daney@cavium.com>
* hamachi/yellowfin: Move the packet engine driversJeff Kirsher2011-08-128-28/+54
| | | | | | | | Move the packet engine drivers to drivers/net/ethernet/packetengines/ and the necessary Kconfig and Makefile changes. CC: Donald Becker <becker@scyld.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* davinci*/tlan/cpmac: Move the Texas Instruments (TI) driversJeff Kirsher2011-08-1214-65/+89
| | | | | | | | | | | | | | Move the Texas Instruments drivers to drivers/net/ethernet/ti/ and make the necessary Kconfig and Makefile changes. CC: Sriram <srk@ti.com> CC: Vinay Hegde <vinay.hegde@ti.com> CC: Cyril Chemparathy <cyril@ti.com> CC: Samuel Chessman <chessman@tux.org> CC: <torben.mathiasen@compaq.com> CC: Eugene Konev <ejka@imfi.kspu.ru> CC: Florian Fainelli <florian@openwrt.org> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* s6gmac: Move the s6gmac driversJeff Kirsher2011-08-125-12/+13
| | | | | | | | Move the s6gmac driver to drivers/net/ethernet/ and make the necessary Kconfig and Makefile changes. CC: Oskar Schirmer <os@emlix.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* tsi108*: Move the Tundra driverJeff Kirsher2011-08-128-9/+35
| | | | | | | | Move the Tundra driver to drivers/net/ethernet/tundra/ and make the necessary Kocnfig and Makefile changes. CC: Kong Lai <kong.lai@tundra.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* nuvoton: Move the Nuvoton driverJeff Kirsher2011-08-128-11/+37
| | | | | | | | Move the Nuvoton driver into drivers/net/ethernet/nuvoton/ and make the necessary Kconfig and Makefile changes. CC: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* cirrus: Move the Cirrus network driverJeff Kirsher2011-08-128-10/+36
| | | | | | | | Move the Cirrus Ethernet driver into drivers/net/ethernet/cirrus/ and make the necessary Kconfig and Makefile changes CC: Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
* sis*: Move the Silicon Integrated Systems (SiS) driversJeff Kirsher2011-08-1210-34/+60
| | | | | | | | | Move the SiS drivers into drivers/net/ethernet/sis/ and make the necessary Kconfig and Makefile changes CC: Daniele Venzano <venza@brownhat.org> CC: Francois Romieu <romieu@fr.zoreil.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>