aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'upstream-linus' of ↵Linus Torvalds2006-01-12
|\ | | | | | | master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
| * [PATCH] via-velocity: use NETIF_F_IP_CSUM (hardware only support IPv4)John W. Linville2006-01-12
| | | | | | | | | | | | | | | | | | | | | | At least some versions of the via-velocity hardware only support checksumming IPv4 frames in hardware. However, the driver is currently setting the NETIF_F_HW_CSUM flag, which indicates support for more than just IPv4. This results in errors when trying to use IPv6 over via-velocity hardware. Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] fix wrong comments in ieee80211.hJohannes Berg2006-01-12
| | | | | | | | | | | | | | | | | | | | The comments in ieee80211.h claim that one doesn't need to set the len parameter of the stats struct. But if one doesn't, the management frames are read far over the memory they actually occupy causing badness. Signed-Off-By: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] bonding: UPDATED hash-table corruption in bond_alb.cJay Vosburgh2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe I see the race Michael refers to (tlb_choose_channel may set head, which tlb_init_slave clears), although I was not able to reproduce it. I have updated his patch for the current netdev-2.6.git tree and added a version update. His original comment follows: Our systems have been crashing during testing of PCI HotPlug support in the various networking components. We've faulted in the bonding driver due to a bug in bond_alb.c:tlb_clear_slave() In that routine, the last modification to the TLB hash table is made without protection of the lock, allowing a race that can lead tlb_choose_channel() to select an invalid table element. -J Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] wireless/atmel: add IWENCODEEXT, IWAUTH, and association event supportDan Williams2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows the Atmel driver to work correctly with wpa_supplicant and other programs that require some conformance with WEXT-18. It should not affect current behavior of the driver. The patch does four things: 1) Implements SIOCSIWENCODEEXT, SIOCGIWENCODEEXT, SIOCSIWAUTH, and SIOCGIWAUTH calls for unencrypted and WEP operation 2) Accepts zero-filled addresses for SIOCSIWAP, which are legal and should turn off any previous forced WAP address 3) Sends association and de-association events to userspace at most of the appropriate times 4) Fixes erroneous order of CIPHER_SUITE_WEP_* arguments in one location which are actually unused anyway Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] replace MODULE_PARM in tulip/uli526x.cEric Sesterhenn / snakebyte2006-01-12
| | | | | | | | | | | | | | Replace the MODULE_PARM usage in uli526x.c with module_param. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] gianfar: Use new PHY_ID_FMT macroKumar Gala2006-01-12
| | | | | | | | | | | | | | | | | | | | Make the driver produce the string used by phy_connect and have board specific code pass the integer mii bus id and phy device id for the specific controller instance. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] phy: Added a macro to represent the string format used to match a ↵Kumar Gala2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | phy device Add the PHY_ID_FMT macro to ensure that the format of the id string used by a driver to match to its specific phy is consistent between the mdio_bus and the driver. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] gianfar mii: Use proper resource for MII memory regionKumar Gala2006-01-12
| | | | | | | | | | | | | | | | | | | | | | We can now have the gianfar mii platform device have a proper resource for the IO memory region for its registers. Previously we passed this information that the platform_data structure because we couldn't handle overlapping memory regions for platform devices. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] gfar: fix compile errorKumar Gala2006-01-12
| | | | | | | | | | | | | | | | Missing include of <linux/in.h> to get definition of IPPROTO_UDP. Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] CONFIG_AIRO needs CONFIG_CRYPTOdann frazier2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | airo.c currently has MICSUPPORT enabled, which requires CONFIG_CRYPTO. A user reported a build failure which is due to the lack of a Kconfig dependency. See http://bugs.debian.org/344205. This patch makes Kconfig enforce this dependency. Signed-off-by: dann frazier <dannf@debian.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
| * [PATCH] corruption during e100 MDI register accessODonnell, Michael2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have identified two related bugs in the e100 driver. Both bugs are related to manipulation of the MDI control register. The first problem is that the Ready bit is being ignored when writing to the Control register; we noticed this because the Linux bonding driver would occasionally come to the spurious conclusion that the link was down when querying Link State. It turned out that by failing to wait for a previous command to complete it was selecting what was essentially a random register in the MDI register set. When we added code that waits for the Ready bit (as shown in the patch file below) all such problems ceased. The second problem is that, although access to the MDI registers involves multiple steps which must not be intermixed, nothing was defending against two or more threads attempting simultaneous access. The most obvious situation where such interference could occur involves the watchdog versus ioctl paths, but there are probably others, so we recommend the locking shown in our patch file. Signed-off-by: Michael O'Donnell <Michael.ODonnell@stratus.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jeff Garzik <jgarzik@pobox.com> Cc: John Ronciak <john.ronciak@intel.com> Cc: Ganesh Venkatesan <ganesh.venkatesan@intel.com> Cc: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6Linus Torvalds2006-01-12
|\ \
| * | [PATCH] pcmcia: runtime powermanagement interfaceDominik Brodowski2006-01-12
| | | | | | | | | | | | | | | | | | | | | | | | With the "power/state" sysfs interface being deprecated, make another one available which is compatible to what was discussed on the linux PM mailinglist. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * | [PATCH] pcmcia: add new IDs for serial_cs.cDominik Brodowski2006-01-12
| | | | | | | | | | | | | | | | | | | | | Add IDs for Sierra Aircard 55 CDMA 1xrtt Modem -- a CIS update is required for this card. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
* | | Merge branch 'drm-forlinus' of ↵Linus Torvalds2006-01-12
|\ \ \ | |_|/ |/| | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
| * | drm: fix issues with systems with no MTRRDave Airlie2006-01-12
| | | | | | | | | | | | | | | | | | | | | On systems with no MTRR we should still define the interface. Original bug from apkm. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: cleanup properly on drm module unloadDave Airlie2006-01-11
| | | | | | | | | | | | | | | | | | Cleanup multiple cards properly Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fixup drm bufs being just under the EOMDave Airlie2006-01-11
| | | | | | | | | | | | | | | | | | | | | If the mapping was just under the end of memory it would fail. Lets DRM start on my PCI card. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix radeon warnings on 64-bitDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> drivers/char/drm/radeon_state.c: In function `radeon_cp_dispatch_texture': drivers/char/drm/radeon_state.c:1653: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1661: warning: int format, different type arg (arg 3) drivers/char/drm/radeon_state.c:1689: warning: int format, different type arg (arg 3) sizeof() doesn't return an int. Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: fix warning on alphaDave Airlie2006-01-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Andrew Morton <akpm@osdl.org> On alpha: drivers/char/drm/via_dmablit.h:44: error: field `direction' has incomplete type Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: remove is_pci flag completely...Dave Airlie2006-01-03
| | | | | | | | | | | | | | | | | | this snuck back in, in the last merge. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | drm: merge in Linus mainlineDave Airlie2006-01-03
| |\ \
| * | | drm: major update from CVS for radeon and coreDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch pull in a lot of changes from CVS to the main core DRM, and updates the radeon driver to 1.21.0 that supports r300 texrect and radeon card type ioctl. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update drm pci ids listDave Airlie2006-01-02
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: drm_ioctl.c sync with fixes from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | Apply the fixes from CVS that were outstanding for this file Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update lock flags from userspaceDave Airlie2006-01-02
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update to i915 1.3.0Dave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for vblank ioctls to i915 driver From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update drm_memory_debug.hDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update from DRM CVS for drm memory debug From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: proper fix for drm_contextDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | Bad patch in last version Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fix issue with contexts running out of RAMDave Airlie2006-01-02
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update PCIGART support from CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to work on FreeBSD the gart needed to use a local mapping This patch moves the mainline to the new code and aligns some comment changes From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove old reclaim_buffers from ix0 driversDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | From: Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: bring savage inline with latest CVSDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | apply some whitespace cleanup and add wrappers for MTRR for OS calls From: Eric Anholt <anholt@freebsd.org> + Dave Airlie <airlied@linux.ie> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fix a LOR issue on FreeBSD for savage driverDave Airlie2006-01-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a LOR issue on FreeBSD by allocating temporary space and doing a single DRM_COPY_FROM_USER rather than DRM_VERIFYAREA_READ followed by tons of DRM_COPY_FROM_USER_UNCHECKED. I don't like the look of the temporary space allocation, but I like the simplification in the rest of the file. Tested with glxgears, tuxracer, and q3 on a savage4. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: bring sis + tdfx up to latest CVSDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup SIS + TDFX drivers with latest changes from CVS. From: Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: via driver update to CVS versionDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the DRM via driver to the latest CVS version, which contains support for DMA blitting. It also contains some whitespace and other minor fixes From: Thomas Hellstrom <unichrome@shipmail.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: move ioctl flags to a bit field of flagsDave Airlie2006-01-01
| | | | | | | | | | | | | | | | | | | | | | | | From: Dave Airlie Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update VIA driver to 2.7.2Dave Airlie2005-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add PCI DMA blitengine to VIA DRM Add portability code for porting VIA to FreeBSD. Sync via_drm.h with 3d driver From: Thomas Hellstrom <unichrome@shipmail.org>, Eric Anholt <anholt@freebsd.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: drop mtrr from i915Dave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Alan Hourihane wants to set MTRR in the DDX only as otherwise we get problems with the shared memory chipset. From: Alan Hourihane <alanh@fairlite.demon.co.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: update mga driver for new bootstrap codeDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The MGA driver needs to use the full AGP interface. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove exports that modules shouldn't use.Dave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | Modules should go via the new drm_agp_ functions. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: add in-kernel entry points for rest of AGP ioctlsDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow DRM modules to call AGP internally in the kernel. From: Ian Romanick <idr@us.ibm.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: simplify sysfs code for drmDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This simplifies the sysfs code for the drm and add a dri_library_name attribute which can be used by a userspace app to figure out which library to load. From: Jon Smirl <jonsmirl@gmail.com> Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: fixup drm_proc.c struct tableDave Airlie2005-11-11
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove old backwards compatibilty stuffDave Airlie2005-11-11
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove drm_flushDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | drm_flush is no longer needed remove. Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: cleanup via_ds.c includesDave Airlie2005-11-11
| | | | | | | | | | | | | | | | | | | | | | | | Remove the linux includes from via_ds.c Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove remnamt of old DRM code from tdfxDave Airlie2005-11-11
| | | | | | | | | | | | | | | | Signed-off-by: Dave Airlie <airlied@linux.ie>
| * | | drm: remove drm_init.c it is no longer neededDave Airlie2005-11-10
| | | | | | | | | | | | | | | | | | | | | | | | Move drm_cpu_valid into drm_fops.c Signed-off-by: Dave Airlie <airlied@linux.ie>