summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge rsync://bughost.org/repos/ieee80211-delta/Jeff Garzik2005-11-092-6/+10
|\
| * Update version ieee80211 stamp to 1.1.7James Ketrenos2005-11-071-1/+1
| |
| * Fix problem with WEP unicast key > index 0Volker Braun2005-11-071-2/+4
| | | | | | | | | | | | | | | | | | The functions ieee80211_wx_{get,set}_encodeext fail if one tries to set unicast (IW_ENCODE_EXT_GROUP_KEY not set) keys at key indices>0. But at least some Cisco APs dish out dynamic WEP unicast keys at index !=0. Signed-off-by: Volker Braun <volker.braun@physik.hu-berlin.de> Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
| * scripts/Lindent on ieee80211 subsystem.James Ketrenos2005-11-071-3/+5
| | | | | | | | Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
* | [PATCH] skge: increase version numberStephen Hemminger2005-11-081-2/+2
| | | | | | | | | | | | | | | | Increase the driver version number and print version when probing. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] skge: spelling fixesStephen Hemminger2005-11-081-14/+14
| | | | | | | | | | | | | | Fix some of my bad spelling. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] skge: use prefetch on receiveStephen Hemminger2005-11-081-7/+15
| | | | | | | | | | | | | | | | Use prefetch() in the interrupt path to try and look ahead at the next place will be looking at in the ring. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] skge: goto low power mode on shutdownStephen Hemminger2005-11-081-8/+20
| | | | | | | | | | | | | | Go into power down mode on shutdown. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] skge: add mii ioctl supportStephen Hemminger2005-11-081-58/+114
| | | | | | | | | | | | | | Basic MII ioctl support for skge driver. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] skge: use kzallocStephen Hemminger2005-11-081-2/+1
| | | | | | | | | | | | | | Can use kzalloc in skge driver. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | [PATCH] skge: clear PCI PHY COMA mode on bootStephen Hemminger2005-11-082-0/+12
| | | | | | | | | | | | | | | | When skge is booted up, the PHY may be stuck in power down state by the previous OS. So we may need to turn it on. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
* | Merge git://git.tuxdriver.com/git/netdev-jwlJeff Garzik2005-11-0716-249/+72
|\ \
| * | [PATCH] wireless net: Conversions of kmalloc/memset to kzallocPanagiotis Issaris2005-11-076-39/+19
| | | | | | | | | | | | | | | | | | | | | More conversions of kmalloc/memset to kzalloc Signed-off-by: Panagiotis Issaris <takis@issaris.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] atmel: memset correct rangeAlexey Dobriyan2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Specify the correct range when calling memset in atmel_get_range. Do this by specifying the size of the structure, rather than the size of the pointer. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] Fix sparse warning in e100 driver.Luiz Fernando Capitulino2005-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch below fixes the following sparse warnings: drivers/net/e100.c:1481:13: warning: Using plain integer as NULL pointer drivers/net/e100.c:1767:27: warning: Using plain integer as NULL pointer drivers/net/e100.c:1847:27: warning: Using plain integer as NULL pointer Signed-off-by: Luiz Capitulino <lcapitulino@mandriva.com.br> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] prism54 : Transmit stats updated in wrong placeRoger While2005-11-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Move update of the transmit statistics to the correct place. This would be just before starting transmission rather than (potentially long) afterward. Signed-off-by: Roger While <simrw@sim-basis.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] prism54 : Unused variable / extraneous udelayRoger While2005-11-071-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In isl_38xx.c : The variable "counter" is defined and incremented but never used except if the driver is hand-compiled setting VERBOSE > SHOW_ERROR_MESSAGES. Move the definition and the increment to within the #if VERBOSE .. block. Remove extraneous udelay's. These are not required when triggering the device. Signed-off-by: Roger While <simrw@sim-basis.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] drivers/net/s2io.c: make functions staticAdrian Bunk2005-11-071-20/+23
| | | | | | | | | | | | | | | | | | | | | This patch makes needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] kill include/linux/eeprom.hAdrian Bunk2005-11-072-147/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch kills include/linux/eeprom.h . Rationale: - it was only used by one single driver - even this driver didn't do anything useful with it - most of this file are non-inline and non-static functions (sic) This removes include/linux/eeprom.h and cleans drivers/net/ns83820.c up. If you think eeprom.h should be used more extensively, please consider: - the code has to be moved from the header file to a .c file - the currently empty write function has to be implemented - ns83820.c or any other driver should actually use it Noone did any of these during the more than 3 years eeprom.h already exists... Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] bonding: fix feature consolidationJay Vosburgh2005-11-072-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should resolve http://bugzilla.kernel.org/show_bug.cgi?id=5519 The current feature computation loses bits that it doesn't know about, resulting in an inability to add VLANs and possibly other havoc. Rewrote function to preserve bits it doesn't know about, remove an unneeded state variable, and simplify the code. Signed-off-by: Jay Vosburgh <fubar@us.ibm.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] fix NET_RADIO=n, IEEE80211=y compileAdrian Bunk2005-11-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the following compile error with CONFIG_NET_RADIO=n and CONFIG_IEEE80211=y: LD .tmp_vmlinux1 net/built-in.o: In function `ieee80211_rx': : undefined reference to `wireless_spy_update' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | | Merge branch 'master'Jeff Garzik2005-11-071316-20266/+40941
|\ \ \ | |_|/ |/| |
| * | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2005-11-0732-1569/+673
| |\ \
| | * | [SPARC64]: Kill some unnecessary includes from ioctl32.cDavid S. Miller2005-11-071-5/+0
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64]: remove drm compat ioctl handlingChristoph Hellwig2005-11-071-384/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/drm/ now implements proper ->compat_ioctl methods, so this isn't needed anymore. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC] cpwatchdog: implement ->compat_ioctlChristoph Hellwig2005-11-072-3/+24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC] display7seg: implement ->unlocked_ioctl and ->compat_ioctlChristoph Hellwig2005-11-072-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all ioctls are 32bit compat clean, so the driver can use ->compat_ioctl and ->unlocked_ioctl easily. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC] openprom: implement ->compat_ioctlChristoph Hellwig2005-11-072-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement a compat_ioctl handle in the driver instead of having table entries in sparc64 ioctl32.c (I plan to get rid of the arch ioctl32.c file eventually) Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC] envctrl: implement ->unlocked_ioctl and ->compat_ioctlChristoph Hellwig2005-11-072-18/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all the ioctls in the driver are 32bit compat clean and don't need BKL, so we can switch it to ->unlocked_ioctl and ->compat_ioctl trivially. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: Kill remaining kbio.h references.Christoph Hellwig2005-11-074-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Would you mind applying the following patch that kills those two + the m68k and Documentation/ references? Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64] mm: simpler tlb_flush_mmuHugh Dickins2005-11-071-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor simplification to the sparc64 tlb_flush_mmu: tlb_remove_page set need_flush only after handling the tlb_fast_mode case, then tlb_flush_mmu need not consider whether it's tlb_fast_mode. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64]: remove duplicated compat ioctl entriesChristoph Hellwig2005-11-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | all these are handled by fs/compat_ioctls.c already. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: remove vuid_event.hChristoph Hellwig2005-11-074-88/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't know if we ever implemented this, but the only user in any 2.6 tree are the compat ioctls. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: remove kbio.hChristoph Hellwig2005-11-073-123/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old keyboard driver is gone in 2.6, so the only user left are the compat ioctls. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: remove audioio.hChristoph Hellwig2005-11-073-475/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old sound drivers are gone in 2.6, so the only user left are the compat ioctls. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64]: remove alloc_user_space()Christoph Hellwig2005-11-071-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this inline routine in arch/sparc64/kernel/ioctl32.c is completely unused and superceeded by compat_alloc_user_space() Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: remove duplicate TIOCPKT_ definitionsStephen Rothwell2005-11-072-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TIOCPKT_ macros are defined by all other architectures in asm/ioctls.h and so does sparc and sparc64, so reomve the duplicates in asm/termios.h. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SUNSU]: Do not mark sunsu_console_setup() __initDavid S. Miller2005-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sets off buildcheck warnings. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64]: Kill off dummy_tick_ops.David S. Miller2005-11-071-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It only serves to generate false-positive buildcheck warnings. Just set it initially to tick_operations which uses the v9 %tick register which every sparc64 processor has. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64] mm: Do not flush TLB mm in tlb_finish_mmu()David S. Miller2005-11-072-35/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It isn't needed any longer, as noted by Hugh Dickins. We still need the flush routines, due to the one remaining call site in hugetlb_prefault_arch_hook(). That can be eliminated at some later point, however. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: Remove bogus register programming in cg6 driver.David S. Miller2005-11-071-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't write garbage into the overlay plane. Noted by Bob Breuer. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: More abstractions and cleanups of dma handling in cs4231.Georg Chini2005-11-072-341/+343
| | | | | | | | | | | | | | | | | | | | | | | | From: Georg Chini <georg.chini@triaton-webhosting.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64] mm: context switch ptlockHugh Dickins2005-11-073-55/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sparc64 is unique among architectures in taking the page_table_lock in its context switch (well, cris does too, but erroneously, and it's not yet SMP anyway). This seems to be a private affair between switch_mm and activate_mm, using page_table_lock as a per-mm lock, without any relation to its uses elsewhere. That's fine, but comment it as such; and unlock sooner in switch_mm, more like in activate_mm (preemption is disabled here). There is a block of "if (0)"ed code in smp_flush_tlb_pending which would have liked to rely on the page_table_lock, in switch_mm and elsewhere; but its comment explains how dup_mmap's flush_tlb_mm defeated it. And though that could have been changed at any time over the past few years, now the chance vanishes as we push the page_table_lock downwards, and perhaps split it per page table page. Just delete that block of code. Which leaves the mysterious spin_unlock_wait(&oldmm->page_table_lock) in kernel/fork.c copy_mm. Textual analysis (supported by Nick Piggin) suggests that the comment was written by DaveM, and that it relates to the defeated approach in the sparc64 smp_flush_tlb_pending. Just delete this block too. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC64] mm: don't re-evaluate *ptepHugh Dickins2005-11-072-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sparc64 prom_callback and new_setup_frame32 each operates on a user page table without holding lock, and no doubt they've good reason. But I'd feel more confident if they were to do a "pte = *ptep" and then operate on pte, rather than re-evaluating *ptep. Signed-off-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: Make SBUS dma code similar to EBUSGeorg Chini2005-11-071-112/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Georg Chini <georg.chini@triaton-webhosting.com> Introduce some sbus_dma routines similar to the ebus_dma stuff to make the code look nearly the same for both cases. Thanks to Christopher for testing. Signed-off-by: David S. Miller <davem@davemloft.net>
| | * | [SPARC]: Add sun4m LED driver.Lars Kotthoff2005-11-073-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a forward port of a 2.4.x sun4m LED driver written by Lars Kotthoff. Signed-off-by: Lars Kotthoff <metalhead@metalhead.ws> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | Merge branch 'release' of ↵Linus Torvalds2005-11-072-0/+2
| |\ \ \ | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
| | * \ \ Auto-update from upstreamTony Luck2005-11-071662-70603/+79841
| | |\ \ \
| | * | | | [IA64] restrict CONFIG_SGI_SN_XP to IA64_GENERIC or IA64_SGI_SN2Dean Nelson2005-11-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restrict CONFIG_SGI_SN_XP to IA64_GENERIC or IA64_SGI_SN2 kernels. Signed-off-by: Dean Nelson <dcn@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
| | * | | | Auto-update from upstreamTony Luck2005-11-03269-21464/+26618
| | |\ \ \ \
OpenPOWER on IntegriCloud