summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [IPX]: Another nonlinear receive fixStephen Hemminger2006-08-081-2/+5
| | | | | | | | | | Need to check some more cases in IPX receive. If the skb is purely fragments, the IPX header needs to be extracted. The function pskb_may_pull() may in theory invalidate all the pointers in the skb, so references to ipx header must be refreshed. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [RTNETLINK]: Fix IFLA_ADDRESS handling.David S. Miller2006-08-081-1/+14
| | | | | | | | | | | The ->set_mac_address handlers expect a pointer to a sockaddr which contains the MAC address, whereas IFLA_ADDRESS provides just the MAC address itself. So whip up a sockaddr to wrap around the netlink attribute for the ->set_mac_address call. Signed-off-by: David S. Miller <davem@davemloft.net>
* [TG3]: Fix tx race conditionMichael Chan2006-08-072-26/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a subtle race condition between tg3_start_xmit() and tg3_tx() discovered by Herbert Xu <herbert@gondor.apana.org.au>: CPU0 CPU1 tg3_start_xmit() if (tx_ring_full) { tx_lock tg3_tx() if (!netif_queue_stopped) netif_stop_queue() if (!tx_ring_full) update_tx_ring netif_wake_queue() tx_unlock } Even though tx_ring is updated before the if statement in tg3_tx() in program order, it can be re-ordered by the CPU as shown above. This scenario can cause the tx queue to be stopped forever if tg3_tx() has just freed up the entire tx_ring. The possibility of this happening should be very rare though. The following changes are made: 1. Add memory barrier to fix the above race condition. 2. Eliminate the private tx_lock altogether and rely solely on netif_tx_lock. This eliminates one spinlock in tg3_start_xmit() when the ring is full. 3. Because of 2, use netif_tx_lock in tg3_tx() before calling netif_wake_queue(). 4. Change TX_BUFFS_AVAIL to an inline function with a memory barrier. Herbert and David suggested using the memory barrier instead of volatile. 5. Check for the full wake queue condition before getting netif_tx_lock in tg3_tx(). This reduces the number of unnecessary spinlocks when the tx ring is full in a steady-state condition. 6. Update version to 3.65. Signed-off-by: Michael Chan <mchan@broadcom.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* [TCP]: SNMPv2 tcpOutSegs counter errorWei Yongjun2006-08-071-3/+9
| | | | | | | Do not count retransmitted segments. Signed-off-by: Wei Yongjun <yjwei@nanjing-fnst.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [PKTGEN]: Make sure skb->{nh,h} are initialized in fill_packet_ipv6() too.David S. Miller2006-08-071-0/+2
| | | | | | Mirror the bug fix from fill_packet_ipv4() Signed-off-by: David S. Miller <davem@davemloft.net>
* [PKTGEN]: Fix oops when used with balance-tlb bondingChen-Li Tien2006-08-071-0/+2
| | | | | Signed-off-by: Chen-Li Tien <cltien@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* [IPV4]: Limit rt cache size properly.Kirill Korotaev2006-08-071-1/+1
| | | | | | | | | | | | | | | | | | | From: Kirill Korotaev <dev@sw.ru> During OpenVZ stress testing we found that UDP traffic with random src can generate too much excessive rt hash growing leading finally to OOM and kernel panics. It was found that for 4GB i686 system (having 1048576 total pages and 225280 normal zone pages) kernel allocates the following route hash: syslog: IP route cache hash table entries: 262144 (order: 8, 1048576 bytes) => ip_rt_max_size = 4194304 entries, i.e. max rt size is 4194304 * 256b = 1Gb of RAM > normal_zone Attached the patch which removes HASH_HIGHMEM flag from alloc_large_system_hash() call. Signed-off-by: David S. Miller <davem@davemloft.net>
* [IPX]: Header length validation neededStephen Hemminger2006-08-071-1/+2
| | | | | | | | | This patch will linearize and check there is enough data. It handles the pprop case as well as avoiding a whole audit of the routing code. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* [TG3]: skb->dev assignment is done by netdev_alloc_skbChristoph Hellwig2006-08-071-2/+0
| | | | | | | | All caller of netdev_alloc_skb need to assign skb->dev shortly afterwards. Move it into common code. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NET]: Assign skb->dev in netdev_alloc_skbChristoph Hellwig2006-08-071-1/+3
| | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* [NET]: Fix alloc_skb comment typoChristoph Hellwig2006-08-071-2/+2
| | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
* Linux v2.6.18-rc4v2.6.18-rc4Linus Torvalds2006-08-061-1/+1
|
* Merge branch 'for-linus' of ↵Linus Torvalds2006-08-0617-308/+509
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input: (24 commits) Input: ati_remote - use msec instead of jiffies Input: ati_remote - add missing input_sync() Input: ati_remote - relax permissions sysfs module parameters Input: ati_remote - make filter time a module parameter Input: atkbd - restore repeat rate when resuming Input: trackpoint - activate protocol when resuming Input: logips2pp - fix button mapping for MX300 Input: keyboard - change to use kzalloc Input: serio/gameport - check whether driver core calls succeeded Input: spaceball - make 4000FLX Lefty work Input: keyboard - simplify emulate_raw() implementation Input: keyboard - remove static variable and clean up initialization Input: hiddev - use standard list implementation Input: add missing handler->start() call Input: HID - fix potential out-of-bound array access Input: fix list iteration in input_release_device() Input: iforce - add Trust Force Feedback Race Master support Input: iforce - check array bounds before accessing elements Input: libps2 - warn instead of oopsing when passed bad arguments Input: fm801-gp - fix use after free ...
| * Input: ati_remote - use msec instead of jiffiesDmitry Torokhov2006-08-041-58/+77
| | | | | | | | | | | | | | By using milliseconds instead of jiffies to calculate acceleration factor we make the code immune to changes in HZ. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ati_remote - add missing input_sync()Dmitry Torokhov2006-08-041-0/+1
| | | | | | | | | | | | | | | | | | When emulating button toggle drivers need to send input_sync() between 'down' and 'up' events, otherwise some users might miss keypress because device's state is only considered finalized after EV_SYN/SYN_REPORT is received. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ati_remote - relax permissions sysfs module parametersDmitry Torokhov2006-08-041-2/+2
| | | | | | | | | | | | Allow changing debug and channel_mask parameters on the fly. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: ati_remote - make filter time a module parameterEdwin Huffstutler2006-08-041-14/+19
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: atkbd - restore repeat rate when resumingDmitry Torokhov2006-08-041-43/+60
| | | | | | | | | | | | | | Make the AT keyboard driver restore previously set repeat rate when resuming. Noticed by Linus Torvalds. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: trackpoint - activate protocol when resumingDmitry Torokhov2006-08-041-18/+34
| | | | | | | | | | | | | | Trackpoint driver was not sending the magic knock sequence upon resume causing incorrect device behavior after resuming from disk. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: logips2pp - fix button mapping for MX300Roberto Castagnola2006-08-041-2/+1
| | | | | | | | | | | | | | | | | | MX300 does not have an EXTRA_BTN - it is a simple wheel mouse with an additional task-switcher button, which is reported as side button (and not task button). Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Input: keyboard - change to use kzallocDmitry Torokhov2006-08-041-2/+2
| | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ↵Dmitry Torokhov2006-08-041758-16901/+34975
| |\ | | | | | | | | | into for-linus
| * | Input: serio/gameport - check whether driver core calls succeededRandy Dunlap2006-07-192-31/+100
| | | | | | | | | | | | | | | Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: spaceball - make 4000FLX Lefty workNick Martin2006-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the Spaceball 4000FLX Lefty is already supported by the spaceball driver, it does not register properly due to SPACEBALL_MAX_ID being set too low. Increment SPACEBALL_MAX_ID such that the 4000FLX Lefty is properly recognized. Signed-off-by: Nick Martin <nim+linux@nimlabs.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: keyboard - simplify emulate_raw() implementationDmitry Torokhov2006-07-191-17/+34
| | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: keyboard - remove static variable and clean up initializationDmitry Torokhov2006-07-191-10/+9
| | | | | | | | | | | | Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: hiddev - use standard list implementationDmitry Torokhov2006-07-191-34/+38
| | | | | | | | | | | | | | | | | | Fixes Coverity #id 303 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: add missing handler->start() callDmitry Torokhov2006-07-191-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The start() method need to be called every time we create a new handle. This includes not only registering new devices but also when registering new handlers. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: HID - fix potential out-of-bound array accessDmitry Torokhov2006-07-151-1/+2
| | | | | | | | | | | | | | | | | | Fixes Coverity #id 978 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: fix list iteration in input_release_device()Andrew Morton2006-07-151-3/+5
| | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: iforce - add Trust Force Feedback Race Master supportPrzemek Iskra2006-07-151-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Vojtech Pavlik <vojtech@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: iforce - check array bounds before accessing elementsDmitry Torokhov2006-07-061-9/+9
| | | | | | | | | | | | | | | | | | Fixes Coverity #id 864 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: libps2 - warn instead of oopsing when passed bad argumentsDmitry Torokhov2006-07-061-0/+5
| | | | | | | | | | | | | | | | | | This is more user-friendly and also fixes Coverity #id 249 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: fm801-gp - fix use after freeDmitry Torokhov2006-07-061-2/+2
| | | | | | | | | | | | | | | | | | Fixes Coverity #id 916 Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: wistron - fix section reference mismatchesAndrew Morton2006-07-061-10/+10
| | | | | | | | | | | | | | | Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: introduce input_inject_event() functionDmitry Torokhov2006-07-064-21/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create input_inject_event() function which is to be used by input handlers as opposed to input_event() which is reserved for drivers implementing input devices. The difference is that if device is "grabbed" by some process input_inject_event() will ignore events unless sent from the handle that is currently owns the device. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: add start() method to input handlersDmitry Torokhov2006-07-063-21/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | The new start() method is called immediately after connect() and also when "grabbed" device is released by its owner. This will allow input handlers to re-synchronize state of once-grabbed device with the rest of devices. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: remove accept method from input_devDmitry Torokhov2006-07-063-15/+0
| | | | | | | | | | | | | | | | | | | | | This method used to enforce exclusive access to iforce devices, but presenlty there are no known users of this method. Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2006-08-0618-47/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device [ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353] [ALSA] add MAINTAINERS entry for snd-aoa [ALSA] aoa: platform function gpio: ignore errors from functions that don't exist [ALSA] make snd-powermac load even when it can't bind the device [ALSA] aoa: fix toonie codec [ALSA] aoa: feature gpio layer: fix IRQ access [ALSA] Conversions from kmalloc+memset to k(z|c)alloc [ALSA] snd-emu10k1: Fixes ALSA bug#2190
| * | | [ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only deviceTakashi Iwai2006-08-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept O_RDWR at opening a PCM OSS device that is read- or write-only, just for the compatibility with the behavior of older versions. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353]James Courtier-Dutton2006-08-031-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ALSA bug#1365. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] add MAINTAINERS entry for snd-aoaJohannes Berg2006-08-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds me into the MAINTAINERS file for the AOA driver. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] aoa: platform function gpio: ignore errors from functions that don't ↵Johannes Berg2006-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exist Sometimes we simply want to turn off or on everything, and when recently a warning was added when a certain platform function can't be called, this triggered all the time in those cases. This patch shows the warning only if the error was different from the function not existing. The alternative would be to not even try calling the function when it doesn't exist by first checking which exist and then only calling those that do, but that adds complexity that isn't necessary. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] make snd-powermac load even when it can't bind the deviceJohannes Berg2006-08-031-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes snd-powermac load when it can't bind the device right away. That's the expected behaviour for hotplugging, but fixes an important problem I was seeing with doing a modprobe snd-powermac with a version that refuses loading on machines with layout-id: snd-powermac would create a bunch of uevents and then refuse to load, the uevents causing udev to reload it again, ad eternum. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] aoa: fix toonie codecJohannes Berg2006-08-031-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the toonie codec to be actually usable. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] aoa: feature gpio layer: fix IRQ accessJohannes Berg2006-08-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The IRQ rework caused some hiccups here, in some cases we call get_irq without a device node. This patch makes it catch that case and return NO_IRQ when it happens, along with changing the place where the irq is checked to check for NO_IRQ instead of -1. Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] Conversions from kmalloc+memset to k(z|c)allocPanagiotis Issaris2006-08-0310-29/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sound: Conversions from kmalloc+memset to k(c|z)alloc. Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| * | | [ALSA] snd-emu10k1: Fixes ALSA bug#2190James Courtier-Dutton2006-08-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes ALSA bug#2190 System hangs on unplugging Audigy 2 ZS Notebook CardBus card. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
* | | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-08-067-23/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [LAPB]: Fix windowsize check [TCP]: Fixes IW > 2 cases when TCP is application limited [PKT_SCHED] RED: Fix overflow in calculation of queue average [LLX]: SOCK_DGRAM interface fixes [PKT_SCHED]: Return ENOENT if qdisc module is unavailable [BRIDGE]: netlink status fix
| * | | | [LAPB]: Fix windowsize checkDiego Calleja2006-08-051-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In bug #6954, Norbert Reinartz reported the following issue: "Function lapb_setparms() in file net/lapb/lapb_iface.c checks if the given parameters are valid. If the given window size is in the range of 8 .. 127, lapb_setparms() fails and returns an error value of LAPB_INVALUE, even if bit LAPB_EXTENDED in parms->mode is set. If bit LAPB_EXTENDED in parms->mode is set and the window size is in the range of 8 .. 127, the first check "(parms->mode & LAPB_EXTENDED)" results true and the second check "(parms->window < 1 || parms->window > 127)" results false. Both checks in conjunction result to false, thus the third check "(parms->window < 1 || parms->window > 7)" is done by fault. This third check results true, so that we leave lapb_setparms() by 'goto out_put'. Seems that this bug doesn't cause any problems, because lapb_setparms() isn't used to change the default values of LAPB. We are using kernel lapb in our software project and also change the default parameters of lapb, so we found this bug" He also pasted a fix, that I've transformated into a patch: Signed-off-by: Diego Calleja <diegocg@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud