aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-05-22S2io: Version update for napi and MSI-X patchesSreenivasa Honnur1-1/+1
- Updated version number Signed-off-by: Sreenivasa Honnur <[email protected]> Signed-off-by: Ramkrishna Vepa <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22S2io: Added napi support when MSIX is enabled.Sreenivasa Honnur3-141/+205
- Added napi support when MSIX is enabled. - Moved test_msi function from s2io_open to probe function. Signed-off-by: Sreenivasa Honnur <[email protected]> Signed-off-by: Ramkrishna Vepa <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22S2io: Move all the transmit completions to a single msi-x (alarm) vectorSreenivasa Honnur2-70/+105
- Move all the transmit completions to a single msi-x (alarm) vector. - Enable the continuous timer interrupt for only one transmit fifo. Signed-off-by: Santosh Rastapur <[email protected]> Signed-off-by: Ramkrishna Vepa <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22drivers/net/ehea - remove unnecessary memset after kzallocJoe Perches1-2/+0
Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22au1000_eth: remove useless checkFrancois Romieu1-6/+1
The lifespan of the device covers the request_irq .. free_irq interval. The cast of a void * pointer is not needed either. Signed-off-by: Francois Romieu <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22Blackfin EMAC Driver: Removed duplicated include <linux/ethtool.h>Huang Weiyi1-1/+0
Signed-off-by: Huang Weiyi <[email protected]> Signed-off-by: Bryan Wu <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22cpmac bugfixes and enhancementsMatteo Croce1-55/+179
* Resolve some locking issues using atomic_inc/atomic_dec * move status code in cpmac_check_status * unmark the BROKEN flag in Kconfig * move code which should have been in platform code in arch/mips/ar7/platform.c * fixed an IRQ storm which lets the kernel hang * fixed a double call to netif_start_queue which causes a kernel panic * don't fail to register the PHY, works on many devices now Signed-off-by: Matteo Croce <[email protected]> Signed-off-by: Felix Fietkau <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22e1000e: use resource_size_t, not unsigned long, for phys addrsBecky Bruce1-2/+2
The use of unsigned long causes the driver to fail on 32-bit systems which support 64-bit resources. Signed-off-by: Becky Bruce <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22net/usb: add support for Apple USB Ethernet AdapterAurelien Nephtali1-0/+4
Add support for Apple USB Ethernet Adapter. http://store.apple.com/1-800-MY-APPLE/WebObjects/AppleStore.woa/wa/RSLID?nplm=MB442Z/A Signed-off-by: Aurelien Nephtali <[email protected]> Acked-by: Greg KH <[email protected]> Cc: David Brownell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22uli526x: add support for netpollAnton Vorontsov1-1/+15
This patch adds netpoll support for the uli526x ethernet driver -- simply call the interrupt handler for polling. To do this without disable_irq()/enable_irq() pair we should fully protect the handler. Luckily, it's already using irqsave spinlock, the only unprotected place is interrupts re-enabling write. It was safe to re-enable interrupts without holding the spinlock, but with netpoll possibility now it doesn't seem so. Patch was tested using netconsole and KGDBoE. Signed-off-by: Anton Vorontsov <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22ucc_geth: Fix arguments to dma map/unmap functionsAndy Fleming1-4/+5
We were passing NULL as the device. When we actually start supporting more interesting memory configurations, this will break things, so we proactively are fixing the bug. Signed-off-by: Andy Fleming <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22PHYLIB: Kconfig: Fix the dependency on S390Maciej W. Rozycki1-1/+1
PHYLIB was first marked as BROKEN on S390, then the enclosing menu marked as non-S390, then the two dependencies merged with the conversion to menuconfig. Reduce to non-S390. Signed-off-by: Maciej W. Rozycki <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22[SC92031] Using padto turned driver into an IPv6-only interfaceGerrit Renker1-3/+5
IPv4 would work with this driver only with static arp table entries, the patch reverts a padto introduced in commit 26a17b7bbb36a8552d531bc1ad08472fb5aa3007 sc92031: start transmit return value bugfix The padto does not work because the driver code evaluates `len' later on and there are cases where skb->len is not updated accordingly. This was observed with ARP frames (skb->len = 42 bytes, !skb_cloned(), skb_tailroom = 84 bytes). Then in skb_pad(), the first condition is true, where skb->len is not updated. As a consequence, the driver uses 42 bytes instead of the 60 bytes, and the ARP frame never makes it onto the wire. Signed-off-by: Gerrit Renker <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sb1250: use netdev_alloc_skbStephen Hemminger1-36/+31
Use netdev_alloc_skb. This sets skb->dev and allows arch specific allocation. Also simplify and cleanup the alignment code. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Maciej W. Rozycki <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22[netdrvr] forcedeth: Restore multicast settings on resumeTobias Diedrich1-0/+1
nv_open() resets multicast settings, call nv_set_multicast(dev) to restore them. (Maybe this should rather be moved into nv_open()) Signed-off-by: Tobias Diedrich <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22WAN: protect Cisco HDLC state changes with a spinlock.Krzysztof Halasa1-33/+49
Signed-off-by: Krzysztof Hałasa <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22make myri10ge_get_firmware_capabilities() staticAdrian Bunk1-1/+1
This patch makes the needlessly global myri10ge_get_firmware_capabilities() static. Signed-off-by: Adrian Bunk <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22s2io: add missing block braces to multistatement if statementIlpo Järvinen1-1/+2
Signed-off-by: Ilpo Järvinen <[email protected]> Cc: Ramkrishna Vepa <[email protected]> Cc: Rastapur Santosh <[email protected]> Cc: Sivakumar Subramani <[email protected]> Cc: Sreenivasa Honnur <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22hamradio/scc: add missing block braces to multi-statement ifIlpo Järvinen1-1/+2
Signed-off-by: Ilpo Järvinen <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22ehea: Fix use after free on rebootBrian King1-1/+2
Fixes the following use after free oops: ehea: Reboot: freeing all eHEA resources Unable to handle kernel paging request for data at address 0x6b6b6b6b6b6b6c5b Faulting instruction address: 0xd000000000354488 cpu 0x0: Vector: 300 (Data Access) at [c00000002ec6f310] pc: d000000000354488: .ehea_shutdown_single_port+0x50/0x78 [ehea] lr: d00000000035447c: .ehea_shutdown_single_port+0x44/0x78 [ehea] sp: c00000002ec6f590 msr: 8000000000009032 dar: 6b6b6b6b6b6b6c5b dsisr: 40000000 current = 0xc0000000281412e0 paca = 0xc0000000006df300 pid = 10930, comm = reboot enter ? for help [c00000002ec6f590] d00000000035d64c .ehea_remove+0x44/0x124 [ehea] (unreliable) [c00000002ec6f630] c000000000319f88 .of_platform_device_remove+0x40/0x58 [c00000002ec6f6a0] c000000000291018 .__device_release_driver+0xb0/0xf0 [c00000002ec6f730] c000000000291120 .driver_detach+0xc8/0xfc [c00000002ec6f7c0] c00000000028fe24 .bus_remove_driver+0xb4/0x114 [c00000002ec6f850] c000000000291768 .driver_unregister+0x54/0x74 [c00000002ec6f8e0] c00000000031a0c8 .of_unregister_driver+0x14/0x28 [c00000002ec6f950] c000000000023ba0 .ibmebus_unregister_driver+0x10/0x24 [c00000002ec6f9c0] d000000000354180 .ehea_reboot_notifier+0x30/0x4c [ehea] [c00000002ec6fa40] c0000000003c95a8 .notifier_call_chain+0x5c/0xcc [c00000002ec6fae0] c000000000082cd4 .__blocking_notifier_call_chain+0x70/0xb0 [c00000002ec6fb90] c000000000075cf8 .kernel_restart_prepare+0x24/0x58 [c00000002ec6fc10] c000000000075f0c .kernel_restart+0x20/0x6c [c00000002ec6fc90] c000000000078674 .sys_reboot+0x1d4/0x290 [c00000002ec6fe30] c0000000000086ac syscall_exit+0x0/0x40 Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22rndis_host: increase delay in command response loopPierre Ynard1-1/+1
Some devices running some WinCE firmware (with SC_* Samsung processors according to the SynCE project, verified on a HTC P3600 device) fail to register because they apparently need extra time to respond correctly to requests. Increase the existing delay to satisfy them. Based on code from the SynCE project, on a suggestion of David Brownell. This patch Works For Me(tm). Signed-off-by: Pierre Ynard <[email protected]> Acked-by: David Brownell <[email protected]> Cc: Greg KH <[email protected]> Cc: Jeff Garzik <[email protected]> Cc: "David S. Miller" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22drivers/net/tokenring/olympic.c: fix warningAndrew Morton1-1/+1
When dev_name() is changed to return `const char *': drivers/net/tokenring/olympic.c: In function 'olympic_probe': drivers/net/tokenring/olympic.c:234: warning: assignment discards qualifiers from pointer target type Cc: Jeff Garzik <[email protected]> Cc: Greg KH <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22drivers/net/tokenring/3c359.c: squish a warningAndrew Morton1-1/+1
When dev_name() is changed to return `const char *': drivers/net/tokenring/3c359.c: In function 'xl_probe': drivers/net/tokenring/3c359.c:318: warning: assignment discards qualifiers from pointer target type Cc: Jeff Garzik <[email protected]> Cc: Greg KH <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22pcnet32: fix warningAndrew Morton1-2/+2
pci_name() will be changed to return `const char *': drivers/net/pcnet32.c: In function 'pcnet32_probe1': drivers/net/pcnet32.c:1884: warning: passing argument 2 of 'pcnet32_alloc_ring' discards qualifiers from pointer target type Cc: Jeff Garzik <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22[netdrvr] dm9000: use delayed work to update mii phy state fixAndrew Morton1-1/+1
use cancel_delayed_work_sync() Cc: Ben Dooks <[email protected]> Cc: Enrico Scholz <[email protected]> Cc: Jeff Garzik <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sky2: restore vlan acceleration on resetStephen Hemminger1-10/+19
If device has to be reset by sky2_restart, then need to restore the VLAN acceleration settings. Signed-off-by: Stephen Hemminger <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Remove sub-minor component from driver versionBen Hutchings1-1/+1
This driver has diverged from the out-of-tree driver to which the version number originally applied. It should be identified primarily by kernel version. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Added checks for heap allocation failureBen Hutchings3-0/+6
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Remove redundant casts to and from void *Ben Hutchings5-17/+17
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Change type of efx_nic::nic_data to struct falcon_nic_data *Ben Hutchings2-5/+2
Remove redundant casts and variable. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Use __packed macroBen Hutchings1-2/+2
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Do not define inline macroBen Hutchings1-5/+0
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Use DMA_BIT_MASK() instead of our own DMA mask macrosBen Hutchings3-15/+3
Also change type of efx_nic_type::max_dma_mask to u64, matching pci_dma_supported() parameter type. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Correct and expand some commentsBen Hutchings1-6/+14
These comments have been revised in response to questions raised by Andrew Morton in <[email protected]>. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Use resource_size_t for PCI bus addressBen Hutchings2-6/+7
This should make the driver work on 32-bit systems with 64-bit PCI support. Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Merged efx_page_offset() into efx_rx_buf_offset()Ben Hutchings1-7/+3
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Replaced various macros with inline functionsBen Hutchings11-75/+105
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Added and removed braces to comply with kernel styleBen Hutchings4-8/+13
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Removed unncesssary UL suffixes on 0 literalsBen Hutchings1-2/+2
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Simplified efx_rx_calc_buffer_size() using get_order()Ben Hutchings1-21/+8
Merged it into its only caller, efx_init_channels(). Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Removed casts to voidBen Hutchings5-13/+13
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-22sfc: Use mod_timer() to set expiry and add_timer() togetherBen Hutchings1-6/+3
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2008-05-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds21-413/+68
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: net: The world is not perfect patch. tcp: Make prior_ssthresh a u32 xfrm_user: Remove zero length key checks. net/ipv4/arp.c: Use common hex_asc helpers cassini: Only use chip checksum for ipv4 packets. tcp: TCP connection times out if ICMP frag needed is delayed netfilter: Move linux/types.h inclusions outside of #ifdef __KERNEL__ af_key: Fix selector family initialization. libertas: Fix ethtool statistics mac80211: fix NULL pointer dereference in ieee80211_compatible_rates mac80211: don't claim iwspy support orinoco_cs: add ID for SpeedStream wireless adapters hostap_cs: add ID for Conceptronic CON11CPro rtl8187: resource leak in error case ath5k: Fix loop variable initializations
2008-05-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds5-22/+40
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Prevent stack backtrace false positives on trap frames. sparc64: Fix stack tracing through trap frames. sparc64: Fix kernel thread stack termination. sunhv: Fix locking in non-paged I/O case.
2008-05-21sparc64: Prevent stack backtrace false positives on trap frames.David S. Miller1-0/+1
When we fully commit to returning back to kernel mode from a trap, zero out the regs->magic value to prevent false positives during stack backtraces. Signed-off-by: David S. Miller <[email protected]>
2008-05-22[CIFS] Remove redundant NULL checkSteve French1-12/+6
Noticed by Coverity checker. Signed-off-by: Steve French <[email protected]>
2008-05-21PCI: don't enable ASPM on devices with mixed PCIe/PCI functionsShaohua Li1-0/+20
The Slot 03:00.* of JMicron controller has two functions, but one is PCIE endpoint the other isn't PCIE device, very strange. PCIE spec defines all functions should have the same config for ASPM, so disable ASPM for the whole slot in this case. Signed-off-by: Shaohua Li <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
2008-05-21sparc64: Fix stack tracing through trap frames.David S. Miller2-10/+14
The offset to the pt_regs area was wrong, so we weren't looking at the right location for the magic cookie. A trap frame is composed of a "struct sparc_stackf" then a "struct pt_regs", the code was using "struct reg_window" instead of "struct sparc_stackf". Signed-off-by: David S. Miller <[email protected]>
2008-05-21sparc64: Fix kernel thread stack termination.David S. Miller1-11/+25
Because of the silly way I set up the initial stack for new kernel threads, there is a loop at the top of the stack. To fix this, properly add another stack frame that is copied from the parent and terminate it in the child by setting the frame pointer in that frame to zero. Signed-off-by: David S. Miller <[email protected]>
2008-05-21net: The world is not perfect patch.Rami Rosen3-362/+3
Unless there will be any objection here, I suggest consider the following patch which simply removes the code for the -DI_WISH_WORLD_WERE_PERFECT in the three methods which use it. The compilation errors we get when using -DI_WISH_WORLD_WERE_PERFECT show that this code was not built and not used for really a long time. Signed-off-by: Rami Rosen <[email protected]> Signed-off-by: David S. Miller <[email protected]>