summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* snap: use const for descriptorStephen Hemminger2009-03-212-4/+8
| | | | | | | | | Protocols should be able to use constant value for the descriptor. Minor whitespace cleanup as well Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* igb: cleanup tx dma so map & unmap use matching callsAlexander Duyck2009-03-211-31/+35
| | | | | | | | | | | | | The igb driver was using map_single to map the skbs and then unmap_page to unmap them. This update changes that so instead uses skb_dma_map and skb_dma_unmap. In addition the next_to_watch member of the buffer_info struct was being set uneccesarily. I removed the spots where it was set without being needed. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* igb: rework igb_set_multi so that vfs are properly updatedAlexander Duyck2009-03-211-10/+8
| | | | | | | | | | | Currently if there are no multicast addresses programmed into the PF then the VFs cannot have their multicast filters reset. This change makes it so the code path that updates vf multicast is always called along with the pf updates. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* igb: update driver to use setup_timer functionAlexander Duyck2009-03-211-7/+4
| | | | | | | | | igb was previously setting up all of the timer members itself. It is easier to just call setup_timer and reduce the calls to one line. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* igb: remove IGB_DESC_UNUSED since it is better handled by a function callAlexander Duyck2009-03-212-11/+18
| | | | | | | | | This patch removes IGB_DESC_UNUSED and replaces it with a function call instead in order to cleanup some of the ugliness introduced by the macro. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* igb: allow tx of pre-formatted vlan tagged packetsArthur Jones2009-03-211-1/+12
| | | | | | | | | | | | | | | | | | | | | | | When the 82575 is fed 802.1q packets, it chokes with an error of the form: igb 0000:08:00.1 partial checksum but proto=81! As the logic there was not smart enough to look into the vlan header to pick out the encapsulated protocol. There are times when we'd like to send these packets out without having to configure a vlan on the interface. Here we check for the vlan tag and allow the packet to go out with the correct hardware checksum. Thanks to Kand Ly <kand@riverbed.com> for discovering the issue and the coming up with a solution. This patch is based upon his work. Signed-off-by: Arthur Jones <ajones@riverbed.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* spider_net: Convert to net_device_ops.Yang Hongyang2009-03-211-14/+17
| | | | | Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* powerpc 4xx EMAC driver: device name reported on timeout is not correctMikhail Zolotaryov2009-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Hi, IBM EMAC driver performs device reset (drivers/net/ibm_newemac/core.c: emac_probe() -> emac_init_phy() -> emac_reset()) before registering appropriate net_device (emac_probe() -> register_netdev()), so net_device name contains raw format string during EMAC reset ("eth%d"). If the case of reset timeout, emac_report_timeout_error() function is called to report an error. The problem is this function uses net_device name to report device related, which is not correct, as a result in the kernel log buffer we see: eth%d: reset timeout The solution is to print device_node full_name instead. After applying the patch proposed, error string is like the following: /plb/opb/ethernet@ef600e00: reset timeout Signed-off-by: Mikhail Zolotaryov <lebon@lebon.org.ua> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* net: remove useless prefetch() callEric Dumazet2009-03-211-1/+0
| | | | | | | | | | | | There is no gain using prefetch() in dev_hard_start_xmit(), since we already had to read ops->ndo_select_queue pointer in dev_pick_tx(), and both pointers are probably located in the same cache line. This prefetch call slows down fast path because of a stall in address computation. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* sctp: Clean up TEST_FRAME hacks.Vlad Yasevich2009-03-212-11/+1
| | | | | | | | Remove 2 TEST_FRAME hacks that are no longer needed. These allowed sctp regression tests to compile before, but are no longer needed. Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* ixgbe: fix select_queue managementStephen Hemminger2009-03-212-8/+11
| | | | | | | | | | Convert ixgbe to use net_device_ops properly. Rather than changing the select_queue function pointer just check the flag. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* skb: expose and constify hash primitivesStephen Hemminger2009-03-212-4/+8
| | | | | | | | | Some minor changes to queue hashing: 1. Use const on accessor functions 2. Export skb_tx_hash for use in drivers (see ixgbe) Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* atm: lec use dev_change_mtuStephen Hemminger2009-03-211-1/+1
| | | | | | | | Rather than calling device pointer directly (which is incorrect with net_device_ops), use the standard dev_change_mtu. Compile tested only. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* net/*: use linux/kernel.h swap()Ilpo Järvinen2009-03-214-37/+8
| | | | | | | | | tcp_sack_swap seems unnecessary so I pushed swap to the caller. Also removed comment that seemed then pointless, and added include when not already there. Compile tested. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
* netrom: zero length frame filtering in NetRomBernard Pidoux2009-03-211-1/+10
| | | | | | | | | | A zero length frame filter was recently introduced in ROSE protocole. Previous commit makes the same at AX25 protocole level. This patch has the same purpose for NetRom protocole. The reason is that empty frames have no meaning in NetRom protocole. Signed-off-by: Bernard Pidoux <f6bvp@amsat.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* ax25: zero length frame filtering in AX25Bernard Pidoux2009-03-211-0/+12
| | | | | | | | | | In previous commit 244f46ae6e9e18f6fc0be7d1f49febde4762c34b was introduced a zero length frame filter for ROSE protocole. This patch has the same purpose at AX25 frame level for the same reason. Empty frames have no meaning in AX25 protocole. Signed-off-by: Bernard Pidoux <f6bvp@amsat.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* ax25: SOCK_DEBUG message simplificationBernard Pidoux2009-03-211-3/+1
| | | | | | | This patch condenses two debug messages in one. Signed-off-by: Bernard Pidoux <f6bvp@amsat.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* fsl_pq_mdio: Revive Gianfar TBI PHY supportAnton Vorontsov2009-03-211-0/+1
| | | | | | | | | | | | | | | commit 1577ecef766650a57fceb171acee2b13cbfaf1d3 ("netdev: Merge UCC and gianfar MDIO bus drivers") broke the TSEC TBI PHY support: the driver now refuses to probe TBI MDIO buses as it doesn't know about "fsl,gianfar-tbi" compatible entry, and thus _probe() fails with -ENODEV status. Fix this by adding "fsl,gianfar-tbi" to the list of known Gianfar MDIO buses. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Andy Fleming <afleming@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* ipv6: reorder struct inet6_ifaddr to remove padding on 64 bit buildsRichard Kennedy2009-03-211-2/+3
| | | | | | | | | | reorder struct inet6_ifaddr to remove padding on 64 bit builds remove 8 bytes of padding so inet6_ifaddr becomes 192 bytes & fits into a smaller slab. Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
* gianfar: Fix build with CONFIG_PM enabledAnton Vorontsov2009-03-211-2/+2
| | | | | | | | | | | | | | | | | | | commit 4826857f1bf07f9c0f1495e9b05d125552c88a85 ("gianfar: pass the proper dev to DMA ops") introduced this build breakage: CC drivers/net/gianfar.o drivers/net/gianfar.c: In function 'gfar_suspend': drivers/net/gianfar.c:552: error: 'struct gfar_private' has no member named 'dev' drivers/net/gianfar.c: In function 'gfar_resume': drivers/net/gianfar.c:601: error: 'struct gfar_private' has no member named 'dev' make[2]: *** [drivers/net/gianfar.o] Error 1 Fix this by converting suspend and resume routines to use gfar_private->ndev. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Acked-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* e100: add support for 82552 10/100 adapterBruce Allan2009-03-211-16/+77
| | | | | | | | | | | This patch enables support for the new Intel 82552 adapter (new PHY paired with the existing MAC in the ICH7 chipset). No new features are added to the driver, however there are minor changes due to updated registers and a few workarounds for hardware errata. Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'master' of git://git.infradead.org/~dwmw2/solos-2.6David S. Miller2009-03-212-160/+734
|\
| * solos: Disable DMA until we have an FPGA update with it actually implemented.David Woodhouse2009-03-171-1/+1
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Automatically determine number of portsNathan Williams2009-03-171-1/+2
| | | | | | | | | | Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Reset device on unload, free pending skbsDavid Woodhouse2009-03-171-1/+29
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Swap upstream/downstream rates in status packet, clean up some moreDavid Woodhouse2009-01-301-26/+25
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Set RX empty flag at startup only for !dma modeDavid Woodhouse2009-01-301-2/+4
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Don't clear config registers at startupDavid Woodhouse2009-01-301-5/+1
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Tidy up status interrupt handling, cope with 'ERROR' statusDavid Woodhouse2009-01-301-4/+13
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add 'reset' module parameter to reset the DSL chips on loadDavid Woodhouse2009-01-301-0/+10
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove debugging, commented-out test codeDavid Woodhouse2009-01-291-49/+3
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Clean up handling of card->tx_mask a littleDavid Woodhouse2009-01-291-25/+28
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Fix various bugs in status packet handlingDavid Woodhouse2009-01-291-21/+28
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove superfluous wait_queue_head_t from struct solos_paramDavid Woodhouse2009-01-291-1/+0
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove IRQF_DISABLED, don't frob IRQ enable on the FPGA in solos_irq()David Woodhouse2009-01-291-5/+1
| | | | | | | | | | | | Neither of these are necessary. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove unused loopback debug stuffDavid Woodhouse2009-01-291-23/+0
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Tidy up tx_mask handling for ports which need TXDavid Woodhouse2009-01-291-7/+13
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Tidy up DMA handling a little. Still untestedDavid Woodhouse2009-01-291-42/+53
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: First attempt at DMA supportDavid Woodhouse2009-01-281-28/+90
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Remove parameter group from sysfs on ATM dev deregisterDavid Woodhouse2009-01-281-0/+2
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Fix under-allocation of skb size for get/set parametersDavid Woodhouse2009-01-281-2/+2
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add SNR and Attn to status packet, fix oops on loadDavid Woodhouse2009-01-281-7/+23
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Reject non-AAL5 connections.... for nowDavid Woodhouse2009-01-271-0/+6
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Kill existing connections on link down eventDavid Woodhouse2009-01-271-2/+28
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Handle new line status change packets, hook up to ATM layer infoDavid Woodhouse2009-01-271-1/+92
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Add initial list of parametersDavid Woodhouse2009-01-272-6/+94
| | | | | | | | | | | | | | I don't much like the trick with multiple inclusions of solos-attrlist.c but don't really see a saner way to do it without repeating the list. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Handle attribute show/store in kernel more sanelyDavid Woodhouse2009-01-271-0/+187
| | | | | | | | | | | | | | | | There are still a _lot_ of attributes, but for at least the basic ones we want to be able to get/set them from the kernel. Especially the ones we want to inform the ATM core about (link state, speed). Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Kill global 'opens' count.David Woodhouse2009-01-271-10/+0
| | | | | | | | Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: Clean up firmware loading codeDavid Woodhouse2009-01-271-136/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer try to load firmware while the ATM is up and running. However, this means that we _do_ make init_module() wait for it, and it takes a long time for now (since we're using ultra-conservative code in the FPGA for that too). The inner loop which uses swahb32p() was by Simon Farnsworth. Simon has patches which migrate us to request_firmware_nowait(), for which we'll actually need to take down the ATM devices, do the upgrade, then reregister them. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
| * solos: FPGA and firmware update support.Simon Farnsworth2009-01-271-2/+169
| | | | | | | | | | | | | | | | | | This is just a straight pull in of changes, syncing us up to 0.07 from openadsl.sf.net Signed-off-by: Nathan Williams <nathan@traverse.com.au> Signed-off-by: Simon Farnsworth <simon@farnz.org.uk> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
View Lorry Controller Status