commit 7479b1ce5ea41a828002c60739cff37f47b62913 Merge: 4945b8a... aa77015... Author: Linus Torvalds Date: Fri Dec 29 10:07:18 2006 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] cio: fix stsch_reset. [S390] Change max. buffer size for monwriter device. commit 4945b8a553ec735f416596cbf5789c439d16fb38 Merge: 6c722e9... 69f7e75... Author: Linus Torvalds Date: Fri Dec 29 10:06:41 2006 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (28 commits) V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&" V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1 V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch V4L/DVB (4997): Bttv: delete duplicated ioremap() V4L/DVB (4996): Msp3400: fix kthread_run error check V4L/DVB (4995): Vivi: fix kthread_run() error check V4L/DVB (4994): Vivi: fix use after free in list_for_each() V4L/DVB (4992): Fix typo in saa7134-dvb.c V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8 V4L/DVB (4984): LOG_STATUS should show the real temporal filter value. V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting. V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400. V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected V4L/DVB (4973): Dvb-core: fix printk type warning V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems V4L/DVB (4970): Usbvision memory fixes ... commit 6c722e90d7ede7db2d2b28a3cc69a8545db67ea1 Merge: 007fb59... 81f4e6c... Author: Linus Torvalds Date: Fri Dec 29 10:03:54 2006 -0800 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (42 commits) r8169: extraneous Cmd{Tx/Rx}Enb write forcedeth: modified comment header NetXen: Reducing ring sizes for IOMMU issue. NetXen: Fix for PPC machines. NetXen: work queue fixes. NetXen: Link status message correction for quad port cards. NetXen: Multiple adapter fix. NetXen: Using correct CHECKSUM flag. NetXen: driver reload fix for newer firmware. NetXen: Adding new device ids. PHY probe not working properly for ibm_emac (PPC4xx) ep93xx: some minor cleanups to the ep93xx eth driver sky2: phy power down needs PCI config write enabled sky2: power management/MSI workaround sky2: dual port NAPI problem via-velocity uses INET interfaces e1000: Do not truncate TSO TCP header with 82544 workaround myri10ge: handle failures in suspend and resume myri10ge: no need to save MSI and PCIe state in the driver myri10ge: make msi configurable at runtime through sysfs ... commit 007fb598b4674de82492a9961e82826875012229 Merge: 7658cc2... 92104e9... Author: Linus Torvalds Date: Fri Dec 29 10:03:29 2006 -0800 Merge branch 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'netxen-ioctl' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: netxen: remove private ioctl commit 7658cc289288b8ae7dd2c2224549a048431222b3 Author: Linus Torvalds Date: Fri Dec 29 10:00:58 2006 -0800 VM: Fix nasty and subtle race in shared mmap'ed page writeback The VM layer (on the face of it, fairly reasonably) expected that when it does a ->writepage() call to the filesystem, it would write out the full page at that point in time. Especially since it had earlier marked the whole page dirty with "set_page_dirty()". But that isn't actually the case: ->writepage() does not actually write a page, it writes the parts of the page that have been explicitly marked dirty before, *and* that had not got written out for other reasons since the last time we told it they were dirty. That last caveat is the important one. Which _most_ of the time ends up being the whole page (since we had called "set_page_dirty()" on the page earlier), but if the filesystem had done any dirty flushing of its own (for example, to honor some internal write ordering guarantees), it might end up doing only a partial page IO (or none at all) when ->writepage() is actually called. That is the correct thing in general (since we actually often _want_ only the known-dirty parts of the page to be written out), but the shared dirty page handling had implicitly forgotten about these details, and had a number of cases where it was doing just the "->writepage()" part, without telling the low-level filesystem that the whole page might have been re-dirtied as part of being mapped writably into user space. Since most of the time the FS did actually write out the full page, we didn't notice this for a loong time, and this needed some really odd patterns to trigger. But it caused occasional corruption with rtorrent and with the Debian "apt" database, because both use shared mmaps to update the end result. This fixes it. Finally. After way too much hair-pulling. Acked-by: Nick Piggin Acked-by: Martin J. Bligh Acked-by: Martin Michlmayr Acked-by: Martin Johansson Acked-by: Ingo Molnar Acked-by: Andrei Popa Cc: High Dickins Cc: Andrew Morton , Cc: Peter Zijlstra Cc: Segher Boessenkool Cc: David Miller Cc: Arjan van de Ven Cc: Gordon Farquharson Cc: Guillaume Chazarain Cc: Theodore Tso Cc: Kenneth Cheng Cc: Tobias Diedrich Signed-off-by: Linus Torvalds commit aa77015c4e94cb1d30680646c163d7ae1f93f941 Author: Michael Holzheu Date: Thu Dec 28 00:35:36 2006 +0100 [S390] cio: fix stsch_reset. Copy inline assembly of stsch and add "memory" to clobber list in order to prevent gcc from optimizing away the checking of the global variable "pgm_check_occured". Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 524a237e4512038d6e07ad3b2e44e70902b76738 Author: Melissa Howland Date: Thu Dec 28 00:35:25 2006 +0100 [S390] Change max. buffer size for monwriter device. Reduce the max. buffer size for the monwriter device to prevent a possible problem with the z/VM monitor service. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 69f7e75a9d45e5eaca16917a8d0dedf76149f13f Author: Jean Delvare Date: Sat Dec 23 14:11:03 2006 -0300 V4L/DVB (5010): Cx88: Fix leadtek_eeprom tagging reference to .init.text: from .text between 'cx88_card_setup' (at offset 0x68c) and 'cx88_risc_field' Caused by leadtek_eeprom() being declared __devinit and called from a non-devinit context. Signed-off-by: Jean Delvare Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 70bdd9c83a6e757e5fb9cc3195f27d2c1d0a4c39 Author: Alexey Dobriyan Date: Tue Dec 26 07:43:25 2006 -0300 V4L/DVB (5012): Usbvision fix: It was using "&&" instead "&" Signed-off-by: Alexey Dobriyan Signed-off-by: Mauro Carvalho Chehab commit 0b778a56e342e0e1d274298ad47d9af22a9de633 Author: Mauro Carvalho Chehab Date: Wed Dec 27 14:04:09 2006 -0200 V4L/DVB (5001): Add two required headers on kernel 2.6.20-rc1 include/media/ir-common.h:78: error: field 'work' has incomplete type drivers/media/common/ir-functions.c: In function 'ir_rc5_timer_end': drivers/media/common/ir-functions.c:301: error: 'jiffies' undeclared (first use in this function) drivers/media/common/ir-functions.c:301: error: (Each undeclared identifier is reported only once) drivers/media/common/ir-functions.c:301: error: for each function it appears in.) drivers/media/common/ir-functions.c:347: error: 'HZ' undeclared (first use in this function) Signed-off-by: Mauro Carvalho Chehab commit 9a2816c1c4ca7f5d02de4339589913701251dd5a Author: David Brownell Date: Wed Dec 27 09:53:44 2006 -0300 V4L/DVB (5014): Allyesconfig build fixes on some non x86 arch - CAFE_CCIC needs to depend on PCI, else "allyesconfig" breaks on systems without PCI - em28xx-video can't udelay(2500) else "allyesconfig" breaks on systems that refuse to spin that long (I saw it on ARM) Signed-off-by: David Brownell Signed-off-by: Mauro Carvalho Chehab commit 5f1693fe82b499a3306993020ef14011ed0420d0 Author: Akinobu Mita Date: Wed Dec 20 10:08:56 2006 -0300 V4L/DVB (4997): Bttv: delete duplicated ioremap() ioremap() is called twice to same resource. The returen value of first one is not error-checked. second one is complely ignored. Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit 25821400359d2b3daacfb93303944211b8411ac3 Author: Akinobu Mita Date: Wed Dec 20 10:07:30 2006 -0300 V4L/DVB (4996): Msp3400: fix kthread_run error check The return value of kthread_run() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit 054afee4736677a00982f6414a983dec8ee511db Author: Akinobu Mita Date: Wed Dec 20 10:04:00 2006 -0300 V4L/DVB (4995): Vivi: fix kthread_run() error check The return value of kthread_run() should be checked by IS_ERR(). Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit 72f678c30185df18ac38ef14c9045d139c2263bc Author: Akinobu Mita Date: Wed Dec 20 10:03:53 2006 -0300 V4L/DVB (4994): Vivi: fix use after free in list_for_each() Freeing data including list_head in list_for_each() is not safe. Signed-off-by: Akinobu Mita Signed-off-by: Mauro Carvalho Chehab commit b331daa03cd949b1b0a4b761b4b4a92d71f7d626 Author: Stephan Berberig Date: Wed Dec 20 09:37:05 2006 -0300 V4L/DVB (4992): Fix typo in saa7134-dvb.c Fix a typo (use_frontent -> use_frontend) in saa7134-dvb.c. Signed-off-by: Stephan Berberig Signed-off-by: Mauro Carvalho Chehab commit d4f60baf7827c6a46b7ee2ed0a2a32a373febfcb Author: Adrian Bunk Date: Wed Dec 20 09:34:32 2006 -0300 V4L/DVB (4991): Cafe_ccic.c: fix NULL dereference We shouldn't dereference "cam" when we already know it's NULL. Spotted by the Coverity checker. Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit d82d418a3af4d7d07151f9d45ca20f2ce61289a0 Author: Amit Choudhary Date: Wed Dec 20 09:30:45 2006 -0300 V4L/DVB (4990): Cpia2/cpia2_usb.c: fix error-path leak Free previously allocated memory (in array elements) if kmalloc() returns NULL in submit_urbs(). Signed-off-by: Amit Choudhary Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit cb2c7b4927c8f376b7ba9557978d8c59ed472664 Author: Hans Verkuil Date: Wed Dec 20 06:51:37 2006 -0300 V4L/DVB (4988): Cx2341x audio_properties is an u16, not u8 This bug broke the MPEG audio mode controls. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 83aaf13c5ba5e1e244339807d8a752808e763cdd Author: Hans Verkuil Date: Mon Dec 18 13:40:23 2006 -0300 V4L/DVB (4984): LOG_STATUS should show the real temporal filter value. The temporal filter is forced off when scaling. The VIDIOC_LOG_STATUS handler still showed the old temporal filter. It is now consistent with the real temporal filter value. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 12b896e436a3b1bc83856962388ae1ab154742a6 Author: Hans Verkuil Date: Mon Dec 18 13:37:50 2006 -0300 V4L/DVB (4983): Force temporal filter to 0 when scaling to prevent ghosting. Change the code to unconditionally turn off the temporal filter when scaling. If the window is not full screen the filter will introduce a nasty ghosting effect. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b331def2d382d7a51c379f336fe80ef87d6674e3 Author: Hans Verkuil Date: Mon Dec 18 13:18:28 2006 -0300 V4L/DVB (4982): Fix broken audio mode handling for line-in in msp3400. The wrong matrix was used when an external input was selected instead of the tuner input. The rxsubchans field was also not initialized to STEREO for an external input. And finally the msp34xxg_detect_stereo() should not try to detect stereo for an external input, that code is for the tuner input only. Together these bugs made it hit 'n miss whether you ever got stereo out of the msp3400 for an external input. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 315eb962d2e9438bc10da2488b604f04a1c0006f Author: Mauro Carvalho Chehab Date: Sun Dec 17 23:30:47 2006 -0300 V4L/DVB (4980): Fixes bug 7267: PAL/60 is not working On cx88 driver, sampling rate should be at chroma subcarrier freq (FSC). However, driver were programming wrong values for PAL/60, PAL/Nc and NTSC 4.43. This patch do the proper calculation. It also calculates htotal, hdelay and hactive constants, according with the sampling rate. It is tested with PAL/60 by Piotr Maksymuk and Olivier. Also tested with the already-supported standards. Test is still required for PAL/Nc. Signed-off-by: Mauro Carvalho Chehab commit ed00b41dc8bc286682d31ad64060ccc70513e90b Author: Dwaine Garden Date: Wed Dec 27 10:23:28 2006 -0200 V4L/DVB (4979): Fixes compilation when CONFIG_V4L1_COMPAT is not selected - SYSFS: Replaced all to_video_device(cd), video_device_create_file, video_device_remove_file and add the proper checks at create_file - Converted old norm values to V4L2 ones. - Robustness on sysfs hue/contrast/saturation queries. Additional check in order to return 0 if the driver is not opened. - Whitespace cleanups in usbvision-cards.c This patch merges two fixes by Thierry MERLE and Mauro Chehab, and adds additional checks. Signed-off-by: Dwaine Garden Signed-off-by: Mauro Carvalho Chehab commit 5ef35be42dfaa155e02718a9bd34cc341f327883 Author: Michael Krufky Date: Thu Dec 14 13:53:33 2006 -0300 V4L/DVB (4973): Dvb-core: fix printk type warning dvb_net.c: In function 'dvb_net_ule': dvb_net.c:628: warning: format '%#lx' expects type 'long unsigned int', but argument 3 has type 'u32' dvb_net.c:628: warning: format '%#lx' expects type 'long unsigned int', but argument 4 has type 'u32' Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit dedcefb085fe98a1feaf63590fe2fc7e0ecb1987 Author: Ang Way Chuang Date: Thu Dec 14 13:51:44 2006 -0300 V4L/DVB (4972): Dvb-core: fix bug in CRC-32 checking on 64-bit systems CRC-32 checking during ULE decapsulation always failed on x86_64 systems due to the size of a variable used to store CRC. This bug was discovered on Fedora Core 6 with kernel-2.6.18-1.2849. The i386 counterpart has no such problem. This patch has been tested on 64-bit system as well as 32-bit system. Signed-off-by: Ang Way Chuang Signed-off-by: Michael Krufky Signed-off-by: Mauro Carvalho Chehab commit 38284ba361d69eca34a3bfc553ebfac81fea2698 Author: Thierry MERLE Date: Fri Dec 15 16:46:53 2006 -0300 V4L/DVB (4970): Usbvision memory fixes - fix decompression buffer allocation not done at first driver open - simplification of USB sbuf allocation (use of usb_buffer_alloc) - replaced vmalloc by vmalloc_32 (for homogeneity) - add of saa7111 (i2cAddr=0x48) detection printout in attach_inform Signed-off-by: Thierry MERLE Signed-off-by: Mauro Carvalho Chehab commit 3a4456a073150c8b0d790daa007d2aab9ebdecb5 Author: Hans Verkuil Date: Tue Dec 12 16:27:28 2006 -0300 V4L/DVB (4968): Add PAL-60 support for cx2584x. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e71ced1a5dfebfde57c0ed2c9bd3c7b4596071c1 Author: Hans Verkuil Date: Mon Dec 11 15:51:43 2006 -0300 V4L/DVB (4967): Add missing tuner module option pal=60 for PAL-60 support. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 2485eb0a553f2ac8c73267ce48fcdee8a9728d43 Author: audetto@tiscali.it Date: Tue Dec 12 10:35:57 2006 -0300 V4L/DVB (4964): VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422 are the same palette Consistent handling of VIDEO_PALETTE_YUYV and VIDEO_PALETTE_YUV422 Signed-off-by: Andrea A Odetti Signed-off-by: Mauro Carvalho Chehab commit c6268461473e1c62e31afde657069c050ee8dea7 Author: Mauro Carvalho Chehab Date: Mon Dec 11 17:18:15 2006 -0300 V4L/DVB (4960): Removal of unused code from usbvision-i2c.c i2c_adap is almost not used. This patch removes it, cleaning the i2c support, and improving driver understanding. Thanks to Thierry Merle for testing it. Signed-off-by: Mauro Carvalho Chehab commit 0a0ceadebd4551c26110f5daf0b38d9054674c9e Author: Adrian Bunk Date: Mon Dec 11 15:51:36 2006 -0300 V4L/DVB (4959): Usbvision: possible cleanups This patch contains the following possible cleanups: - make needlessly global functions static - remove the unused EXPORT_SYMBOL's Signed-off-by: Adrian Bunk Signed-off-by: Mauro Carvalho Chehab commit bee8a44ecb37c1d80afd2af932f60e786f0eabc2 Author: Ralf Baechle Date: Mon Dec 11 11:14:54 2006 -0300 V4L/DVB (4958): Fix namespace conflict between w9968cf.c on MIPS Both use __SC. Since __* is sort of private namespace I've choosen to fix this in the driver. For consistency I decieded to also change __UNSC to UNSC. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit 6ccd60172e271d156dba8a4002568d3bf1912e01 Author: Mario Rossi Date: Mon Dec 11 05:42:36 2006 -0300 V4L/DVB (4956): [NOVA-T-USB2] Put remote-debugging in the right place This patch removes unnecessary (and misleading) debug output (it printed the values of the keys in the table up to the value of the key pressed). Signed-off-by: Mario Rossi Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit a821e990e4db77cd87bec488fb425d8d4ced79bd Author: Mario Rossi Date: Mon Dec 11 05:37:31 2006 -0300 V4L/DVB (4955): Fix autosearch index After rewriting the driver the wrong autosearch index was used when COFDM-parameter needed to be detected. Thanks to Mario Rossi who found it. Signed-off-by: Mario Rossi Signed-off-by: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit 81f4e6c190a0fa016fd7eecaf76a5f95d121afc2 Author: Francois Romieu Date: Mon Dec 18 00:00:55 2006 +0100 r8169: extraneous Cmd{Tx/Rx}Enb write Checked in Realtek's driver, this one has no business being there. The driver still works but there is a noticeable performance drop. Signed-off-by: Francois Romieu commit 87046e5062c483820f20c1fa6ed0826bb38fd4f0 Author: Ayaz Abdulla Date: Tue Dec 19 23:33:32 2006 -0500 forcedeth: modified comment header This patch removes comment that forcedeth is not supported by NVIDIA. Signed-Off-By: Ayaz Abdulla Signed-off-by: Jeff Garzik commit bd56c6b15e809d0fcb43bc8d505ca4d15debac62 Author: Amit S. Kale Date: Mon Dec 18 05:54:36 2006 -0800 NetXen: Reducing ring sizes for IOMMU issue. Signed-off-by: Amit S. Kale netxen_nic.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) Signed-off-by: Jeff Garzik commit ed33ebe464d973ab656cfc9ff0ca40a4c1e38238 Author: Amit S. Kale Date: Mon Dec 18 05:53:59 2006 -0800 NetXen: Fix for PPC machines. Signed-off-by: Amit S. Kale netxen_nic.h | 2 +- netxen_nic_init.c | 12 ++++++------ netxen_nic_main.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) Signed-off-by: Jeff Garzik commit 6c5866441669ab71f6297556ea281a6bcbfd13db Author: Amit S. Kale Date: Mon Dec 18 05:53:36 2006 -0800 NetXen: work queue fixes. Signed-off-by: Amit S. Kale netxen_nic.h | 3 +-- netxen_nic_init.c | 2 +- netxen_nic_main.c | 15 +++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) Signed-off-by: Jeff Garzik commit d2378e89720f364ccf3a57b26f1827923d3464f2 Author: Amit S. Kale Date: Mon Dec 18 05:53:12 2006 -0800 NetXen: Link status message correction for quad port cards. Signed-off-by: Amit S. Kale netxen_nic_isr.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit a379cb3c136526617c7aed555a249cb03e951e60 Author: Amit S. Kale Date: Mon Dec 18 05:52:39 2006 -0800 NetXen: Multiple adapter fix. Signed-off-by: Amit S. Kale netxen_nic.h | 3 +-- netxen_nic_main.c | 12 ------------ 2 files changed, 1 insertion(+), 14 deletions(-) Signed-off-by: Jeff Garzik commit c75e86b47f97831732fc450fcc5a4230b00071fb Author: Amit S. Kale Date: Mon Dec 18 05:51:58 2006 -0800 NetXen: Using correct CHECKSUM flag. Signed-off-by: Amit S. Kale netxen_nic_hw.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Signed-off-by: Jeff Garzik commit b0d541dbb940fe8899e3020fcc9ee5a1e2be0306 Author: Amit S. Kale Date: Mon Dec 18 05:51:29 2006 -0800 NetXen: driver reload fix for newer firmware. Signed-off-by: Amit S. Kale netxen_nic_main.c | 7 +++++++ 1 files changed, 7 insertions(+) Signed-off-by: Jeff Garzik commit 0d39073484d6e01d325e6d94a3967ce0e98161a7 Author: Amit S. Kale Date: Mon Dec 18 05:50:59 2006 -0800 NetXen: Adding new device ids. Signed-off-by: Amit S. Kale netxen_nic_main.c | 2 ++ 1 files changed, 2 insertions(+) Signed-off-by: Jeff Garzik commit 3e65bb94a9de542c464bf00035a08b0e0a76993d Author: Hynek Petrak Date: Tue Dec 19 13:08:49 2006 -0800 PHY probe not working properly for ibm_emac (PPC4xx) I have a system with AMCC PowerPC 405EP and PHY Intel LXT971A. Linux 2.6.18.3 is not able to detect the PHY ID correctly. The PHY ID detected is 0, but should be 0x1d. This is because phy_read() (__emac_mdio_read() resp.) from drivers/net/ibm_emac/ibm_emac_core.c might return -ETIMEDOUT or -EREMOTEIO on error. This is ignored inside the int mii_phy_probe(struct mii_phy *phy, int address) from drivers/net/ibm_emac/ibm_emac_phy.c as the return value is assigned to an u32 variable. Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit ebf5112ca7a714a3961a322459747059cbf41d7b Author: Yan Burman Date: Tue Dec 19 13:08:48 2006 -0800 ep93xx: some minor cleanups to the ep93xx eth driver Small cleanup in the Cirrus Logic EP93xx ethernet driver: Check for NULL pointer before dereferencing it instead of after. Remove unreferenced variable. Signed-off-by: Yan Burman Cc: Jeff Garzik Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 3a960f7e350de5d087b88a4c06df236e0f4186fd Merge: aed2cec... 0c234ae... Author: Jeff Garzik Date: Tue Dec 26 16:38:31 2006 -0500 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit aed2cec45c426c941c80d84ec89ce34f2f2607cc Author: Stephen Hemminger Date: Wed Dec 20 13:06:35 2006 -0800 sky2: phy power down needs PCI config write enabled In order to change PCI registers (via the iomap'd window), it needs to be enabled; this wasn't being done in sky2_phy_power the function that turns on/off power to the PHY. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 44ade178249fe53d055fd92113eaa271e06acddd Author: Stephen Hemminger Date: Wed Dec 20 13:06:34 2006 -0800 sky2: power management/MSI workaround MSI doesn't work properly on resume on many platforms because the BIOS goes and changes it back to INTx mode after the sky2 driver has restored in resume. It is really a bug in the base power management resume code, and this workaround is temporary until the change to PM code works it's way through the release process. The PM fix is non-trivial since it needs to change when non-boot CPU's are enabled. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 25d82d7a2fc20cc4be414d738139594dc0adf179 Author: Stephen Hemminger Date: Wed Dec 20 13:06:33 2006 -0800 sky2: dual port NAPI problem Shutting down port 0 disables the NAPI poll used by both ports. The long term fix will be to separate NAPI object from net device until then just reenable if needed. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit ce9f7fe3c3f5b9ed1d3e91db78c45d0df5672816 Author: Randy Dunlap Date: Mon Dec 18 21:21:10 2006 -0800 via-velocity uses INET interfaces via-velocity doesn't build when CONFIG_INET=n: drivers/built-in.o: In function `velocity_unregister_notifier': via-velocity.c:(.text+0xe9b46): undefined reference to `unregister_inetaddr_notifier' drivers/built-in.o: In function `velocity_init_module': via-velocity.c:(.init.text+0xa027): undefined reference to `register_inetaddr_notifier' I wanted to make this change in drivers/net/Kconfig, but this isn't legal kconfig language: config VIA_VELOCITY tristate "VIA Velocity support" depends on NET_PCI && PCI + depends on INET if PM select CRC32 select CRC_CCITT select MII so fix it in via-velocity.c instead. Builds with all 4 combinations of CONFIG_NET & CONFIG_PM. Signed-off-by: Randy Dunlap Signed-off-by: Jeff Garzik commit 683a2aa339f607c8a422835161ceab68b2a5a18a Author: Herbert Xu Date: Sat Dec 16 12:04:33 2006 +1100 e1000: Do not truncate TSO TCP header with 82544 workaround The e1000 driver has a workaround for 82544 on PCI-X where if the terminating byte of a buffer is at addresses 0-3 mod 8, then 4 bytes are shaved off it and defered to a new segment. This is due to an erratum that could otherwise cause TX hangs. Unfortunately this breaks TSO because it may cause the TCP header to be split over two segments which itself causes TX hangs. The solution is to pull 4 bytes of data up from the next segment rather than pushing 4 bytes off. This ensures the TCP header remains in one piece and works around the PCI-X hang. This patch is based on one from Jesse Brandeburg. This bug has been trigered by both CONFIG_DEBUG_SLAB as well as Xen. Note that the only reason we don't see this normally is because the TCP stack starts writing from the end, i.e., it writes the TCP header first then slaps on the IP header, etc. So the end of the TCP header (skb->tail - 1 here) is always aligned correctly. Had we made the start of the IP header (e.g., IPv6) 8-byte aligned instead, this would happen for normal TCP traffic as well. Signed-off-by: Herbert Xu Acked-by: Jesse Brandeburg -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- Signed-off-by: Jeff Garzik commit 1a63e846a4099e6fbff86a3b112064378515f254 Author: Brice Goglin Date: Mon Dec 18 11:52:34 2006 +0100 myri10ge: handle failures in suspend and resume On suspend, handle pci_set_power_state errors, and on resume handle failures in pci_resume_state(). Signed-off-by: Brice Goglin Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 83f6e1524586119df84f70b7127688c57349664a Author: Brice Goglin Date: Mon Dec 18 11:52:02 2006 +0100 myri10ge: no need to save MSI and PCIe state in the driver The PCI MSI and express state are already saved and restored by the current versions of pci_save_state/pci_restore_state. Therefore it is no longer necessary for the driver to do it. Signed-off-by: Brice Goglin Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 3621cec5b5847348248e749c647219f409550f2f Author: Brice Goglin Date: Mon Dec 18 11:51:22 2006 +0100 myri10ge: make msi configurable at runtime through sysfs Now that IRQ are requested is called on open() and freed on close(), we can safely switch from/to MSI without unloading the module. We are guaranteed to correctly free IRQ even if the sysfs file got written in the meantime since the MSI initialization is stored in mgp->msi_enabled. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit df30a740e4647b035e44a94e6977ad42a94cb850 Author: Brice Goglin Date: Mon Dec 18 11:50:40 2006 +0100 myri10ge: move request_irq to myri10ge_open Request IRQ in myri10ge_open() and free in close() instead of probe() and remove() to eliminate potential race between the watchdog and the interrupt handler. Additionaly, the interrupt handler won't get called on shared irq anymore when the interface is down. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit 7adda30c82f403c948b016a40fc68a1ef427dbca Author: Brice Goglin Date: Mon Dec 18 11:50:00 2006 +0100 myri10ge: match number of save_state and restore Since pci_save_state() pushes MSI and PCIe states on a kind of stack, myri10ge saving the state in advance for parity recovery will push the state again on the stack on suspend. This leads to some memory leak. We add a couple additional calls to save_state and restore_state so that we don't leak anymore. For the future, we are thinking of a better way to recover from parity error without using pci_save_state(). Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik commit a27993f3d9daca0dffa26577a83822db99c952e2 Author: Francois Romieu Date: Mon Dec 18 00:04:19 2006 +0100 r8169: use the broken_parity_status field in pci_dev The former option is removed and platform code can now specify the expected behavior. Signed-off-by: Lennert Buytenhek Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit d15e9c4d9a75702b30e00cdf95c71c88e3f3f51e Author: Francois Romieu Date: Sun Dec 17 23:03:15 2006 +0100 netpoll: drivers must not enable IRQ unconditionally in their NAPI handler net/core/netpoll.c::netpoll_send_skb() calls the poll handler when it is available. As netconsole can be used from almost any context, IRQ must not be enabled blindly in the NAPI handler of a driver which supports netpoll. b57bd06655a028aba7b92e1c19c2093e7fcfb341 fixed the issue for the 8139too.c driver. Signed-off-by: Francois Romieu Signed-off-by: Jeff Garzik commit 92104e94806f47e090e3bb40f6ae45f695351a5e Author: Stephen Hemminger Date: Fri Dec 15 07:57:08 2006 -0800 netxen: remove private ioctl The netxen driver includes a private ioctl that provides access to functionality that is already available in other ways. The PCI layer has application access hooks (see setpci), and the statistics are available in ethtool/netstats. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 79f3d3996f06ee339c6f173e573826eccd3914ab Author: Jesse Brandeburg Date: Fri Dec 15 10:42:34 2006 +0100 [PATCH] e1000: No-delay link detection at interface up Currently after an interface up, the link state is detected 2 seconds later when the first watchdog timer runs. This patch changes that by triggering the hardware to generate a link-change interrupt from the up() function instead. This has the result that the link state gets detected immediately and without races. This has the potential to speed up booting since a normal distribution boot process waits for a link before DHCP is attempted. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 15e376b4eed2575b323d575403569ec1b5f63fda Author: Jeff Garzik Date: Fri Dec 15 11:16:33 2006 -0500 e1000: 3 new driver stats for managability testing Add 3 extra packet redirect counters for tracking purposes to make sure we can test that all packets arrive properly. Originally from Jesse Brandeburg , rewritten to use feature flags by me. Signed-off-by: Jeff Garzik commit 1f753861d272e648f3234e4f5fdea9434ae7bee4 Author: Jesse Brandeburg Date: Fri Dec 15 10:40:39 2006 +0100 [PATCH] e1000: Make the copybreak value a module parameter Allow the user to vary the size that copybreak works. Currently cb is enabled for packets < 256 bytes, but various tests indicate that this should be configurable for specific use cases. In addition, this parameter allows us to force never/always during testing to get full and predictable coverage of both code paths. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 018ea44ef1eade417296c4a57afe3cd963268433 Author: Bruce Allan Date: Fri Dec 15 10:39:45 2006 +0100 [PATCH] e1000: Fix PBA allocation calculations Assign the PBA to be large enough to contain at least 2 jumbo frames on all adapters. This dramatically increases performance on several adapters and fixes TX performance degradation issues where the PBA was misallocated in the old algorithm. Signed-off-by: Bruce Allan Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit d89b6c6750e7d7527603b573ec60ba787f5c04a6 Author: Jesse Brandeburg Date: Fri Dec 15 10:38:32 2006 +0100 [PATCH] e1000: narrow down the scope of the tipg timer tweak the driver has (ancient) code for messing with TIPG from the 82542 days. Unfortunately this code was running on our current adapters and setting TIPG for fiber to be +1 over the copper value. This caused 1.45Mpps to be sent instead of 1.487Mpps. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit c3813ae6615107cc93c79200f477ffd2a870c8ab Author: Jeff Kirsher Date: Fri Dec 15 10:37:32 2006 +0100 [PATCH] e1000: fix ethtool reported bus type for older adapters For older adapters we know that they are of the PCI bus type, so we can just set this. Signed-off-by: Jeff Kirsher Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 83cd827977d8d20ac8c4fe56c88b53a70ac54af3 Author: Bruce Allan Date: Fri Dec 15 10:36:35 2006 +0100 [PATCH] e1000: fix to set the new max frame size before resetting the adapter This bugfix makes sure that the driver data reflects the full new situation before the adapter is reinitialized. Signed-off-by: Bruce Allan Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit bb8e3311ef9de8e72f45f910e4a977c313c7009c Author: Jeff Garzik Date: Fri Dec 15 11:06:17 2006 -0500 e1000: workaround for the ESB2 NIC RX unit issue In rare occasions, ESB2 systems would end up started without the RX unit being turned on. Add a check that runs post-init to work around this issue. Originally from Jesse Brandeburg , rewritten to use feature flags by me. Signed-off-by: Jeff Garzik commit 72f3ab7462f4e153d1e8ac78e379716ad71d6923 Author: Jesse Brandeburg Date: Fri Dec 15 10:34:46 2006 +0100 [PATCH] e1000: disable TSO on the 82544 with slab debugging CONFIG_DEBUG_SLAB changes alignments of the data structures the slab allocators return. These break certain workarounds for TSO on the 82544. Since DEBUG_SLAB is relatively rare and not used for performance sensitive cases, the simplest fix is to disable TSO in this special situation. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 3d5460a0ba17437cf278ee46886d557340d028da Author: Jesse Brandeburg Date: Fri Dec 15 10:33:46 2006 +0100 [PATCH] e1000: Fix Wake-on-Lan with forced gigabit speed If the user has forced gigabit speed, phy power management must be disabled; otherwise the NIC would try to negotiate to a linkspeed of 10/100 mbit on shutdown, which would lead to a total loss of link. This loss of link breaks Wake-on-Lan and IPMI. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 0fccd0e9e3802748855d967940c16f8c59d4e2b6 Author: Jeff Garzik Date: Fri Dec 15 10:56:10 2006 -0500 e1000: consolidate managability enabling/disabling Several bugs existed in how we handle manageability issues all over the driver. This patch consolidates all the managability release and init code in two single functions and call them from appropriate locations. This fixes several BMC packet redirect issues and powerup/down hiccups. Originally from Jesse Brandeburg , rewritten to use feature flags by me. Signed-off-by: Jeff Garzik commit 167fb2841633edd2812e385af4b593d870abd15a Author: Jeff Garzik Date: Fri Dec 15 10:41:15 2006 -0500 e1000: omit stats for broken counter in 82543 The 82543 chip does not count tx_carrier_errors properly in FD mode; report zeros instead of garbage. Originally from Jesse Brandeburg , rewritten to use feature flags by me. Signed-off-by: Jeff Garzik commit bd2371ebcc71d0a276ae341d735326a8beab6627 Author: Jeff Garzik Date: Fri Dec 15 10:31:40 2006 -0500 e1000: For sanity, reformat e1000_set_mac_type(), struct e1000_hw[_stats] Makes future changes a bit more readable. Signed-off-by: Jeff Garzik commit 2b65326e67f89899e8bcaed1989d8cfb0ed01f55 Author: Jesse Brandeburg Date: Fri Dec 15 10:30:44 2006 +0100 [PATCH] e1000: dynamic itr: take TSO and jumbo into account The dynamic interrupt rate control patches omitted proper counting for jumbo's and TSO resulting in suboptimal interrupt mitigation strategies. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 7d16e65ba57f181732ec52626736b27904198edf Author: Jesse Brandeburg Date: Fri Dec 15 10:29:31 2006 +0100 [PATCH] e1000: The user-supplied itr setting needs the lower 2 bits masked off The lower 2 bits of a user-supplied itr setting (via ethtool) need to be masked off: These lower two bits are used as control bits. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok Signed-off-by: Arjan van de Ven Signed-off-by: Jeff Garzik commit 0c234ae655a45ac3ee53a25b2e56e9bb6c27d71d Author: Ulrich Kunitz Date: Sun Dec 10 18:27:01 2006 +0100 [PATCH] ieee80211softmac: Fix mutex_lock at exit of ieee80211_softmac_get_genie ieee80211softmac_wx_get_genie locks the associnfo mutex at function exit. This patch fixes it. The patch is against Linus' tree (commit af1713e0). Signed-off-by: Ulrich Kunitz Signed-off-by: Michael Buesch Acked-by: Johannes Berg Signed-off-by: Larry Finger Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 6f07a8a3eb2adbfacd1322862368da4eb9dd3b45 Author: Ulrich Kunitz Date: Sun Dec 10 18:39:08 2006 +0100 [PATCH] ieee80211softmac: Fix errors related to the work_struct changes The signature of work functions changed recently from a context pointer to the work structure pointer. This caused a problem in the ieee80211softmac code, because the ieee80211softmac_assox_work function has been called directly with a parameter explicitly casted to (void*). This compiled correctly but resulted in a softlock, because mutex_lock was called with the wrong memory address. The patch fixes the problem. Another issue was a wrong call of the schedule_work function. Softmac works again and this fixes the problem I mentioned earlier in the zd1211rw rx tasklet patch. The patch is against Linus' tree (commit af1713e0). Signed-off-by: Ulrich Kunitz Acked-by: Michael Buesch Signed-off-by: Larry Finger Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit 4d1feabcbf41f875447a392015acd0796f57baf6 Author: Ulrich Kunitz Date: Sun Dec 10 11:13:12 2006 -0800 [PATCH] zd1211rw: Call ieee80211_rx in tasklet The driver called ieee80211_rx in hardware interrupt context. This has been against the intention of the ieee80211_rx function. It caused a bug in the crypto routines used by WPA. This patch calls ieee80211_rx in a tasklet. Signed-off-by: Ulrich Kunitz Signed-off-by: Andrew Morton Signed-off-by: John W. Linville