commit 88dcb91177cfa5b26143a29074389a2aa259c7cf 
tree 4906b9712a797b5805aa00fc0f766b27b7432005 
parent c7cace6437b2f8bbab5ef05b465738283a9a100a 
parent c5111f504d2a9b0d258d7c4752b4093523315989 
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 20 Mar 2006 10:32:33 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 20 Mar 2006 10:32:33 -0800 

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
    JFS: add uid, gid, and umask mount options
    JFS: Take logsync lock before testing mp->lsn
    JFS: kzalloc conversion
    JFS: Add missing file from fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
    JFS: Use the kthread_ API
    JFS: Fix regression.  fsck complains if symlinks do not have INLINEEA attribute
    JFS: ext2 inode attributes for jfs
    JFS: semaphore to mutex conversion.
    JFS: make buddy table static
    JFS: Add back directory i_size calculations for legacy partitions

commit c7cace6437b2f8bbab5ef05b465738283a9a100a 
tree 304a7dca0354eaa8ac21aa05cd287e317fa21b8c 
parent a90779bfc83b7489270a8ce2c3fc9df20dac2b24 
parent 2e9ff56efbc005ab2b92b68df65940c7459446c6 
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 20 Mar 2006 10:30:31 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 20 Mar 2006 10:30:31 -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: (150 commits)
    [PATCH] ipw2100: Update version ipw2100 stamp to 1.2.2
    [PATCH] ipw2100: move mutex.h include from ipw2100.c to ipw2100.h
    [PATCH] ipw2100: semaphore to mutexes conversion
    [PATCH] ipw2100: Fix radiotap code gcc warning
    [PATCH] ipw2100: add radiotap headers to packtes captured in monitor mode
    [PATCH] ipw2x00: expend Copyright to 2006
    [PATCH] drivers/net/wireless/ipw2200.c: fix an array overun
    [PATCH] ieee80211: Don't update network statistics from off-channel packets.
    [PATCH] ipw2200: Update ipw2200 version stamp to 1.1.1
    [PATCH] ipw2200: switch to the new ipw2200-fw-3.0 image format
    [PATCH] ipw2200: wireless extension sensitivity threshold support
    [PATCH] ipw2200: Enables the "slow diversity" algorithm
    [PATCH] ipw2200: Set a meaningful silence threshold value
    [PATCH] ipw2200: export `debug' module param only if CONFIG_IPW2200_DEBUG
    [PATCH] ipw2200: Change debug level for firmware error logging
    [PATCH] ipw2200: Filter unsupported channels out in ad-hoc mode
    [PATCH] ipw2200: Fix ipw_sw_reset() implementation inconsistent with comment
    [PATCH] ipw2200: Fix rf_kill is activated after mode change with 'disable=1'
    [PATCH] ipw2200: remove the WPA card associates to non-WPA AP checking
    [PATCH] ipw2200: Add signal level to iwlist scan output
    ...

commit a90779bfc83b7489270a8ce2c3fc9df20dac2b24 
tree 53a41d0e419024619c621facb2baf6e782e16f35 
parent 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 
parent e572ec7e4e432de7ecf7bd2e62117646fa64e518 
author Linus Torvalds <torvalds@g5.osdl.org> Mon, 20 Mar 2006 10:28:51 -0800 
committer Linus Torvalds <torvalds@g5.osdl.org> Mon, 20 Mar 2006 10:28:51 -0800 

    Merge branch 'block-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/block
    
    * 'block-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/block:
    [PATCH] fix rmmod problems with elevator attributes, clean them up
    [PATCH] elevator_t lifetime rules and sysfs fixes
    [PATCH] noise removal: cfq-iosched.c
    [PATCH] don't bother with refcounting for cfq_data
    [PATCH] fix sysfs interaction and lifetime rules handling for queues
    [PATCH] regularize blk_cleanup_queue() use
    [PATCH] fix cfq_get_queue()/ioprio_set(2) races
    [PATCH] deal with rmmod/put_io_context() races
    [PATCH] stop elv_unregister() from rogering other iosched's data, fix locking
    [PATCH] stop cfq from pinning queue down
    [PATCH] make cfq_exit_queue() prune the cfq_io_context for that queue
    [PATCH] fix the exclusion for ioprio_set()
    [PATCH] keep sync and async cfq_queue separate
    [PATCH] switch to use of ->key to get cfq_data by cfq_io_context
    [PATCH] stop leaking cfq_data in cfq_set_request()
    [PATCH] fix cfq hash lookups
    [PATCH] fix locking in queue_requests_store()
    [PATCH] fix double-free in blk_init_queue_node()
    [PATCH] don't do exit_io_context() until we know we won't be doing any IO

commit 2e9ff56efbc005ab2b92b68df65940c7459446c6 
tree 8844a54f2b205bb5dceb6391d05df9a9f8bc62d2 
parent d378aca6ec708bfb24df5c47801b1f2399efc481 
parent cc8279f68c34c3f32b3a85f3103b0ad755c57846 
author Jeff Garzik <jeff@garzik.org> Mon, 20 Mar 2006 04:38:50 -0500 
committer Jeff Garzik <jeff@garzik.org> Mon, 20 Mar 2006 04:38:50 -0500 

    Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit d378aca6ec708bfb24df5c47801b1f2399efc481 
tree 7535f96bf34314df071698d2e06054b8d5223ebb 
parent abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b 
parent 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 
author Jeff Garzik <jeff@garzik.org> Mon, 20 Mar 2006 04:38:03 -0500 
committer Jeff Garzik <jeff@garzik.org> Mon, 20 Mar 2006 04:38:03 -0500 

    Merge branch 'master'

commit e572ec7e4e432de7ecf7bd2e62117646fa64e518 
tree 56b4b738fb566128d2db6d62aed28cfd41b5398a 
parent 3d1ab40f4c20767afbd361b258a531d73e3e6fc2 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 22:27:18 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 22:27:18 -0500 

    [PATCH] fix rmmod problems with elevator attributes, clean them up

commit 3d1ab40f4c20767afbd361b258a531d73e3e6fc2 
tree 2da79cc8b47a98b0496b6e762fa790a8d547977b 
parent 1cc9be68ebcc1de9904bf225441613878da9c0d8 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:35:43 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:35:43 -0500 

    [PATCH] elevator_t lifetime rules and sysfs fixes

commit 1cc9be68ebcc1de9904bf225441613878da9c0d8 
tree 59a885d6e939725a6e37e0888ef41e3852ae3223 
parent a90d742e4cbbc217c402265eb8b8bb0e0f9f8da2 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 12:29:52 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:35:08 -0500 

    [PATCH] noise removal: cfq-iosched.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit a90d742e4cbbc217c402265eb8b8bb0e0f9f8da2 
tree a2423ca7cf3249a4c8b2c55021e0ae8f089b35e7 
parent 483f4afc421435b7cfe5e88f74eea0b73a476d75 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 12:05:37 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:35:05 -0500 

    [PATCH] don't bother with refcounting for cfq_data
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 483f4afc421435b7cfe5e88f74eea0b73a476d75 
tree 9a3bbcf8ae83c5edb9ab1f9e98333d6f5673211b 
parent 1312f40e11c57edb5c3250f1b782cef8e3efea82 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:37 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:37 -0500 

    [PATCH] fix sysfs interaction and lifetime rules handling for queues

commit 1312f40e11c57edb5c3250f1b782cef8e3efea82 
tree 0aae9e7fe6211d83212991e84789fcd7e9908ced 
parent 6f325a13442d4e4a6c93d06d8e6deff79b6540b1 
author Al Viro <viro@zeniv.linux.org.uk> Sun, 12 Mar 2006 11:02:03 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:20 -0500 

    [PATCH] regularize blk_cleanup_queue() use
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 6f325a13442d4e4a6c93d06d8e6deff79b6540b1 
tree e180ac54bd6d0885a7d615dec866a6793340f0a6 
parent 334e94de9bea353156abd6f2242d3cc4a24562b0 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 14:58:37 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:17 -0500 

    [PATCH] fix cfq_get_queue()/ioprio_set(2) races
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 334e94de9bea353156abd6f2242d3cc4a24562b0 
tree ff4a253e9e3bf487be03bf58727a7ea40a34ba87 
parent e17a9489b4a686bb5e9615e1d375c67619cb99c5 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 15:05:53 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:15 -0500 

    [PATCH] deal with rmmod/put_io_context() races
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit e17a9489b4a686bb5e9615e1d375c67619cb99c5 
tree e6574d24ad8f16fefe7663c91cf19109e48f8c6c 
parent 25975f863b0fd42c58109e253e7a4c65d9fdaf48 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:21:20 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:12 -0500 

    [PATCH] stop elv_unregister() from rogering other iosched's data, fix locking
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 25975f863b0fd42c58109e253e7a4c65d9fdaf48 
tree 98738124360c12c34b8820c3cc639dc275d1f4d0 
parent d9ff41879364cfca7c15abc20ae398e35de3f883 
author Al Viro <viro@zeniv.linux.org.uk> Sun, 12 Mar 2006 13:45:25 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:09 -0500 

    [PATCH] stop cfq from pinning queue down
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit d9ff41879364cfca7c15abc20ae398e35de3f883 
tree 58b69841c145a000d06658feff5d846eea624399 
parent a6a0763a60eef374d4f02f82a6ecb6a74f380fcb 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:51:22 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:07 -0500 

    [PATCH] make cfq_exit_queue() prune the cfq_io_context for that queue
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit a6a0763a60eef374d4f02f82a6ecb6a74f380fcb 
tree ab6811f034eb2839ee07bc8e251b96a1aba313f7 
parent 12a057321529df2fb650ac5f34dfd7abcca667df 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:26:44 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:04 -0500 

    [PATCH] fix the exclusion for ioprio_set()
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 12a057321529df2fb650ac5f34dfd7abcca667df 
tree b74a85a275cf97cebcd30aa544605081c80d7fb1 
parent 478a82b0edeea1cc82a5f79880b3a15923a678de 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:38:01 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:34:02 -0500 

    [PATCH] keep sync and async cfq_queue separate
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 478a82b0edeea1cc82a5f79880b3a15923a678de 
tree 091c2ace634975c62c8236f209b24e4fded81ff4 
parent 7670876d2d194b2aecb54f397704838eee7d72ee 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:25:24 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:33:59 -0500 

    [PATCH] switch to use of ->key to get cfq_data by cfq_io_context
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 7670876d2d194b2aecb54f397704838eee7d72ee 
tree 4c1b29bba1b038a407870ab62b3dd70057c949e0 
parent b0a6916bcc48f46996d54b8451591a2f2b7b2f64 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:22:53 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:33:56 -0500 

    [PATCH] stop leaking cfq_data in cfq_set_request()
    
    We don't need to pin ->key down; ->cfqq->cfqd will do that for us.
    Incidentally, that stops the leak we had - that reference was never
    dropped.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit b0a6916bcc48f46996d54b8451591a2f2b7b2f64 
tree 8b22d7d04a802092928a642628d2ede339a5287a 
parent c981ff9f893b9ab229a809f8ad287ae43fc17a64 
author Al Viro <viro@zeniv.linux.org.uk> Tue, 14 Mar 2006 15:32:50 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:33:54 -0500 

    [PATCH] fix cfq hash lookups
    
    If somebody does a hash lookup for cfq_queue while ioprio of an async queue
    is elevated, they shouldn't end up stuck with lowered ioprio when we go back.
    Fix is to use ->org_ioprio{,class} in hash lookups.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit c981ff9f893b9ab229a809f8ad287ae43fc17a64 
tree c0423d86a33f0f714fa192b4f964269889b12c3f 
parent 8669aafdb5a46a57366dd1540fc475544071a9c9 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:51:29 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:33:51 -0500 

    [PATCH] fix locking in queue_requests_store()
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 8669aafdb5a46a57366dd1540fc475544071a9c9 
tree c30fc562aeb1b2c158844b4d30d5423414b719bc 
parent afc847b7ddcf636e524cf5b0de644bd3a9419a8c 
author Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 13:50:00 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:33:49 -0500 

    [PATCH] fix double-free in blk_init_queue_node()
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit afc847b7ddcf636e524cf5b0de644bd3a9419a8c 
tree 5022a566bc55a12a792c8bd9b2d94ccfd4b10235 
parent 60a6dc55b93b3321afa52f650a149fb7e87fa85a 
author Al Viro <viro@zeniv.linux.org.uk> Tue, 28 Feb 2006 12:51:55 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 18 Mar 2006 18:33:46 -0500 

    [PATCH] don't do exit_io_context() until we know we won't be doing any IO
    
    testcase:
    
    mount /dev/sdb10 /mnt
    touch /mnt/tmp/b
    umount /mnt
    mount /dev/sdb10 /mnt
    rm /mnt/tmp/b </mnt/tmp/b
    umount /mnt
    
    and watch blkdev_ioc line in /proc/slabinfo.  Vanilla kernel leaks.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit cc8279f68c34c3f32b3a85f3103b0ad755c57846 
tree 13c896b8a0bba7244818b62b767ebb807c30541e 
parent 3234eeec18315356166cd89bd93fc4630192eece 
author Zhu Yi <yi.zhu@intel.com> Tue, 21 Feb 2006 18:46:15 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 16:14:48 -0500 

    [PATCH] ipw2100: Update version ipw2100 stamp to 1.2.2
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3234eeec18315356166cd89bd93fc4630192eece 
tree 462a95c09b9a745e4dcab6589bd2bea36355c050 
parent 752e377bfdad61482e39cafedb3a6bb1b5bb0289 
author Zhu Yi <yi.zhu@intel.com> Tue, 28 Feb 2006 08:38:07 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 16:14:48 -0500 

    [PATCH] ipw2100: move mutex.h include from ipw2100.c to ipw2100.h
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 752e377bfdad61482e39cafedb3a6bb1b5bb0289 
tree 2d3cda9de2ffd0776aea72d7f8d41f6c6a673632 
parent cae1629515cf6d166fa20657e68b75619d563280 
author Ingo Molnar <mingo@elte.hu> Tue, 28 Feb 2006 07:20:54 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 16:14:48 -0500 

    [PATCH] ipw2100: semaphore to mutexes conversion
    
    semaphore to mutexes conversion.
    
    the conversion was generated via scripts, and the result was validated
    automatically via a script as well.
    
    build-tested.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit cae1629515cf6d166fa20657e68b75619d563280 
tree a40dbc0c8e7d6fed80be63bcc4182ef42b3ca84d 
parent 15745a7dd1ac6bf1ef7959040f864c78a95aa35b 
author Zhu Yi <yi.zhu@intel.com> Tue, 21 Feb 2006 18:41:14 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 16:14:48 -0500 

    [PATCH] ipw2100: Fix radiotap code gcc warning
    
    Fix gcc warning: ipw2100.c:2460: ISO C90 forbids mixed declarations and code
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 15745a7dd1ac6bf1ef7959040f864c78a95aa35b 
tree b9e95a75c83f2d1b5eba9af2a36cc9912e0188ee 
parent 171e7b2f1f50f112d3ce8a829a3e79c5739b3132 
author Stefan Rompf <stefan@loplof.de> Tue, 21 Feb 2006 18:36:17 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 16:14:48 -0500 

    [PATCH] ipw2100: add radiotap headers to packtes captured in monitor mode
    
    Signed-off-by: Stefan Rompf <stefan@loplof.de>
    Signed-off-by: Andrea Merello <andreamrl at tiscali it>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 171e7b2f1f50f112d3ce8a829a3e79c5739b3132 
tree 31a5b5cb8a0306b1e5469d967365d6d019a9a7f1 
parent 71e585fca25c9ccde82196fd1aef78e34312e899 
author Zhu Yi <yi.zhu@intel.com> Wed, 15 Feb 2006 07:17:56 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 16:14:47 -0500 

    [PATCH] ipw2x00: expend Copyright to 2006
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 71e585fca25c9ccde82196fd1aef78e34312e899 
tree 4cb6cf43dcc6f7cae5c0191f0e409b0eb2a72261 
parent f44349f2217d05e4575f24edc3c0e0022f5d448f 
author Adrian Bunk <bunk@stusta.de> Sat, 11 Mar 2006 04:42:58 +0100 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:41:20 -0500 

    [PATCH] drivers/net/wireless/ipw2200.c: fix an array overun
    
    This patch fixes a big array overun found by the Coverity checker.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f44349f2217d05e4575f24edc3c0e0022f5d448f 
tree 615c789b22164bf4afef198795b75c701936efd6 
parent 7c567894480daef05bc13abdc4b9414541e245cb 
author James Ketrenos <jketreno@linux.intel.com> Wed, 08 Mar 2006 13:14:45 -0600 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:38:55 -0500 

    [PATCH] ieee80211: Don't update network statistics from off-channel packets.
    
    This patch fixes a problem in the ieee80211 probe response and beacon
    reception code that would use the packet statistics for a network even
    if they were received on a channel other than that which the network
    exists on.
    
    This causes a problem in overlapping channels where, for example, a
    strong AP on channel 2 could have its beacons received on channels 1 and
    3, but at much lower signal levels.  If scanning was done sequentially,
    this means the beacon received on channel 3 would update the AP's signal
    level as being much lower than it really is, which subsequently could
    cause that AP to be passed over and an alternate AP selected.
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 7c567894480daef05bc13abdc4b9414541e245cb 
tree 4e9c6f80427eb269914c6aab24cac246e16ca06b 
parent 9006ea75cfaded82acbc34d03e9d4e86447f40a9 
author Zhu Yi <yi.zhu@intel.com> Fri, 24 Feb 2006 04:20:48 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:04 -0500 

    [PATCH] ipw2200: Update ipw2200 version stamp to 1.1.1
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 9006ea75cfaded82acbc34d03e9d4e86447f40a9 
tree a65ca3227d09488495444b9f4d43179c595191c4 
parent 651be26f2daf31e61faf4b55ada709cf39ec76a2 
author James Ketrenos <jketreno@linux.intel.com> Wed, 08 Mar 2006 03:22:28 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:04 -0500 

    [PATCH] ipw2200: switch to the new ipw2200-fw-3.0 image format
    
    This patch modifies the driver to support the ipw2200-fw-3.0 image format.
    
    The 3.0 fw image does not add any new capabilities, but as a result of
    image format changes, it should fix two problems experienced by users:
    
    1) Race conditions with the request_firmware interface and udev/hotplug
    are improved as only a single request_firmware call is now required to
    load the firmware and microcode (vs. 3 separate calls previously)
    
    2) The monitor mode firmware (sniffer) is now packaged with the correct
    boot image so it can now function without frequent restarts.
    
    Note: Once you apply this patch, you will also need to upgrade your
    firmware image to the 3.0 version available from:
    
    http://ipw2200.sf.net/firmware.php
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 651be26f2daf31e61faf4b55ada709cf39ec76a2 
tree cac9bac812d1ecc1f85bce54a2591cab34752627 
parent 71de1f3dd14e3e39cef929506a9526779f5a447d 
author Olivier Hochreutiner <olivier.hochreutiner@epfl.ch> Wed, 08 Mar 2006 03:13:55 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:04 -0500 

    [PATCH] ipw2200: wireless extension sensitivity threshold support
    
    The patch allows the user to set the handover threshold, i.e. the number
    of consecutively missed beacons that will trigger a roaming attempt. The
    disassociation threshold is set to 3 times the handover threshold.
    
    Signed-off-by: Olivier Hochreutiner <olivier.hochreutiner@epfl.ch>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 71de1f3dd14e3e39cef929506a9526779f5a447d 
tree d87676e1eee0670e23a506dc34ec16b615181732 
parent 12977154e7cb4d72b1295f009a040c56a7e05d90 
author Cahill, Ben M <ben.m.cahill@intel.com> Wed, 08 Mar 2006 03:02:27 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:04 -0500 

    [PATCH] ipw2200: Enables the "slow diversity" algorithm
    
    This forces one antenna or the other, if the background noise is
    significantly quieter in one than the other. It favors the quieter
    antenna, and won't kick in unless the difference is significant.
    
    Signed-off-by: Cahill, Ben M <ben.m.cahill@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 12977154e7cb4d72b1295f009a040c56a7e05d90 
tree 45e0f0d861158c76f37ac8731a100d4dfadadb4e 
parent 3e1555bae145ab2d079a1823cbdd5c486503d147 
author Cahill, Ben M <ben.m.cahill@intel.com> Wed, 08 Mar 2006 02:58:02 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:04 -0500 

    [PATCH] ipw2200: Set a meaningful silence threshold value
    
    Set a meaningful silence threshold value (replacing our previous "0"
    default), which gets rid of the gratuitous "Link deterioration"
    notifications that we've been receiving from firmware.  This
    notification feature tells the driver information to help it determine
    when to pre-emptively restart the firmware/ucode in anticipation of
    firmware errors!  But since setting this new threshold, I haven't seen
    any such notifications.  At least it keeps the logs a little less busy.
    
    Signed-off-by: Cahill, Ben M <ben.m.cahill@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3e1555bae145ab2d079a1823cbdd5c486503d147 
tree 2c89fadf472483b76175b7bfc779ce56baed25ca 
parent 1d1b09eb144e414ade1f44e21852fc60f2cf965b 
author Zhu Yi <yi.zhu@intel.com> Mon, 06 Mar 2006 05:48:37 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:03 -0500 

    [PATCH] ipw2200: export `debug' module param only if CONFIG_IPW2200_DEBUG
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 1d1b09eb144e414ade1f44e21852fc60f2cf965b 
tree bce6f18ed69a27bbcc9d77e96a619ebe66a761c8 
parent e815de422c1dc2fe787c6f3edba81f3cf0176e32 
author Zhu Yi <yi.zhu@intel.com> Thu, 02 Mar 2006 06:40:59 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:03 -0500 

    [PATCH] ipw2200: Change debug level for firmware error logging
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e815de422c1dc2fe787c6f3edba81f3cf0176e32 
tree bf2bd807d9741934872f2f87c24ddefa4095c6bb 
parent e8c69e27d14a5fb15df9967f8c8ec5978af33ba8 
author Zhu Yi <yi.zhu@intel.com> Thu, 02 Mar 2006 05:55:51 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:03 -0500 

    [PATCH] ipw2200: Filter unsupported channels out in ad-hoc mode
    
    Currently iwlist ethX freq[uency]/channel lists all the channels the card
    supported for the current region, which includes some channels can only
    be used in infrastructure mode. This patch filters these channels out if
    the card is currently in ad-hoc mode.
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit e8c69e27d14a5fb15df9967f8c8ec5978af33ba8 
tree d428648e976c8844ff68a1328204af14ebb9d20a 
parent d6d5b5c13e5003c9d33dcdcfdf1febc6efd7d319 
author Zhu Yi <yi.zhu@intel.com> Fri, 17 Feb 2006 08:25:12 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:03 -0500 

    [PATCH] ipw2200: Fix ipw_sw_reset() implementation inconsistent with comment
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d6d5b5c13e5003c9d33dcdcfdf1febc6efd7d319 
tree d7de88aace32d5be27afcae756c94187fd9f53b2 
parent 8da374fc44a5e0fb71a485497cae38eb562d078c 
author Zhu Yi <yi.zhu@intel.com> Thu, 16 Feb 2006 16:21:09 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:03 -0500 

    [PATCH] ipw2200: Fix rf_kill is activated after mode change with 'disable=1'
    
    When loading the ipw2200 module with disabled=1, rf_kill is activated after
    every mode change. This is caused by ipw_sw_reset() is called when a mode
    is changed. The patch fixed the problem by distinguishing the purposes with
    the 'option' paramenter.
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 8da374fc44a5e0fb71a485497cae38eb562d078c 
tree 48bec1c7d8f0a2c7bc0ac7e1b5cef5fa3c9a2f6d 
parent b191608a451e75ed7f979cac268f5f423176feb3 
author Zhu Yi <yi.zhu@intel.com> Fri, 17 Feb 2006 07:46:16 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:03 -0500 

    [PATCH] ipw2200: remove the WPA card associates to non-WPA AP checking
    
    wpa_supplicant needs to set wpa_enabled unconditionally, with this check
    it hasn't been possible to connect to non-WPA networks using wpa_supplicant.
    So remove below check.
    
    if (priv->ieee->wpa_enabled &&
    network->wpa_ie_len == 0 && network->rsn_ie_len == 0)
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b191608a451e75ed7f979cac268f5f423176feb3 
tree 3f0037006a39d8c8507392bca15b326471fc76a2 
parent 9d0be03aeeadcd59bd8f57219817e876a5e88e88 
author Bill Moss <bmoss@clemson.edu> Wed, 15 Feb 2006 08:50:18 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:02 -0500 

    [PATCH] ipw2200: Add signal level to iwlist scan output
    
    This patch does two things. It uses the parameter IW_QUAL_DBM which is new
    in WE-19 to cause signal level and noise to be reported in dBm by the
    wireless tools. It also defines the signal level as an unsigned integer
    so that the signal level will be reported by iwlist iface scan.
    
    Signed-off-by: Bill Moss <bmoss@clemson.edu>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 9d0be03aeeadcd59bd8f57219817e876a5e88e88 
tree 2b8f12a59c1e2d643c90ecd645ac508a43324eaa 
parent 85149bace30eae1dc1f86d2c327329673123dd22 
author Zhu Yi <yi.zhu@intel.com> Wed, 15 Feb 2006 06:18:19 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:02 -0500 

    [PATCH] ipw2200: use generic ieee80211_get_hdrlen() to get packet length
    
    replace ipw2200 specific frame_hdr_len() with generic
    ieee80211 routine ieee80211_get_hdrlen()
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 85149bace30eae1dc1f86d2c327329673123dd22 
tree 53bf83b9b3bde433cc79f82479ba1dab5df5cc85 
parent f697014af90c1db3c7b299327bf5a9548945b8bf 
author Zhu Yi <yi.zhu@intel.com> Tue, 14 Feb 2006 16:02:22 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:02 -0500 

    [PATCH] ipw2200: fix a potential NULL pointer dereference
    
    Only on CONFIG_IPW2200_DEBUG is not defined
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f697014af90c1db3c7b299327bf5a9548945b8bf 
tree 983fd3e7a6c3c365a78f9d79cfdfd5761b60c7ea 
parent 48a847709f821b5eecd45ae7660add1869f9cd37 
author James Ketrenos <jketreno@linux.intel.com> Tue, 14 Feb 2006 09:10:51 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:02 -0500 

    [PATCH] ipw2200: stop netdev queue if h/w doesn't have space for new packets
    
    The patch roll back the change we made to support for the ability to
    start/stop independent Tx queues within a single net device in order to
    support 802.11e QoS. We need to be able to indicate to the upper layers
    that packets of a given priority can not be sent any more without halting
    transmission of all packets, and without rescheduling high priority packets
    down to the next priority level.
    
    So we return NETDEV_TX_BUSY in this case and rely on the stack would
    take care of rescheduling... which it apparently does immediately and
    consumes the CPU. This caused the ksoftirqd kernel thread consuming almost
    all the CPU...
    
    To put the code back to the way it was before we made these changes we
    put the call netif_queue_stop back in ipw_tx_skb.  This effectively
    disables multiple priority based transmit queues for 802.11e, but given
    that its broken anyway...
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 48a847709f821b5eecd45ae7660add1869f9cd37 
tree d119ae07dbaf63a77362307cbb3fbebf6218636e 
parent 53d0bcf82a5f59c96f1ffb202c02d2541200bf58 
author Henrik Brix Andersen <brix@gentoo.org> Tue, 14 Feb 2006 09:09:52 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 15:08:02 -0500 

    [PATCH] ipw2200: print geography code upon module load
    
    Given the amount of support requests for the meaning of the geography code
    I've written a patch for printing this information on module load no matter
    the debug level.
    
    I've also added a section to the README.ipw2200 file listing the geography
    codes and their meaning.
    
    Signed-off-by: Henrik Brix Andersen <brix@gentoo.org>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 53d0bcf82a5f59c96f1ffb202c02d2541200bf58 
tree dd0920c3215300614b67c38ced9d3c919ac333ce 
parent 1867b117d944ce333e79b9a61c9a048656bee14b 
author Adrian Bunk <bunk@stusta.de> Sat, 04 Mar 2006 13:14:31 +0100 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 14:16:44 -0500 

    [PATCH] drivers/net/wireless/ipw2200.c: make ipw_qos_current_mode() static
    
    This patch makes the needlessly global function ipw_qos_current_mode()
    static.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 1867b117d944ce333e79b9a61c9a048656bee14b 
tree 068a78c91f1cf9f7b491afa08a1877e278cc3beb 
parent dd288e7d75b9041f79fecae77d61cfa345da7266 
author Larry Finger <Larry.Finger@lwfinger.net> Tue, 28 Feb 2006 09:48:28 -0600 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Mar 2006 14:01:34 -0500 

    [PATCH] Remove duplicated code from ipw2200.c
    
    As stated in a comment, the ipw2200 driver uses several routines that
    were borrowed from ieee80211_geo.c. As ipw2200 requires ieee80211,
    these routines are duplicated. The attached patch, which is sent
    as an attachment to preserve whitespace, converts ipw2200.c to use
    the ieee80211 versions, thereby reducing bloat in both the source
    and binary.
    
    Signed-Off-By: Larry Finger <Larry.Finger@lwfinger.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit abc71c46dc0a12ab7fddc18cfe4f4aa26808c79b 
tree b0c846052b994d57d58713a0cc8da30a22baaf1c 
parent 30dcbf29cc6d92d70fa262e79e84011fe6913bed 
parent 232a347a444e687b5f8cf0f6485704db1c6024d3 
author Jeff Garzik <jeff@garzik.org> Thu, 16 Mar 2006 19:27:08 -0500 
committer Jeff Garzik <jeff@garzik.org> Thu, 16 Mar 2006 19:27:08 -0500 

    Merge branch 'upstream-fixes'

commit dd288e7d75b9041f79fecae77d61cfa345da7266 
tree 85ff1d1ea0fe1d6eae0b6819422d5c6c05f862cd 
parent 30dcbf29cc6d92d70fa262e79e84011fe6913bed 
parent 72df16f109b73be37977a26d342e9103e8851cb6 
author John W. Linville <linville@tuxdriver.com> Wed, 15 Mar 2006 17:02:08 -0500 
committer John W. Linville <linville@tuxdriver.com> Wed, 15 Mar 2006 17:02:08 -0500 

    Merge branch 'upstream-fixes'

commit c5111f504d2a9b0d258d7c4752b4093523315989 
tree 6a52864aff79691689aea21cb0cb928327d5de5b 
parent 69eb66d7da7dba2696281981347698e1693c2340 
parent a488edc914aa1d766a4e2c982b5ae03d5657ec1b 
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 14 Mar 2006 17:05:45 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 14 Mar 2006 17:05:45 -0600 

    Merge with /home/shaggy/git/linus-clean/

commit 30dcbf29cc6d92d70fa262e79e84011fe6913bed 
tree 2b356350d2dea45b498e2c0c6e9718b364594752 
parent ded78e5e2cab0ec470cca7d34d7af742371bd476 
author Adrian Bunk <bunk@stusta.de> Sat, 11 Mar 2006 17:51:39 -0800 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 21:49:49 -0500 

    [PATCH] drivers/net/e1000/: proper prototypes
    
    This patch moves prototypes of global variables and functions to a header
    file.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Acked-by: John Ronciak <john.ronciak@gmail.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit ded78e5e2cab0ec470cca7d34d7af742371bd476 
tree d44724d779143d7ea52a1ed56beda2eaa0d0dffa 
parent a4d4d5181d043ea835c15da6c85a5bbecbaded6e 
author Adrian Bunk <bunk@stusta.de> Fri, 10 Mar 2006 00:06:53 +0100 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 20:32:17 -0500 

    [PATCH] chelsio/espi.c:tricn_init(): remove dead code
    
    The Coverity checker spotted these two unused variables.
    
    Please check whether this patch is correct or whether they should be
    used.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit a4d4d5181d043ea835c15da6c85a5bbecbaded6e 
tree dcc0093113b8ae06eaa85e5e1b23fde22a34cb60 
parent 60a89ff6d2681029b3d46b5d23dccf2903a254b4 
author Ralf Baechle <ralf@linux-mips.org> Wed, 08 Mar 2006 11:49:31 +0000 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 20:32:17 -0500 

    [PATCH] Sparse: Cleanup sgiseeq sparse warnings.
    
    o Make sgiseeq_dump_rings static.
    o Delete unused sgiseeq_my_reset.
    o Move DEBUG define to beginning where it's easier to spot and will be
    seen by <linux/kernel.h> as well.
    o Use NULL for pointer initialization.
    
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 60a89ff6d2681029b3d46b5d23dccf2903a254b4 
tree e7146ca3f86ac15107af37c5bd17e6cb987933ee 
parent 827700866ad0996e8c0f5ce75d1c01ae9b034cd6 
author Pekka Enberg <penberg@cs.helsinki.fi> Wed, 08 Mar 2006 00:06:28 -0800 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 20:32:17 -0500 

    [PATCH] 3c509: use proper suspend/resume API
    
    Convert 3c509 driver to use proper suspend/resume API instead of the
    deprecated pm_register/pm_unregister.
    
    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 827700866ad0996e8c0f5ce75d1c01ae9b034cd6 
tree 56566ea225cd7e4fb40938d58c7b6fe2e85c88d9 
parent 000b238bca0bb6f4bb053fd69f7f02cebdace5cf 
author Adrian Bunk <bunk@stusta.de> Wed, 08 Mar 2006 00:06:30 -0800 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 20:32:17 -0500 

    [PATCH] CONFIG_FORCEDETH updates
    
    This patch contains the following possible updates:
    - let FORCEDETH no longer depend on EXPERIMENTAL
    - remove the "Reverse Engineered" from the option text:
    for the user it's important which hardware the driver supports, not
    how it was developed
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 000b238bca0bb6f4bb053fd69f7f02cebdace5cf 
tree 7698904204eccf3df4f25f61cdfb8657b362e09f 
parent b962697b79a147aeaca6864f2d6c424bd462b446 
parent 535744878e34d01a53f946f26dfbca37186f2cf8 
author Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 19:58:42 -0500 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 19:58:42 -0500 

    Merge branch 'master'

commit b962697b79a147aeaca6864f2d6c424bd462b446 
tree e89136f041a068c793e2d8d23721255a61901f10 
parent 749dfc70554f2c9e6624ac843d66571265ed9338 
parent cb764326dff0ee51aca0d450e1a292de65661055 
author Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 13:35:49 -0500 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 13:35:49 -0500 

    Merge branch 'e1000-upstream' of git://198.78.49.142/linux-2.6

commit 749dfc70554f2c9e6624ac843d66571265ed9338 
tree bf591255b3f158222f90852d53c4279e6e7e9ced 
parent 74f5ec29ae93aa42c49f4285c20c457afe937881 
parent 0992a5d029181421877a716eaf99145828ff7eae 
author Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 13:35:31 -0500 
committer Jeff Garzik <jeff@garzik.org> Sat, 11 Mar 2006 13:35:31 -0500 

    Merge branch 'upstream-fixes'

commit 69eb66d7da7dba2696281981347698e1693c2340 
tree ba699dc7a1a80efe159f4a4401b174a7e80779fc 
parent be0bf7da19135a7a0f8c275f20c819940be218d9 
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Mar 2006 13:59:30 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Mar 2006 13:59:30 -0600 

    JFS: add uid, gid, and umask mount options
    
    OS/2 doesn't initialize the uid, gid, or unix-style permission bits.  The
    uid, gid, & umask mount options perform pretty much like those for the fat
    file system, overriding what is stored on disk.  This is useful for users
    sharing the file system with OS/2.
    
    I implemented a little feature so that if you mask the execute bit, it
    will be re-enabled on directories when the appropriate read bit is unmasked.
    I didn't want to implement an fmask & dmask option.
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit cb764326dff0ee51aca0d450e1a292de65661055 
tree 4cabea34727903fa8560abfeae325936a9039c7e 
parent 74f5ec29ae93aa42c49f4285c20c457afe937881 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Wed, 08 Mar 2006 17:24:12 -0800 
committer root <root@jk-desktop.jf.intel.com> Wed, 08 Mar 2006 17:24:12 -0800 

    e1000: Fix mii-tool access to setting speed and duplex
    
    Paul Rolland reported that e1000 was having a hard time using mii-tool to set speed and duplex.  This patch fixes the issue on both newer hardware as well as fixing the code issue that originally caused the problem.
    
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    

commit be0bf7da19135a7a0f8c275f20c819940be218d9 
tree c8ba72b711730ce11f52fc20cd7c0e9c4bee7bc0 
parent 5b3030e39049212c975665cdb3eeabcfaf7c94ca 
author Dave Kleikamp <shaggy@austin.ibm.com> Wed, 08 Mar 2006 10:59:15 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 08 Mar 2006 10:59:15 -0600 

    JFS: Take logsync lock before testing mp->lsn
    
    This fixes a race where lsn could be cleared before taking the lock
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit 74f5ec29ae93aa42c49f4285c20c457afe937881 
tree 2f9fe3e3f7bcd91769b0030cead82e1986e0dd32 
parent ad8c48ad3bbef078616ed4d2652d362dfd962f09 
parent 2d66806d740eeb410aa785bd7fba3bd24bb082c1 
author Jeff Garzik <jeff@garzik.org> Mon, 06 Mar 2006 14:38:16 -0500 
committer Jeff Garzik <jeff@garzik.org> Mon, 06 Mar 2006 14:38:16 -0500 

    Merge branch 'upstream-fixes'

commit ad8c48ad3bbef078616ed4d2652d362dfd962f09 
tree e400f39c22cf68621be51042a860cf402c3a9bd5 
parent e72fd96e8ee3ff4dd80757172a4fe49bd92fea9c 
author Catalin(ux aka Dino) BOIE <util@deuroconsult.ro> Sat, 04 Mar 2006 12:18:59 -0500 
committer Jeff Garzik <jeff@garzik.org> Sat, 04 Mar 2006 12:18:59 -0500 

    Fix io ordering problems in e100
    
    Checking e100.c code against Documentation/io_ordering.txt I found the
    following problem:
    
    spin_lock_irq...
    write
    spin-unlock
    e100_write_flush
    
    The attached patch fix the code like this:
    
    spin_lock_irq...
    write
    e100_write_flush
    spin-unlock
    
    Signed-off-by: Catalin BOIE <catab@umbrella.ro>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit e72fd96e8ee3ff4dd80757172a4fe49bd92fea9c 
tree 2b544e905888845f7115c3302156119ac627d340 
parent b27a16b7c4738ea16f6f0730caf382a3f57317bb 
author Mark Brown <broonie@sirena.org.uk> Thu, 02 Feb 2006 00:00:02 +0000 
committer Jeff Garzik <jeff@garzik.org> Sat, 04 Mar 2006 12:14:56 -0500 

    [PATCH] natsemi: NAPI and a bugfix
    
    As documented in National application note 1287 the RX state machine on
    the natsemi chip can lock up under some conditions (mostly related to
    heavy load).  When this happens a series of bogus packets are reported
    by the chip including some oversized frames prior to the final lockup.
    
    This patch implements the fix from the application note: when an
    oversized packet is reported it resets the RX state machine, dropping
    any currently pending packets.
    
    Signed-off-by: Mark Brown <broonie@sirena.org.uk>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit b27a16b7c4738ea16f6f0730caf382a3f57317bb 
tree e4e881b1b0e17d3c592073d0e8aa59c0dd2d6e61 
parent fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac 
author Mark Brown <broonie@sirena.org.uk> Thu, 02 Feb 2006 00:00:01 +0000 
committer Jeff Garzik <jeff@garzik.org> Sat, 04 Mar 2006 12:14:56 -0500 

    [PATCH] natsemi: NAPI and a bugfix
    
    This patch converts the natsemi driver to use NAPI.  It was originally
    based on one written by Harald Welte, though it has since been modified
    quite a bit, most extensively in order to remove the ability to disable
    NAPI since none of the other drivers seem to provide that functionality
    any more.
    
    Signed-off-by: Mark Brown <broonie@sirena.org.uk>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit fb15b9dd8b3f44290a7b3b06fdfd4be2ad73f0ac 
tree cab2d85fb0ebfa33ee20e5738e11f58c0b1e16cd 
parent c3cf560e35509634d72cf809074834d5ea23ab66 
parent a7a80d5ad3735554338199b9d976dfda5c10d3c7 
author Jeff Garzik <jeff@garzik.org> Sat, 04 Mar 2006 12:07:07 -0500 
committer Jeff Garzik <jeff@garzik.org> Sat, 04 Mar 2006 12:07:07 -0500 

    Merge branch 'upstream-fixes'

commit c3cf560e35509634d72cf809074834d5ea23ab66 
tree 47724fb236094bbd27479edb23f95ff3a85043c9 
parent 46153552b43675dd4057cd526331b5bd10f39c7d 
author Adrian Bunk <bunk@stusta.de> Sat, 04 Mar 2006 17:07:57 +0100 
committer Jeff Garzik <jeff@garzik.org> Sat, 04 Mar 2006 12:03:31 -0500 

    [PATCH] remove obsolete sis900 documentation
    
    This documentation is mostly obsolete, and should therefore either be
    updated or removed (this patch does the latter).
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 46153552b43675dd4057cd526331b5bd10f39c7d 
tree 62b6055ee61e320dc10ea81903abbe2e7553bf4e 
parent f90fdc3cce3d8c8ed09615dc68cb789655078803 
parent f71e130966ba429dbd24be08ddbcdf263df9a5ad 
author Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 22:22:45 -0500 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 22:22:45 -0500 

    Merge branch 'net-const'

commit f71e130966ba429dbd24be08ddbcdf263df9a5ad 
tree 523f10c926012f520c47894811b94944a7793fd5 
parent c499ec24c31edf270e777a868ffd0daddcfe7ebd 
author Arjan van de Ven <arjan@infradead.org> Fri, 03 Mar 2006 21:33:57 -0500 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 21:33:57 -0500 

    Massive net driver const-ification.

commit f90fdc3cce3d8c8ed09615dc68cb789655078803 
tree 116371105890850b3c302eb6728b02675914efb7 
parent c96a34ec3bad5ba37ee4da4a188ad534b2fa4321 
author Ralf Baechle <ralf@linux-mips.org> Wed, 08 Feb 2006 23:23:26 +0000 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 21:23:02 -0500 

    [PATCH] sb1250-mac: Add support for the BCM1480
    
    This adds support for the 4th port and other new features of the
    BCM1480 SOC.
    
    Signed-Off-By: Andy Isaacson <adi@broadcom.com>
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit c96a34ec3bad5ba37ee4da4a188ad534b2fa4321 
tree d2c46023c7a8dfbb72db255d378a6ebdfac2477b 
parent 8f903c708fcc2b579ebf16542bf6109bad593a1d 
author Komuro <komurojun-mbn@nifty.com> Fri, 03 Mar 2006 21:21:13 -0500 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 21:21:13 -0500 

    pcnet_cs: add new id (Logitec LPM-LN100TE)

commit 8f903c708fcc2b579ebf16542bf6109bad593a1d 
tree 8fb890c05d962c2dd63f8dbc960efbd0b09802d2 
parent ebe19a4ed78d4a11a7e01cdeda25f91b7f2fcb5a 
author Jay Vosburgh <fubar@us.ibm.com> Tue, 21 Feb 2006 16:36:44 -0800 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 20:58:00 -0500 

    [PATCH] bonding: suppress duplicate packets
    
    Originally submitted by Kenzo Iwami; his original description is:
    
    The current bonding driver receives duplicate packets when broadcast/
    multicast packets are sent by other devices or packets are flooded by the
    switch. In this patch, new flags are added in priv_flags of net_device
    structure to let the bonding driver discard duplicate packets in
    dev.c:skb_bond().
    
    Modified by Jay Vosburgh to change a define name, update some
    comments, rearrange the new skb_bond() for clarity, clear all bonding
    priv_flags on slave release, and update the driver version.
    
    Signed-off-by: Kenzo Iwami <k-iwami@cj.jp.nec.com>
    Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit ebe19a4ed78d4a11a7e01cdeda25f91b7f2fcb5a 
tree cbc3ab8819704fbeb97a2a89445f57972d430fd2 
parent f78fb4743dc06719084239c29dc178ad38ad2e2f 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:06:20 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:37 -0500 

    [PATCH] mv643xx_eth: Remove BIT0-BIT31 #defines
    
    Now that the BIT0-BIT31 defines are no longer used by mv643xx_eth.c,
    remove them from mv643xx_eth.h.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit f78fb4743dc06719084239c29dc178ad38ad2e2f 
tree 62ebf8cc6a8de144c21a0b5cd2a3318a0e2445c2 
parent 468d09f8946d40228c56de26fe4874b2f98067ed 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:05:26 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:37 -0500 

    [PATCH] mv643xx_eth: Remove non-working feature: task level rx queue refill
    
    The task level rx queue refill feature hasn't ever worked
    (at least in 2.6) and is of dubious value.  Remove it.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 468d09f8946d40228c56de26fe4874b2f98067ed 
tree 4f5641ffdf6782f71fbd1645908e3ba4e50aff33 
parent 7303fde88a149c4cee54dae7e46d1895fa7214b4 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:04:39 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:37 -0500 

    [PATCH] mv643xx_eth: Clean up interrupt handling
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 7303fde88a149c4cee54dae7e46d1895fa7214b4 
tree 394af13d130346d095c0830a48e3e421decf6b86 
parent ff561eef9fb37c7180085e08418acfc009a9ada7 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:03:36 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Move #defines of constants to mv643xx_eth.h
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit ff561eef9fb37c7180085e08418acfc009a9ada7 
tree 97010ae360fdb25238698ad811c22f6d901e1fde 
parent c8aaea25e0b069e9572caa74f984e109899c1765 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:02:51 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Refactor/clean up tx queue handling
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit c8aaea25e0b069e9572caa74f984e109899c1765 
tree c0569ce4abd5c0b23ffbf44a4ee78dda8b6244cb 
parent cd6478c8aed9b2001dfff067fa66b7492a0a2ffa 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:02:05 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Refactor tx command queuing code
    
    Simplify and remove redundant code for filling transmit descriptors.
    No changes in features; it's just a code reorganization/cleanup.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit cd6478c8aed9b2001dfff067fa66b7492a0a2ffa 
tree 497dcf9c0f014655b51ec25ebcf596f9a4df0682 
parent 12a87c644ab1862232d0916656ff2ee42f3fb873 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:01:08 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Select CONFIG_MII on CONFIG_MV643XX_ETH
    
    >From : Dale Farnsworth <dale@farnsworth.org>
    
    Recent patches for the mv643xx_eth driver now use the MII interface
    library.  Select MII so it gets built when that driver is selected.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 12a87c644ab1862232d0916656ff2ee42f3fb873 
tree e46179ede6e839bf6c80d4daba5c04aa536eddc8 
parent e38fd1a055cf4038c423bd841859b01aeb07d1b0 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 10:00:22 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Rename "channels" to "queues"
    
    Use better terminology for HW queues.  No functional changes.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit e38fd1a055cf4038c423bd841859b01aeb07d1b0 
tree 5349f6114cfb86f7b9bc6b57ec1f1b2ca39e01e3 
parent d5f9558a7778d3f7dc3c9e0d5cbe7318710532f8 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 09:59:28 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Fix misplaced parenthesis in mv643xx_eth_port_disable_rx
    
    This bug could result in a system hang.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit d5f9558a7778d3f7dc3c9e0d5cbe7318710532f8 
tree f134b6b492b0d4bb6442f7402e9697def25f272a 
parent 0f15a8fae8b8558f5a9b0fec770846c487c779f6 
author Dale Farnsworth <dale@farnsworth.org> Fri, 03 Mar 2006 09:58:29 -0700 
committer Jeff Garzik <jeff@garzik.org> Fri, 03 Mar 2006 12:12:36 -0500 

    [PATCH] mv643xx_eth: Remove duplicate includes of linux/in.h and linux/ip.h
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 0f15a8fae8b8558f5a9b0fec770846c487c779f6 
tree cacee876371cfbcb33e8e5a5410359f4d21b67ef 
parent 30320be88fb9cae888eacf1f1eaae95a03720128 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:46:29 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:46:29 -0800 

    e1000: Added driver comments and whitespace changes.  Modified long lines of code to ensure they would not wrap beyond 80 characters.
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 30320be88fb9cae888eacf1f1eaae95a03720128 
tree 359ba46e6c3d17d1a6fc11b97eea2ad1bc71cca7 
parent dc7c6add3493cdc71475a006b7afc3732e55abd8 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:21:57 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:21:57 -0800 

    e1000: Added a performance enhancement - prefetch
    
    - this implementation of prefetch was tested on new and old hardware
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit dc7c6add3493cdc71475a006b7afc3732e55abd8 
tree 28e1c24d37dddd300a0c912414e7e2484dc6b2b9 
parent 8704163987882f8b989e8143ad1f87c6b7229a13 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:21:40 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:21:40 -0800 

    e1000: Add copybreak when using packet split
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 8704163987882f8b989e8143ad1f87c6b7229a13 
tree 24e16b012722402cedba6f9fbc10dcda4a5eef20 
parent 6418ecc68e1d9416451b6f78ebb2c0b077e0abf2 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:21:24 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:21:24 -0800 

    e1000: Fixed the following issues with ESB2 (requires ESB2 support):
    
    - Add restriction for ESB2 to MTU size <=9216
    - Removed FIFO errors which were not being used
    - Fixed issues with loopback
    - Power management change for saving state and config space
    - WA to disable recieves and reset device on link loss.  Reset needed to be done outside the interrupt context - modified existing tx_timeout_task
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 6418ecc68e1d9416451b6f78ebb2c0b077e0abf2 
tree 4fa4a491d559b388e7461192455bd0ebbca5d2b5 
parent 2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:21:10 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:21:10 -0800 

    e1000: Add support for new hardware (ESB2)
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 2a1af5d7dfd809b16fb69f3f0fc073d9b6b7c6ac 
tree aae8f3f32de4d0ca3f9bdc1dfea0d67d416a705f 
parent 85b22eb632dc75887ba99edad49307a02c2ae7ec 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:20:43 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:20:43 -0800 

    e1000: Add performance enahancement by balancing TX and RX
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 85b22eb632dc75887ba99edad49307a02c2ae7ec 
tree 07fca1fa18db61f6b3024ff2db290a6111356900 
parent 9f68788856b134f93d9d10b19aa902924c61fc02 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:20:29 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:20:29 -0800 

    e1000: Add enabled Jumbo frame support for 82573L
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 9f68788856b134f93d9d10b19aa902924c61fc02 
tree 84607dc7136b5e003f31ccab24ff9cdffb1510a5 
parent 329bfd0b6d5ffec00b787f1d0e68eef63d8b1d56 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:20:17 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:20:17 -0800 

    e1000: Add 82573 controller support to TSO fix
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 329bfd0b6d5ffec00b787f1d0e68eef63d8b1d56 
tree 1aff4ad4e26ca01c6203869a5477850e7c1c23a2 
parent 7e6c9861bbc2fcd2438da910c006781784968a7c 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:20:02 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:20:02 -0800 

    e1000: Fix filling skb descriptors while using packet split
    
    -  Simplified by calling skb_fill_page_desc(), which is more efficient.
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 7e6c9861bbc2fcd2438da910c006781784968a7c 
tree 42737b91df1aec190e0c930cc1e9d426316e8b29 
parent 8491682986e04fe7b258e5ba1d22f9a0ea2d803e 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:19:30 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:19:30 -0800 

    e1000: Fix network problems when forced at 100Mb/s and to fix TSO when forced at 100Mb/s
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 8491682986e04fe7b258e5ba1d22f9a0ea2d803e 
tree dac61abf2c1e8e859e5434783f557576226449f3 
parent 8df06e504e999ff729f1b2a2e573d96bf3690dbc 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:18:48 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:18:48 -0800 

    e1000: Fix Quadport Wake on LAN
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 8df06e504e999ff729f1b2a2e573d96bf3690dbc 
tree 4087b617fe36c969577739d27fa99955362d093c 
parent 497fce5e72a21f45929a786bf416ac03cbe09e2f 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:18:32 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:18:32 -0800 

    e1000: Fix RSS if enabled in mid-connection
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 497fce5e72a21f45929a786bf416ac03cbe09e2f 
tree 42bd95fd55ab01df751151f967c89e99bc19c7a4 
parent 20a44028f06030a71a1250ad8efb0a7fb556c3ea 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:18:20 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:18:20 -0800 

    e1000: Fix 82543 issue when reading eeprom
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 20a44028f06030a71a1250ad8efb0a7fb556c3ea 
tree 3e8bb3e77b4e0453a24aad97f3f6c3700ea6fd48 
parent c5f226fe97e8025440aa330aa2c8e1c66bfdc96b 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:18:08 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:18:08 -0800 

    e1000: Fix dhcp issue when the skb structure fields are not filled properly
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit c5f226fe97e8025440aa330aa2c8e1c66bfdc96b 
tree da2a45df3a52529dec850bea57e1ec7f8bbf9b38 
parent 5b66ba0db8d04d99926445bc7d9f920bb5d744ed 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:17:55 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:17:55 -0800 

    e1000: Fix AMT losing connectivity when switching VLAN in passive mode
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 5b66ba0db8d04d99926445bc7d9f920bb5d744ed 
tree acd86e028fd3856f354c703c909d1457fa60b6db 
parent 0989aa431636ffb347314f0e2f367fdd16d7a57f 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:17:30 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:17:30 -0800 

    e1000: Fix unecessary delay for 82573 controllers
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 0989aa431636ffb347314f0e2f367fdd16d7a57f 
tree b5890adc27313a97abe920fdfabf3f8e32b4bc7f 
parent 9f644d518f35903ecaff062d6e9e4f7080d80cfb 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:17:16 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:17:16 -0800 

    e1000: Fix lock up while setting ring parameters
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 9f644d518f35903ecaff062d6e9e4f7080d80cfb 
tree 10d7df285871ff51266f45350a2b0a3de21a5931 
parent c1605eb37aa658b810a5a7080412d656ddce2f76 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:16:59 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:16:59 -0800 

    e1000: Fix dead counters
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit c1605eb37aa658b810a5a7080412d656ddce2f76 
tree c91f8a06afd19cf67cba40f687d4f662f79d8055 
parent 2ade43618b0aee83a50b344171d33d85c73d01b1 
author Jeff Kirsher <jeffrey.t.kirsher@intel.com> Thu, 02 Mar 2006 18:16:38 -0800 
committer root <root@jk-desktop.jf.intel.com> Thu, 02 Mar 2006 18:16:38 -0800 

    e1000: Remove Multiqueue code until we have support for MSI-X in our hardware
    
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: John Ronciak <john.ronciak@intel.com>

commit 2ade43618b0aee83a50b344171d33d85c73d01b1 
tree 0a49fe46159a6ef66098a4f37935412f4f226f4c 
parent 75e47b36004d136edff68295420424cba3a5ccd0 
parent 79dc190147f8a87718fe72928d5ceb58e09acdb9 
author Jeff Garzik <jeff@garzik.org> Thu, 02 Mar 2006 14:26:30 -0500 
committer Jeff Garzik <jeff@garzik.org> Thu, 02 Mar 2006 14:26:30 -0500 

    Merge branch 'lro'

commit 75e47b36004d136edff68295420424cba3a5ccd0 
tree 363c2bc1f8b5185b37f05106fec4ba2a07134182 
parent 68727fed5469100bec0764207d7efb7a9ecdee29 
parent 07981aa43f6aec32b875f360755ed3d14f9d5139 
author Jeff Garzik <jeff@garzik.org> Wed, 01 Mar 2006 01:59:15 -0500 
committer Jeff Garzik <jeff@garzik.org> Wed, 01 Mar 2006 01:59:15 -0500 

    Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 68727fed5469100bec0764207d7efb7a9ecdee29 
tree 7afb58ab7665b90122d3b4505be5c6c9f8bade4b 
parent dbfedbb98145375106cee7ec7269611d553819dc 
parent b5b9d6647c1cd5eee90b58941c55f874c2a7e707 
author Jeff Garzik <jeff@garzik.org> Wed, 01 Mar 2006 01:58:38 -0500 
committer Jeff Garzik <jeff@garzik.org> Wed, 01 Mar 2006 01:58:38 -0500 

    Merge branch 'upstream-fixes'

commit 07981aa43f6aec32b875f360755ed3d14f9d5139 
tree 21baf289bc23882f058e7ed90f80c76d01408119 
parent a23f460dd0c7c9c58b03494c7819e126b2c72383 
author Pete Zaitcev <zaitcev@redhat.com> Sun, 26 Feb 2006 16:29:51 -0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:14:58 -0500 

    [PATCH] ieee80211_geo.c: remove frivolous BUG_ON's
    
    I have come to consider BUG_ON generally harmful. The idea of an assert is
    to prevent a program to execute past a point where its state is known
    erroneous, thus preventing it from dealing more damage to the data
    (or hiding the traces of malfunction). The problem is, in kernel this harm
    has to be balanced against the harm of forced reboot.
    
    The last straw was our softmac tree, where "iwlist eth1 scan" causes
    a lockup. It is absolutely frivolus and provides no advantages a normal
    assert has to provide. In fact, doing this impedes debugging.
    
    Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a23f460dd0c7c9c58b03494c7819e126b2c72383 
tree a3570122d5475eefc46c6550c97042d96eceb2a6 
parent acfaf10be5c19f7dceb9d7372039dc45af66b100 
author Dan Williams <dcbw@redhat.com> Mon, 27 Feb 2006 16:28:36 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:14:58 -0500 

    [PATCH] wireless/airo: Remove 'Setting transmit key' info messages
    
    These messages end up polluting logs when things like NetworkManager or
    wpa_supplicant are controlling the driver.  They aren't really that
    useful, and no other drivers output messages like this when the user
    fiddles with encryption keys.  Users can use iwconfig and other
    wireless-tools methods to determine and change the current transmit key
    if they wish to do so manually.  Therefore, remove the messages.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit acfaf10be5c19f7dceb9d7372039dc45af66b100 
tree 75dce83cc4495a13056fde1c2166323e07373858 
parent c45ae87ec9d03c9adfc466a6b560cb38b154813a 
parent 4832843d773462643cc471ca715382f5e509afb3 
author John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:13:10 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:13:10 -0500 

    Merge branch 'upstream-fixes'

commit c45ae87ec9d03c9adfc466a6b560cb38b154813a 
tree 1fb252ca1a9e8db03f4c557017d1d6a7039f4733 
parent 9f5a405b6843933c1cae5826046a5dd6357f142a 
parent 09e4f9029da1b53e835555c353a89c36b71233b0 
author John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:12:42 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:12:42 -0500 

    Merge branch 'from-jgarzik-upstream'

commit 9f5a405b6843933c1cae5826046a5dd6357f142a 
tree bcdbb0175d37b780551b71c40abcde964a8905eb 
parent b7cffb028abbffff3ba0b87268ecb775ed354049 
parent 051d3cbd96909b2fe6b5038e7bbe77f41356db05 
author John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:12:23 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 20:12:23 -0500 

    Merge branch 'from-linus'

commit 09e4f9029da1b53e835555c353a89c36b71233b0 
tree 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc 
parent 750b50ab5687125d8a1dc946d931b00acf016e2c 
parent dbfedbb98145375106cee7ec7269611d553819dc 
author John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 19:35:48 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 27 Feb 2006 19:35:48 -0500 

    Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit dbfedbb98145375106cee7ec7269611d553819dc 
tree 81d2a6de51b1bb3c704e5385dbc90ca79efa69bc 
parent 7b0386921db20add25afd8678ed34a9253e512fc 
parent e95a9ec1bb66e07b138861c743192f06e7b3e4de 
author Jeff Garzik <jeff@garzik.org> Mon, 27 Feb 2006 11:33:51 -0500 
committer Jeff Garzik <jeff@garzik.org> Mon, 27 Feb 2006 11:33:51 -0500 

    Merge branch 'master'

commit 7b0386921db20add25afd8678ed34a9253e512fc 
tree 8c6b888b76211e38e6c1c3006553dc4b2b24c75e 
parent c5580a7ecb859c6821dd761c95fa150ec7695ae1 
parent 22fe472cb430ce45c4fb9b6d13060dd724d6dbc8 
author Jeff Garzik <jeff@garzik.org> Thu, 23 Feb 2006 21:16:27 -0500 
committer Jeff Garzik <jeff@garzik.org> Thu, 23 Feb 2006 21:16:27 -0500 

    Merge branch 'upstream-fixes'

commit 5b3030e39049212c975665cdb3eeabcfaf7c94ca 
tree 93742231c2e01087ae36d7c05d8bd7bdb7ca8878 
parent d9e902668e815f9f33ba5056089684b0704eeac6 
author Eric Sesterhenn <snakebyte@gmx.de> Thu, 23 Feb 2006 09:47:13 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 23 Feb 2006 09:47:13 -0600 

    JFS: kzalloc conversion
    
    this converts fs/jfs to kzalloc() usage.
    compile tested with make allyesconfig
    
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit d9e902668e815f9f33ba5056089684b0704eeac6 
tree a2efed26b40b36f38e155955d661f776759a42dc 
parent 91dbb4deb30e817efc8d6bed89b1190a489ca776 
author Herbert Poetzl <herbert@13thfloor.at> Wed, 22 Feb 2006 14:14:58 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 22 Feb 2006 14:14:58 -0600 

    JFS: Add missing file from fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6
    
    My mistake here.  I failed to checkin fs/jfs/ioctl.c
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit c5580a7ecb859c6821dd761c95fa150ec7695ae1 
tree 18ca034a53c22e12912e55f5858d1b4a235cedd7 
parent b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb 
parent d33a73c81241e3d9ab8da2d0558429bdd5b4ef9a 
author Jeff Garzik <jgarzik@pobox.com> Mon, 20 Feb 2006 05:59:59 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Mon, 20 Feb 2006 05:59:59 -0500 

    Merge branch 'forcedeth'

commit d33a73c81241e3d9ab8da2d0558429bdd5b4ef9a 
tree 7e8054ebf23f4924f6bf5b5f678bfb2e5e6965dd 
parent 0832b25a75d128e4f9724156380ba071c4f3f20d 
author Ayaz Abdulla <aabdulla@nvidia.com> Sat, 04 Feb 2006 13:13:31 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Mon, 20 Feb 2006 05:59:18 -0500 

    [PATCH] forcedeth: Add support for MSI/MSIX
    
    This forcedeth patch adds support for MSI/MSIX interrupts.
    
    Signed-off-By: Ayaz Abdulla <aabdulla@nvidia.com>
    
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 0832b25a75d128e4f9724156380ba071c4f3f20d 
tree f24926c80383da38da6071dc97263c4089bc3f78 
parent ee407b02f3f1992bc746876c26f8175c8783562b 
author Ayaz Abdulla <aabdulla@nvidia.com> Sat, 04 Feb 2006 13:13:26 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Mon, 20 Feb 2006 05:59:18 -0500 

    [PATCH] forcedeth: Add support for 64bit rings
    
    This forcedeth patch adds high dma support for tx/rx rings.
    
    Signed-off-By: Ayaz Abdulla <aabdulla@nvidia.com>
    
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit ee407b02f3f1992bc746876c26f8175c8783562b 
tree a005421bd26f8ca0178d4e9a3a7a79486a45f9de 
parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 
author Ayaz Abdulla <aabdulla@nvidia.com> Sat, 04 Feb 2006 13:13:17 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Mon, 20 Feb 2006 05:59:18 -0500 

    [PATCH] forcedeth: Add vlan support
    
    This forcedeth patch adds support for vlan stripping/inserting in hardware.
    
    Signed-off-By: Ayaz Abdulla <aabdulla@nvidia.com>
    
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb 
tree f190980d5bffae81a67c0cea0d913ed2444ceb0c 
parent 70c07e02625ec46d0ffbfce1acef42d660803528 
parent f5e2a7b22e7d7dfda8794906d0fddeaaa09bb944 
author Jeff Garzik <jgarzik@pobox.com> Fri, 17 Feb 2006 16:20:30 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 17 Feb 2006 16:20:30 -0500 

    Merge branch 'upstream-fixes'

commit b7cffb028abbffff3ba0b87268ecb775ed354049 
tree e5a4dd1cca31bf38c2a57214ab3d2a9ae1c5e367 
parent 22d8846e5ce329436628da71a4239ccc2745869f 
author Johannes Berg <johannes@sipsolutions.net> Wed, 04 Jan 2006 20:58:10 +0100 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 10:41:34 -0500 

    [PATCH] ieee80211: fix sparse warning about missing "static"
    
    This patch adds a missing "static" on a variable (sparse complaint)
    
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 22d8846e5ce329436628da71a4239ccc2745869f 
tree 623c307aaf08150a39a480241711fb0ec2e99416 
parent 1ba61e05e254a587b7a6be9484a8bcd973551be1 
author Dan Williams <dcbw@redhat.com> Sun, 05 Feb 2006 18:00:30 -0500 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:17:00 -0500 

    [PATCH] wireless/airo: fix setting TX key index plus key in ENCODEEXT
    
    The previous patch that added ENCODEEXT and AUTH support to the airo
    driver contained a slight error which would cause setting the TX
    key index ignore a valid key-set request at the same time.  This patch
    allows any combination of setting the TX key index and setting an
    encryption key.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 1ba61e05e254a587b7a6be9484a8bcd973551be1 
tree 41a56d4c60478b598e30984c81188e50afab0c0f 
parent 47c51431fcc5fce3108e8e549cc9d243acd462ed 
author Zhu Yi <yi.zhu@intel.com> Wed, 15 Feb 2006 13:00:55 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:17:00 -0500 

    [PATCH] ipw2200: Fix software crypto shared WEP authentication problem
    
    We didn't set the WEP key to hardware when we are using software based
    crypto. Hardware needs the key to do WEP authentication even for
    software based encryption.
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 47c51431fcc5fce3108e8e549cc9d243acd462ed 
tree fd42b296eb25a9d78e42eac0a97bbe4212852c21 
parent 23afaec4441baf0579fa115b626242d4d23704dd 
author Jon Mason <jdmason@us.ibm.com> Sun, 12 Feb 2006 11:53:04 -0600 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:16:59 -0500 

    [PATCH] trivial: fix spelling errors in Kconfigs
    
    This patch corrects a few spelling and grammar errors found in
    drivers/net
    
    Signed-off-by: Jon Mason <jdmason@us.ibm.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 23afaec4441baf0579fa115b626242d4d23704dd 
tree 5a9ddf4e13fc686108f7b21aef02c1b9eec924ce 
parent 471680828330e6b2aac295cf7ac9d8e5820df2eb 
author Stefan Rompf <stefan@loplof.de> Tue, 07 Feb 2006 03:42:23 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:16:59 -0500 

    [PATCH] ipw2200: Fix WPA network selection problem
    
    Do not avoid APs with wpa_ie or rsn_ie if !ieee->wpa_enabled
    There are broken APs out there that fill these elements even
    though encryption is disnabled. Also, this breaks legit WEP to
    WPA migration scenarious.
    
    We add a checking to prohibite WPA configured STA trying to
    associate with non-WPA supported APs.
    
    Signed-off-by: Stefan Rompf <stefan@loplof.de>
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 471680828330e6b2aac295cf7ac9d8e5820df2eb 
tree b205c8371e8be20413ac85c71294a1e1b87e0819 
parent 2c0f63166a5998102ddc7697706af83cbff49317 
author Zhu Yi <yi.zhu@intel.com> Mon, 13 Feb 2006 13:37:03 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:16:59 -0500 

    [PATCH] ieee80211: Use IWEVGENIE to set WPA IE
    
    It replaces returning WPA/RSN IEs as custom events with returning them
    as IWEVGENIE events. I have tested that it returns proper information
    with both Xsupplicant, and the latest development version of the Linux
    wireless tools.
    
    Signed-off-by: Chris Hessing <Chris.Hessing@utah.edu>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 2c0f63166a5998102ddc7697706af83cbff49317 
tree 9c7eaf909d84972d2976c7019847a24f391d21e3 
parent 4861dd79c1724f37e36d66cc4b3454803aec3f93 
author Andreas Happe <andreashappe@snikt.net> Thu, 05 Jan 2006 19:40:07 +0100 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:16:59 -0500 

    [PATCH] ipw2200: add monitor and qos entries to Kconfig
    
    I have made a stupid copy&paste error: QoS option is named IPW_QOS not
    IPW2200_MONITOR. Spotted by Daniel Paschka, thanks.
    
    Add the following config entries for the ipw2200 driver to
    drivers/net/wireless/Kconfig
    * IPW2200_MONITOR
    enables Monitor mode
    * IPW_QOS
    enables QoS feature - this is under development right now, so it depends
    upon EXPERIMENTAL
    
    Signed-off-by: Andreas Happe <andreashappe@snikt.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4861dd79c1724f37e36d66cc4b3454803aec3f93 
tree 46efc932a35ff49c8b3b723b650ec0b1832706d8 
parent 4ddc1651cee0143eeddbe043ccd66bb87072e279 
author Dan Williams <dcbw@redhat.com> Sun, 05 Feb 2006 17:57:36 -0500 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:16:59 -0500 

    [PATCH] wireless/atmel: convert constants to ieee80211 layer equivalents
    
    This patch converts the Atmel driver-only IEEE 802.11 constants to their
    equivalents from the kernel's ieee80211 layer headers.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4ddc1651cee0143eeddbe043ccd66bb87072e279 
tree 64ff6788ea331044234c00d6fb16a8ef7eba9d57 
parent 5b69e69d4e6386bcb6592c75af897e5e79641602 
author Jan Niehusmann <jan@gondor.com> Sun, 05 Feb 2006 16:13:22 +0100 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:16:59 -0500 

    [PATCH] let IPW2{1,2}00 select IEEE80211
    
    This patch makes the IPW2100 and IPW2200 options available in
    the configuration menu even if IEEE80211 has not been selected before.
    This behaviour is more intuitive for people which are not familiar with
    the driver internals.
    The suggestion for this change was made by Alejandro Bonilla Beeche.
    
    Signed-off-by: Jan Niehusmann <jan@gondor.com>
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 5b69e69d4e6386bcb6592c75af897e5e79641602 
tree bf9a153ad062629454ba877df224112a6bb5581b 
parent 750b50ab5687125d8a1dc946d931b00acf016e2c 
parent 7345137930907ba747781636c60112f7c2789aa8 
author John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:15:58 -0500 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:15:58 -0500 

    Merge branch 'upstream-fixes'

commit 750b50ab5687125d8a1dc946d931b00acf016e2c 
tree eacec989ec38e67da84fcc6842b364670d7a1e34 
parent ab479995b191b4256183956c13caabb86331af8e 
parent 70c07e02625ec46d0ffbfce1acef42d660803528 
author John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:15:41 -0500 
committer John W. Linville <linville@tuxdriver.com> Fri, 17 Feb 2006 08:15:41 -0500 

    Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit 91dbb4deb30e817efc8d6bed89b1190a489ca776 
tree d3742a35be49da1ab785ac398459d7a71a64a765 
parent 4837c672fd4d43c519d6b53308ee68d45b91b872 
author Christoph Hellwig <hch@lst.de> Wed, 15 Feb 2006 12:49:04 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Wed, 15 Feb 2006 12:49:04 -0600 

    JFS: Use the kthread_ API
    
    Use the kthread_ API instead of opencoding lots of hairy code for kernel
    thread creation and teardown.
    
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit 4837c672fd4d43c519d6b53308ee68d45b91b872 
tree 6aea45f6de8a7320be022ccf5e4c98ddfcf3ea33 
parent fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6 
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 10 Feb 2006 08:11:53 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 10 Feb 2006 08:11:53 -0600 

    JFS: Fix regression.  fsck complains if symlinks do not have INLINEEA attribute
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit 70c07e02625ec46d0ffbfce1acef42d660803528 
tree f500f1a4f93e72747fb08b0eefabb167dcdc5db9 
parent 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 
parent 2746b8623abce815aaae7afc946b1b39f8436f5a 
author Jeff Garzik <jgarzik@pobox.com> Thu, 09 Feb 2006 14:17:05 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Thu, 09 Feb 2006 14:17:05 -0500 

    Merge branch 'viro'

commit 2746b8623abce815aaae7afc946b1b39f8436f5a 
tree 9e14ce2a3710da5c079c1a96efa5e7c8674cd382 
parent 0bdd340c092b0936f78a54bdbd3927463ed4fca3 
parent 450d86dff3fc4780fd5c2d1654402ab7ffec9c38 
author Jeff Garzik <jgarzik@pobox.com> Thu, 09 Feb 2006 14:15:02 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Thu, 09 Feb 2006 14:15:02 -0500 

    Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird

commit fa3241d24cf1182b0ffb6e4d412c3bc2a2ab7bf6 
tree b39000f89c6699612d64d98fd5739ca7feba8d8f 
parent 1de87444f8f91009b726108c9a56600645ee8751 
author Herbert Poetzl <herbert@13thfloor.at> Thu, 09 Feb 2006 09:09:16 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 09 Feb 2006 09:09:16 -0600 

    JFS: ext2 inode attributes for jfs
    
    ext2 inode attributes with relevance for jfs:
    
    'a' 	EXT2_APPEND_FL       -> append only
    'i' 	EXT2_IMMUTABLE_FL    -> immutable file
    's' 	EXT2_SECRM_FL	     -> zero file
    'u' 	EXT2_UNRM_FL	     -> allow for unrm
    'A' 	EXT2_NOATIME_FL      -> no access time
    'D' 	EXT2_DIRSYNC_FL      -> dirsync
    'S' 	EXT2_SYNC_FL	     -> sync
    
    overview of jfs flags (partially for OS/2)
    
    value	   (OS/2)	Linux	ext2 attrs
    ------------------------------------------------
    0x00010000 IFJOURNAL	-
    0x00020000 ISPARSE  	used
    0x00040000 INLINEEA 	used
    0x00080000 -	    	-	JFS_NOATIME_FL
    
    0x00100000 -	    	-	JFS_DIRSYNC_FL
    0x00200000 -	    	-	JFS_SYNC_FL
    0x00400000 -	    	-	JFS_SECRM_FL
    0x00800000 ISWAPFILE	-	JFS_UNRM_FL
    
    0x01000000 -	    	-	JFS_APPEND_FL
    0x02000000 IREADONLY	-	JFS_IMMUTABLE_FL
    0x04000000 IHIDDEN  	-	-
    0x08000000 ISYSTEM  	-	-
    
    0x10000000 -	    	-
    0x20000000 IDIRECTORY	used
    0x40000000 IARCHIVE 	-
    0x80000000 INEWNAME 	-
    
    the implementation is straight forward, except
    for the fact that the attributes have to be mapped
    to match with the ext2 ones to avoid a separate
    tool for manipulating them (this could be avoided
    when using a separate flag field in the on-disk
    representation, but the overhead is minimal)
    
    a special jfs_ioctl is added to allow for the new
    JFS_IOC_GETFLAGS and JFS_IOC_SETFLAGS calls.
    
    a helper function jfs_set_inode_flags() to transfer
    the flags from the on-disk version to the inode
    
    minor changes to allow flag inheritance on inode
    creation, as well as a cleanup of the on-disk
    flags (including the new ones)
    
    beforementioned helper to map between ext2 and jfs
    versions of the new flags ...
    
    the JFS_SECRM_FL and JFS_UNRM_FL are not done yet
    and I'm not 100% sure they are worth the effort,
    the rest seems to work out of the box ...
    
    Signed-off-by: Herbert Poetzl <herbert@13thfloor.at>
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 
tree 63429c2222a55509dc81269233bbe7a321bb86ed 
parent 23a56e2cbec2860ef02d6720508fbcb07accc8b4 
parent ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 
author Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 15:16:27 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 15:16:27 -0500 

    Merge branch 'master'

commit 79dc190147f8a87718fe72928d5ceb58e09acdb9 
tree b15aa21ac0eab7e2bad971c6bdf07c36a85b6d57 
parent fe9313956d67367cc91c5a6989bafc4315801402 
author Andrew Morton <akpm@osdl.org> Fri, 03 Feb 2006 01:45:13 -0800 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 02:51:40 -0500 

    [PATCH] s2io c99 warning fix
    
    drivers/net/s2io.c: In function `verify_l3_l4_lro_capable':
    drivers/net/s2io.c:6638: warning: ISO C90 forbids mixed declarations and code
    
    Cc: Ravinandan Arakali <Ravinandan.Arakali@neterion.com>
    Cc: Ananda Raju <Ananda.Raju@neterion.com>
    Cc: Adrian Bunk <bunk@stusta.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit fe9313956d67367cc91c5a6989bafc4315801402 
tree c9bc140dcb92d8fa8a3afc6ce81e86d42882c289 
parent 7d3d0439f574a4857c97b3ad2e63b082b7382d7e 
author Andrew Morton <akpm@osdl.org> Fri, 03 Feb 2006 01:45:12 -0800 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 02:51:40 -0500 

    [PATCH] git-netdev-all: s2io fixes
    
    Fix this:
    
    drivers/built-in.o(.text+0x89469): In function `s2io_get_ethtool_stats':
    drivers/net/s2io.c:5209: undefined reference to `__udivdi3'
    
    Cc: Ravinandan Arakali <Ravinandan.Arakali@neterion.com>
    Cc: Ananda Raju <Ananda.Raju@neterion.com>
    Cc: Adrian Bunk <bunk@stusta.de>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 23a56e2cbec2860ef02d6720508fbcb07accc8b4 
tree a05a6b49944202b492ae492434a25f849e2616ba 
parent 6bd0e10e53cc4824cd8cdaab8c370e53ab2e23c2 
parent 3cfc15103aa56c2c7ee6dd312c24a8d1697bade1 
author Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 02:06:12 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 02:06:12 -0500 

    Merge branch 'upstream-fixes'

commit 6bd0e10e53cc4824cd8cdaab8c370e53ab2e23c2 
tree 239e89177a17a99d94bfdc799d62eb6d48b4f201 
parent 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb 
parent 0d615ec2bb1cb8c38087bb24f6d2876dec3a9751 
author Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 01:47:33 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 01:47:33 -0500 

    Merge branch 'sundance'

commit 3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb 
tree 7f8d84353852401ec74e005f6f0b1eb958b9a70d 
parent c0d3c0c0ce94d3db893577ae98e64414d92e49d8 
parent c03296a868ae7c91aa2d8b372184763b18f16d7a 
author Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 01:47:12 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 01:47:12 -0500 

    Merge branch 'master'

commit c0d3c0c0ce94d3db893577ae98e64414d92e49d8 
tree 0eb82bef20d8f02a0c4b207c4a543a5a49a83b17 
parent a03b1950521466e007288a25c9fc7ac7f05a97e5 
author Bunk <bunk@stusta.de> Tue, 07 Feb 2006 01:43:31 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 07 Feb 2006 01:43:31 -0500 

    [netdrvr] schedule eepro100 for removal

commit a03b1950521466e007288a25c9fc7ac7f05a97e5 
tree d1e9486b6e21bde1d80113ce9abe933e51364826 
parent 0b310f36d7d96e27f6941ec0f9b95e15142f1e78 
parent c6f0d75a2defe8c7d8bf9f78de891cedc46b4b3e 
author Jeff Garzik <jgarzik@pobox.com> Tue, 31 Jan 2006 11:52:21 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 31 Jan 2006 11:52:21 -0500 

    Merge branch 'upstream-fixes'

commit 0b310f36d7d96e27f6941ec0f9b95e15142f1e78 
tree c2a3d403c82fd892ded3849cc721cf8e6f8c7824 
parent 359b8800d3a46557844969c485e1a14baf119b06 
parent 2f633db5e9c57e07a971b65e9a72f090f59fd5f6 
author Jeff Garzik <jgarzik@pobox.com> Tue, 31 Jan 2006 11:50:55 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 31 Jan 2006 11:50:55 -0500 

    Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 359b8800d3a46557844969c485e1a14baf119b06 
tree 9e2015a5c1feddc17ba638b05b5fb3988bc79e27 
parent 4f975b32433df87b8ead3de9944e0a9f90d261fd 
parent 0febb720fe77153f54b68fe7a3d7114f4c6711d8 
author Jeff Garzik <jgarzik@pobox.com> Tue, 31 Jan 2006 11:50:25 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 31 Jan 2006 11:50:25 -0500 

    Merge branch 'upstream-fixes'

commit 2f633db5e9c57e07a971b65e9a72f090f59fd5f6 
tree 7349aedafbc9c52630e20beb5d7b8c31052cc037 
parent f1b50863aa6a96c61a57e3b3a5e76e67b38c5c3e 
author Larry Finger <Larry.Finger@lwfinger.net> Mon, 30 Jan 2006 23:25:10 -0600 
committer John W. Linville <linville@tuxdriver.com> Tue, 31 Jan 2006 10:35:46 -0500 

    [PATCH] Add two management functions to ieee80211_rx.c
    
    On my system, I get unhandled management functions corresponding
    to IEEE80211_STYPE_REASSOC_REQ and IEEE80211_STYPE_ASSOC_REQ. The
    attached patch adds the logic to pass these requests off to a user
    stack. The patches to implement these requests in softmac have already
    been sent to Johannes Berg.
    
    Signed-Off-By: Larry Finger <Larry.Finger@lwfinger.net>
    
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f1b50863aa6a96c61a57e3b3a5e76e67b38c5c3e 
tree 9582287de5d5c9cf42a120e4103e2c6b849a2992 
parent 4be757dd4c00ddabff2d6faf639466bb5d76bc79 
author Dan Williams <dcbw@redhat.com> Mon, 30 Jan 2006 13:58:56 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:35 -0500 

    [PATCH] wireless/ipw2200: support WE-18 WPA enc_capa
    
    This patch allows ipw2100 driver to advertise the WPA-related encryption
    options that it does really support.  It's necessary to work correctly
    with NetworkManager and other programs that actually check driver & card
    capabilities.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4be757dd4c00ddabff2d6faf639466bb5d76bc79 
tree 2b8d8bc23889da7c78db7592db2f791ef13bcf43 
parent dd5eeb461ea572f82d34e1f2c4b88037df5afedb 
author Dan Williams <dcbw@redhat.com> Mon, 30 Jan 2006 11:58:00 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:35 -0500 

    [PATCH] wireless/airo: add IWENCODEEXT and IWAUTH support
    
    This patch adds IWENCODEEXT and IWAUTH support to the airo driver for
    WEP and unencrypted operation.  No WPA though.  It allows the driver to
    operate more willingly with wpa_supplicant and NetworkManager.
    
    Signed-off-by: Dan Williams <dcbw@redhat.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit dd5eeb461ea572f82d34e1f2c4b88037df5afedb 
tree 5c6bcb9a6cb50d42c4bf17b41785622dfcc04314 
parent bde37d037715bef4a67d58d00fecbe4c71836cab 
author Larry Finger <Larry.Finger@lwfinger.net> Mon, 30 Jan 2006 13:12:50 +0100 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:35 -0500 

    [PATCH] ieee80211: common wx auth code
    
    This patch creates two functions ieee80211_wx_set_auth and
    ieee80211_wx_get_auth that can be used by drivers for the wireless
    extension handlers instead of writing their own, if the implementation
    should be software only.
    
    These patches enable using bcm43xx devices with WPA and this seems (as
    far as I can tell) to be the only difference between the stock ieee80211
    and softmac's ieee80211 left.
    
    Signed-Off-By: Johannes Berg <johannes@sipsolutions.net>
    
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit bde37d037715bef4a67d58d00fecbe4c71836cab 
tree 6bac64a4ad48c7a3315cd69f3805ceea0dfaed8d 
parent 4644151b7208bec9522cad928a7105e0fc04a2b2 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:38:08 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:35 -0500 

    [PATCH] ipw2200: Disable hwcrypto by default
    
    After looking at the mailing list (and experiencing permanent driver lockups
    while using hwcrypto=1) I think that disabling this option by default would
    be better than otherwise.
    
    Signed-off-by: Andreas Happe <andreashappe@snikt.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4644151b7208bec9522cad928a7105e0fc04a2b2 
tree 9771f6008d3a20b673a3203ae2aa0a7f2a3734bc 
parent 2638bc394195f27801d1c184c4358ce25599146b 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:59 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:35 -0500 

    [PATCH] ipw2200: Semaphore to mutexes conversion
    
    The conversion was generated via scripts, and the result was validated
    automatically via a script as well.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Cc: Ronald Bultje <rbultje@ronald.bitfreak.net>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Cc: Yi Zhu <yi.zhu@intel.com>
    Cc: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 2638bc394195f27801d1c184c4358ce25599146b 
tree 5524a41930056c9cd5a65f795f8901f8f25c579b 
parent 7c97eb3f1dd09548fe7167e684da4fc94580aceb 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:52 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:34 -0500 

    [PATCH] ipw2200: remove white space and better format the code
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 7c97eb3f1dd09548fe7167e684da4fc94580aceb 
tree 0b6b65afaf25846b6fa7d1a45ea9887f6f952587 
parent 4e22699fa264b88084210ceaa63747b8352bd517 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:47 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:34 -0500 

    [PATCH] ipw2200: increase ipw2200 driver version
    
    increase ipw2200 driver version to git-1.0.10
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4e22699fa264b88084210ceaa63747b8352bd517 
tree f70b393f51d8c627cd45aeba09345f75b61f7ee6 
parent 0a7bcf261ea584c87a9cee4523023fa74168de4a 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:36 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:34 -0500 

    [PATCH] ipw2200: Fix qos_cmd param switch bug
    
    The patch fixes a couple of errors regarding QoS, which results in
    compile warnings and malfunction of the driver.
    
    Signed-off-by: Henrik Brix Andersen <brix@gentoo.org>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 0a7bcf261ea584c87a9cee4523023fa74168de4a 
tree f5ccb4cf6b3e376bbb16a1a0cb12b700b58ba928 
parent 397ae121ee0116d3b4125d621f0ef528d1d52580 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:28 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:34 -0500 

    [PATCH] ipw2200: stack reduction
    
    Checking the stack usage of my kernel, showed that ipw2200 had a few bad
    offenders. This is on i386 32-bit:
    
    0x00002876 ipw_send_associate:                          544
    0x000028ee ipw_send_associate:                          544
    0x000027dc ipw_send_scan_request_ext:                   520
    0x00002864 ipw_set_sensitivity:                         520
    0x00005eac ipw_set_rsn_capa:                            520
    
    The reason is the host_cmd structure is large (500 bytes). All other
    functions currently using ipw_send_cmd() suffer from the same problem.
    This patch introduces ipw_send_cmd_simple() for commands with no data
    transfer, and ipw_send_cmd_pdu() for commands with a data payload and
    makes the payload a pointer to the buffer passed in from the caller.
    
    As an added bonus, the diffstat looks like this:
    
    ipw2200.c |  260 +++++++++++++++++++++-----------------------------------------
    ipw2200.h |    2
    2 files changed, 92 insertions(+), 170 deletions(-)
    
    and it shrinks the module a lot as well:
    
    Before:
    
    text    data     bss     dec     hex filename
    75177    2472      44   77693   12f7d drivers/net/wireless/ipw2200.ko
    
    After:
    
    text    data     bss     dec     hex filename
    61363    2488      44   63895    f997 drivers/net/wireless/ipw2200.ko
    
    So about a ~18% reduction in module size.
    
    Signed-off-by: Jens Axboe <axboe@suse.de>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 397ae121ee0116d3b4125d621f0ef528d1d52580 
tree b4de052ca78d6c8b4c05494a4a297aac9e88190e 
parent 4bfdb91dcff0dd4b70922de263ccffffb8fb1d16 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:22 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:34 -0500 

    [PATCH] ipw2200: Scale firmware loading watchdog with the firmware size
    
    I can't really help with why restarts happen, but the following patch
    greatly increases the likelihood that a firmware reload will succeed
    afterward on my thinkpad. It addresses two issues. First, sysfs module
    loading and hotplug are asynchronous, and as such file operations on the
    "loading" and "data" files are racy when you load 2 firmwares in quick
    succession. Second, the timeout for DMAing the firmware needs to scale
    with the size of the firmware being loaded. That is, the watchdog needs
    to be on throughput, not on time alone.
    
    I no longer get the firmware load errors, though this is at best a hacky
    workaround for a racy interface. (Obviously, this does nothing to address
    the fatal errors in firmware which cause reloads; it just causes the
    initial loading and the reloads to work more often.)
    
    Signed-off-by: Peter Jones <pjones@redhat.com>
    Signed-off-by: Ben M Cahill <ben.m.cahill@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 4bfdb91dcff0dd4b70922de263ccffffb8fb1d16 
tree 6755f4f008dbe8880b128cab6ebd9ae8b13ddc22 
parent ede6111cae6a83fbb0b6b621b4333d1a3983c089 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:16 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:33 -0500 

    [PATCH] ipw2200: add module parameter to enable/disable roaming
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit ede6111cae6a83fbb0b6b621b4333d1a3983c089 
tree e1471e6b1b95d1a3fe468f02dc60fe9afacd459b 
parent c7b6a6744c3eb878e08ef992d57cd01eed457810 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:10 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:33 -0500 

    [PATCH] ipw2200: Make LED blinking frequency independent of HZ
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>.
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit c7b6a6744c3eb878e08ef992d57cd01eed457810 
tree cf3b78c439b0c84f114702be7275280664a5ca9a 
parent 810dabd466fe70869b66ab64dd326b6153cef645 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:37:05 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:33 -0500 

    [PATCH] ipw2200: use jiffies_to_msec() wherever possible
    
    This substitutes Linux jiffies_to_msec() wherever there is a
    computation for determining milliseconds from jiffies,
    following lead from ieee80211 code. And it does a little cleanup.
    "it's" == "it is" ... "its" == possessive "it". Indulge me. ;-)
    
    Signed-off-by: Cahill, Ben M <ben.m.cahill@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 810dabd466fe70869b66ab64dd326b6153cef645 
tree ca919a3a3b819b6bb46cc9d072b58f8b698b1070 
parent 3e234b4e5768b4f783fc45f20be8c6515b875f17 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:36:59 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:33 -0500 

    [PATCH] ipw2200: Bluetooth coexistence support
    
    I've added a new module param "bt_coexist" which defaults to OFF.
    
    This does not seem to fix the firmware restarts, but it does do "the
    right thing" and disables something that we were enabling by default:
    signaling the Bluetooth h/w which channel we're on (whether or not the
    BT h/w was out there).
    
    Signed-off-by: Ben M Cahill <ben.m.cahill@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3e234b4e5768b4f783fc45f20be8c6515b875f17 
tree f4c52593b5a7bb92dcdb966066c8d73b99209b4e 
parent f516dbcd7df76d468be98c343bc22e86ab7207fc 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:36:52 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:33 -0500 

    [PATCH] ipw2200: Add LEAP authentication algorithm support
    
    Signed-off-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit f516dbcd7df76d468be98c343bc22e86ab7207fc 
tree e13557dad21e95ff192d5df6036d36f3425b64e1 
parent c8fe6679086a983c4c95a441f3246c7aaecab80a 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:36:44 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:32 -0500 

    [PATCH] ipw2200: Mask out the WEP_KEY command dump from debug log for security reason
    
    Signed-off-by: Nick Kralevich <nick.ipw2200@kralevich.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit c8fe6679086a983c4c95a441f3246c7aaecab80a 
tree e218762630b2d321e4d970417835b70949fe8c65 
parent 71aa122d8a510b79338e28e2d56326574642d000 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:36:36 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:32 -0500 

    [PATCH] ipw2200: Fix indirect SRAM/register 8/16-bit write routines
    
    The indirect SRAM/register 8/16-bit write routines are broken for
    non-dword-aligned destination addresses.
    
    Fortunately, these routines are, so far, not used for non-dword-aligned
    destinations, but here's a patch that fixes them, anyway.
    
    The attached patch also adds comments for all direct/indirect I/O routine
    variations.
    
    Signed-off-by: Ben M Cahill <ben.m.cahill@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 71aa122d8a510b79338e28e2d56326574642d000 
tree 5f15ae085d4e1ef654ac8c409b0a13f6a0320e60 
parent 8ed55a482e2f044bfb044295ee86ecd5744c9911 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 16:08:55 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:32 -0500 

    [PATCH] increase ipw2100 driver version to git-1.1.4
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 8ed55a482e2f044bfb044295ee86ecd5744c9911 
tree bcb5e3d219dc51d4aa2de069ec29bd983a44d22e 
parent be6b3b15b511aededd89d1ebbc7b25d0edd1ccd3 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 13:49:20 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:32 -0500 

    [PATCH] ipw2100: remove white space and better format the code
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit be6b3b15b511aededd89d1ebbc7b25d0edd1ccd3 
tree fcc97e33b4f4735bad76eb77a2e4e92ac171677f 
parent 3173ca0b76879be1fb7af826ae4ce7ee733159ce 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 13:49:08 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:32 -0500 

    [PATCH] ipw2100: Add generic geo information
    
    This patch fixes a BUG_ON for the latest ieee80211 change.
    
    Signed-off-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3173ca0b76879be1fb7af826ae4ce7ee733159ce 
tree fedfdd8e491e6a4496ee9dc78d55b3851aca1ae8 
parent cbbdd03fadeddd02efec05ccfd4e6870ed913762 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 13:49:01 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:31 -0500 

    [PATCH] ipw2100: Make iwconfig txpower setting consistent with user input
    
    Signed-off-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit cbbdd03fadeddd02efec05ccfd4e6870ed913762 
tree 7624f3cf850dda8fbb1f9f5a7e0d2108cdac1384 
parent 9eafe76b8a5e1420cd6105bc11830914d90bddb4 
author Zhu Yi <yi.zhu@intel.com> Tue, 24 Jan 2006 13:48:53 +0800 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:31 -0500 

    [PATCH] ipw2100: Add LEAP authentication algorithm support
    
    Signed-off-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 9eafe76b8a5e1420cd6105bc11830914d90bddb4 
tree ccee0929ee13ebd46d92811688b08d3f355b21e4 
parent a73e22b286bd162d10526521b34f2d6f37aac635 
author Denis Vlasenko <vda@ilport.com.ua> Sun, 22 Jan 2006 13:57:10 +0200 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:31 -0500 

    [PATCH] ieee80211: trivial fix for misplaced ()'s
    
    Patch fixes misplaced (). Diffed against wireless-2.6.git
    
    Signed-off-by: Denis Vlasenko <vda@ilport.com.ua>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a73e22b286bd162d10526521b34f2d6f37aac635 
tree 728562af8aa42a145cf9b591382b044a31e94fb4 
parent 3c398b8612b210a159ec7ba5e5c3c341fb0d5eab 
author Adrian Bunk <bunk@stusta.de> Sat, 21 Jan 2006 01:39:42 +0100 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:31 -0500 

    [PATCH] drivers/net/wireless/ipw2200: possible cleanups
    
    This patch contains the following possible cleanups:
    - make needlessly global functions static
    - "extern inline" -> "static inline"
    - #if 0 the unused global function ipw_led_activity_on()
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 3c398b8612b210a159ec7ba5e5c3c341fb0d5eab 
tree b026cc1cd7c7323a2cf16db76dfef5cdc65fbeea 
parent a39d3e796cd2df8576c0418faa2c3833153bb3a9 
author Adrian Bunk <bunk@stusta.de> Sat, 21 Jan 2006 01:36:36 +0100 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:31 -0500 

    [PATCH] drivers/net/wireless/ipw2100.c: make ipw2100_wpa_assoc_frame() static
    
    This patch makes the needlessly global ipw2100_wpa_assoc_frame() static.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit a39d3e796cd2df8576c0418faa2c3833153bb3a9 
tree 6427f50efb949d7cd9a96a39183d643ccf111768 
parent d86b5e0e6bf5980d3136ab4a855522143f2dcb5d 
author Adrian Bunk <bunk@stusta.de> Sat, 21 Jan 2006 01:35:15 +0100 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:30 -0500 

    [PATCH] AIRO{,_CS} <-> CRYPTO fixes
    
    CRYPTO is a helper variable, and to make it easier for users, it should
    therefore select'ed and not be listed in the dependencies.
    
    drivers/net/wireless/airo.c requires CONFIG_CRYPTO for compilations.
    
    Therefore, AIRO_CS also has to CRYPTO.
    
    Additionally, this patch removes the #ifdef's for the non-compiling
    CRYPTO=n case from drivers/net/wireless/airo.c.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d86b5e0e6bf5980d3136ab4a855522143f2dcb5d 
tree 8b63a48c3c063a5cdebeef29f05e698c7143bdf7 
parent 747af1e154545566d04f647f86fc3ae512439fab 
author Adrian Bunk <bunk@stusta.de> Sat, 21 Jan 2006 00:46:55 +0100 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 20:35:30 -0500 

    [PATCH] net/: fix the WIRELESS_EXT abuse
    
    This patch contains the following changes:
    - add a CONFIG_WIRELESS_EXT select'ed by NET_RADIO for conditional
    code
    - remove the now no longer required #ifdef CONFIG_NET_RADIO from some
    #include's
    
    Based on a patch by Jean Tourrilhes <jt@hpl.hp.com>.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 747af1e154545566d04f647f86fc3ae512439fab 
tree 78ac4b4440022d473b28f235df4e880d3b5adcbe 
parent d1b46b0fba8c1049135ee5d60910b04463dccc95 
parent ae7ec20582de0867abda66ad06d468ce12b231f2 
author John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 17:43:25 -0500 
committer John W. Linville <linville@tuxdriver.com> Mon, 30 Jan 2006 17:43:25 -0500 

    Merge branch 'upstream-fixes'

commit 450d86dff3fc4780fd5c2d1654402ab7ffec9c38 
tree 0f7314e205dac26aafa4ab0aaed8866aa84831a3 
parent 0018dfa48e171315ce7f0ea689e34b67af926e19 
author Al Viro <viro@zeniv.linux.org.uk> Thu, 22 Dec 2005 14:52:52 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:35 -0500 

    [PATCH] dead code removed in hp100
    
    for mode 2 (memory-mapped) we always set ->mem_ptr_virt; dead code removed.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 0018dfa48e171315ce7f0ea689e34b67af926e19 
tree 02d3671f79172ea5ff00c173f41620202a7cde36 
parent 3c13958620f08c8082a2694e51dec32592438388 
author Al Viro <viro@zeniv.linux.org.uk> Thu, 01 Dec 2005 06:53:59 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:31 -0500 

    [PATCH] wrong ifdefs in 82596.c
    
    ifdefs around variable declaration would better match those around its uses...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 3c13958620f08c8082a2694e51dec32592438388 
tree 8b14e1b6a4e7f7a884f4f558206d35dccd10c1ba 
parent 82729971e0f8ccf1f15567cc4f2c5389e0659eb2 
author Al Viro <viro@zeniv.linux.org.uk> Thu, 01 Dec 2005 06:44:55 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:28 -0500 

    [PATCH] bogus include of linux/irq.h in 7990.c
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 82729971e0f8ccf1f15567cc4f2c5389e0659eb2 
tree 1618283083d7b6b5c035e183b555aaa8a90f8480 
parent ded5ca1f3b9ffa464fe5d4744fd09bba753ff4b7 
author Al Viro <viro@zeniv.linux.org.uk> Tue, 06 Dec 2005 05:53:04 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:25 -0500 

    [PATCH] missing include of asm/irq.h in drivers/net
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit ded5ca1f3b9ffa464fe5d4744fd09bba753ff4b7 
tree 6755ae998e3b1710ed1d30643aff4582c1960a4b 
parent 976345cc0fb34d677233b5b22d4819dc7ac92ef1 
author Al Viro <viro@zeniv.linux.org.uk> Sun, 04 Dec 2005 02:28:40 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:22 -0500 

    [PATCH] macsonic.c: missed s/driver_unregister/platform_driver_unregister/
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 976345cc0fb34d677233b5b22d4819dc7ac92ef1 
tree 65d54cce8bb4ebe6c79f49eccf9c790b3ef9a9c7 
parent b43de2d8db7655d1c520bf6eac7071d8f6d0b864 
author Al Viro <viro@zeniv.linux.org.uk> Tue, 06 Dec 2005 06:02:45 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:19 -0500 

    [PATCH] appletalk/cops.h: missing const in struct ltfirmware
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit b43de2d8db7655d1c520bf6eac7071d8f6d0b864 
tree 72de2f56444a6a167fa61dff14946d1aa90b3bc8 
parent d0f6ecad39266f87913539c52dc624f75cc4b914 
author Al Viro <viro@zeniv.linux.org.uk> Thu, 01 Dec 2005 10:15:21 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:15 -0500 

    [PATCH] ibm_emac sparse annotations
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit d0f6ecad39266f87913539c52dc624f75cc4b914 
tree c2c674495d0d13241779ed6fbeeff16b4523e2e0 
parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 
author Al Viro <viro@zeniv.linux.org.uk> Fri, 02 Dec 2005 03:54:44 -0500 
committer Al Viro <viro@zeniv.linux.org.uk> Sat, 28 Jan 2006 21:42:11 -0500 

    [PATCH] arcnet probing cleanups and fixes
    
    make arcnet probing do request_mem_region() for all iomem it's going to
    access, clean the code up.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

commit 4f975b32433df87b8ead3de9944e0a9f90d261fd 
tree 85fc678ccca9eac622b9513919812d2602ea4da1 
parent 0cc349d130b34de3046fb3d0e31eaf6ff5540cad 
parent d1b46b0fba8c1049135ee5d60910b04463dccc95 
author Jeff Garzik <jgarzik@pobox.com> Sat, 28 Jan 2006 16:07:32 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Sat, 28 Jan 2006 16:07:32 -0500 

    Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

commit 0cc349d130b34de3046fb3d0e31eaf6ff5540cad 
tree b61bf80ec24a13a685f43341fe38855a625b1e2e 
parent 01999873a455fe9104e91820c72849e608239928 
parent b0b020d4783fbc4cc477e2ca678ac47c50d5bc3e 
author Jeff Garzik <jgarzik@pobox.com> Sat, 28 Jan 2006 16:06:45 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Sat, 28 Jan 2006 16:06:45 -0500 

    Merge branch 'upstream-fixes'

commit d1b46b0fba8c1049135ee5d60910b04463dccc95 
tree 1ec055eee19d523f5fdd7bbe696dc1f0c0dbd105 
parent 15f385982e3a4782fe8ed71a9a6beb64a2160c30 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:22:15 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:07 -0500 

    [PATCH] ieee80211: Add 802.11h information element parsing
    
    Added default handlers for various 802.11h DFS and TPC information
    elements.  Moved all information elements into single location (called
    from two places).  Added debug message with information on unparsed IEs
    if debug_level set.  Added code to reset network IBSS DFS information
    when appropriate.  Added code to invoke driver callback for 802.11h
    ACTION STYPE.  Changed a few printk's to IEEE80211_DEBUG_MGMT.
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 15f385982e3a4782fe8ed71a9a6beb64a2160c30 
tree d33236c0ed68d8a255c88e3e3279f876c67575c6 
parent b79e20b60997e427b701055a2c69fb0c1d507aa9 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:21:35 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:07 -0500 

    [PATCH] ieee80211: Add helpers for IBSS DFS handling
    
    To support IEEE 802.11h in IBSS, an ibss_dfs field is added to struct
    ieee80211_network. In IBSS, if one STA sends a beacon with DFS info
    (for radar detection), all the other STAs should receive and store
    this DFS.  All STAs should send the DFS as one of the information
    element in the beacon they are scheduled to send (if possible) in
    the future.
    
    Since the ibss_dfs has variable length, it must be allocated
    dynamically. ieee80211_network_reset() is added to clear the ibss_dfs
    field. ieee80211_network_free() is also updated to free the ibss_dfs
    field if it is not NULL.
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit b79e20b60997e427b701055a2c69fb0c1d507aa9 
tree 318bf28699ed6042c667f01c8017c3d9d73c9f7d 
parent 9184d9348a7a0e60d70d5f4c23de79fdbc72b9a3 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:21:27 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:07 -0500 

    [PATCH] ieee80211: Add 802.11h data type and structures
    
    Add 802.11h data types and structure definitions to ieee80211.h.
    
    Signed-off-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 9184d9348a7a0e60d70d5f4c23de79fdbc72b9a3 
tree e7211258e23f29de34c39866cfa0933e5d10d2f7 
parent 41a25c616b3140c388ff6009a1cb0b6b06a10f29 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:22:32 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:07 -0500 

    [PATCH] ieee80211: Add TKIP crypt->build_iv
    
    This patch adds ieee80211 TKIP build_iv() method to support hardwares
    that can do TKIP encryption but relies on ieee80211 layer to build
    the IV. It also changes the build_iv() interface to return the key
    if possible after the IV is built (this is required by TKIP).
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 41a25c616b3140c388ff6009a1cb0b6b06a10f29 
tree c5c7758ba0f98cf58e89731d830a4176381b49f1 
parent 8aa914b747b650fc1735f3a3171753ac15ed93ab 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:22:23 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:07 -0500 

    [PATCH] ieee80211: TIM information element parsing
    
    Added partial support of TIM information element parsing
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 8aa914b747b650fc1735f3a3171753ac15ed93ab 
tree 71bdea3b0d816345c3c1fe8bccaa7122788abc49 
parent 7bd64366044565d6861783613db191c8aaec691e 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:22:07 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:06 -0500 

    [PATCH] ieee80211: kmalloc+memset -> kzalloc cleanups
    
    kmalloc+memset -> kzalloc cleanups in ieee80211_crypt_tkip
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 7bd64366044565d6861783613db191c8aaec691e 
tree 2a75f5bda5df503c532e7c12f53b9be9bd47401e 
parent d128f6c176bff9c4929476e13132804321a6d5c5 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:21:54 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:06 -0500 

    [PATCH] ieee80211: Add spectrum management information
    
    Add spectrum management information and use stat.signal to provide
    signal level information.
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d128f6c176bff9c4929476e13132804321a6d5c5 
tree 6c48f08712a5a81501fea7c317faa9f517d70520 
parent 24056bec086aaa99923b21c0e1a0e993bb1c7e2a 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:21:45 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:06 -0500 

    [PATCH] ieee80211: add flags for all geo channels
    
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 24056bec086aaa99923b21c0e1a0e993bb1c7e2a 
tree f346787ae101c10185849c44bbbcd42d8d461a9a 
parent d65292375154085feb7217ed8fccc8edf163c6b2 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:21:09 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:06 -0500 

    [PATCH] ieee80211: Add LEAP authentication type
    
    Signed-off-by: Hong Liu <hong.liu@intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit d65292375154085feb7217ed8fccc8edf163c6b2 
tree 952ec92d86fd48285580d6bd7e9c4d0ad9d43209 
parent 44d7a8cfbdc1112fd80546591fd6f5c831ea0363 
author Zhu Yi <yi.zhu@intel.com> Thu, 19 Jan 2006 16:20:49 +0800 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:06 -0500 

    [PATCH] ieee80211: Log if netif_rx() drops the packet
    
    Log to wireless network stats if netif_rx() drops the packet.
    
    (also trailing whitespace and Lindent cleanups as part of patch-apply
    process)
    
    Signed-off-by: James Ketrenos <jketreno@linux.intel.com>
    Signed-off-by: Zhu Yi <yi.zhu@intel.com>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 44d7a8cfbdc1112fd80546591fd6f5c831ea0363 
tree 87e0b6360f041847e519cd25aaa2dbc4b48cbde0 
parent 4a99ac3a9ee7e1b90ebc3ddbb44db75eef5c41e6 
author Denis Vlasenko <vda@ilport.com.ua> Wed, 18 Jan 2006 12:02:33 +0200 
committer John W. Linville <linville@tuxdriver.com> Fri, 27 Jan 2006 17:08:06 -0500 

    [PATCH] WEP fields are incorrectly shown to be INSIDE snap in the doc
    
    >If encryption is enabled, each fragment payload size is reduced by enough space
    >to add the prefix and postfix (IV and ICV totalling 8 bytes in the case of WEP)
    >So if you have 1500 bytes of payload with ieee->fts set to 500 without
    >encryption it will take 3 frames.  With WEP it will take 4 frames as the
    >payload of each frame is reduced to 492 bytes.
    
    Text is correct, but in picture (IV,payload,ICV) sits inside SNAP.
    Patch corrects this.
    
    Signed-Off-By: Denis Vlasenko <vda@ilport.com.ua>
    Acked-By: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: John W. Linville <linville@tuxdriver.com>

commit 01999873a455fe9104e91820c72849e608239928 
tree 24695d2629535ed0ccfdaa26d028705bca0eaecf 
parent d0412d967032b9e147bcbacc9ff0c0342636cf2d 
author Dale Farnsworth <dale@farnsworth.org> Fri, 27 Jan 2006 01:18:01 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: Clean up platform_data configuration
    
    We shouldn't expose the hardware register contents in platform_data.
    The only things we allow the user to configure are autoneg, speed, and
    duplex.  Add specific platform_data fields for these values and remove
    the registers configs.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit d0412d967032b9e147bcbacc9ff0c0342636cf2d 
tree 1191be1a588161a4d4538536975379d0c8f61011 
parent c28a4f8947f1b08996502967e348dc88363749a7 
author James Chapman <jchapman@katalix.com> Fri, 27 Jan 2006 01:15:30 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: use MII library for ethtool functions
    
    Use the common ethtool support functions of the MII library.
    Add generic MII ioctl handler.
    Add PHY parameter speed/duplex/negotiation initialization and modification.
    
    Signed-off-by: James Chapman <jchapman@katalix.com>
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit c28a4f8947f1b08996502967e348dc88363749a7 
tree a0afa38353ebb02f2cef528d1b84e2e8e89443c2 
parent 9f8dd319459bb5ab9efcc1c345bed7895cc41768 
author James Chapman <jchapman@katalix.com> Fri, 27 Jan 2006 01:13:15 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: use MII library for PHY management
    
    Modify link up/down handling to use the functions from the MII
    library.  Note that I track link state using the MII PHY registers
    rather than the mv643xx chip's link state registers because I think
    it's cleaner to use the MII library code rather than writing local
    driver support code. It is also useful to make the actual MII
    registers available to the user with maskable kernel printk messages
    so the MII registers are being read anyway
    
    Signed-off-by: James Chapman <jchapman@katalix.com>
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 9f8dd319459bb5ab9efcc1c345bed7895cc41768 
tree 017ea7b2ca60f29110b8e43afbd6560737824489 
parent f98e36f1f7903a319f7f87f96490e88f691ea106 
author Dale Farnsworth <dale@farnsworth.org> Fri, 27 Jan 2006 01:10:47 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: Make port queue enable/disable code consistent
    
    Add and use the following functions:
    mv643xx_eth_port_enable_tx()
    mv643xx_eth_port_enable_rx()
    mv643xx_eth_port_disable_tx()
    mv643xx_eth_port_disable_rx()
    
    so that ports are enabled/disabled consistently.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit f98e36f1f7903a319f7f87f96490e88f691ea106 
tree cdad08d70b682bc36225a0a74cb5f49101bef6a3 
parent cf4086c7725dc251551243c28325d446d9b1bf06 
author Dale Farnsworth <dale@farnsworth.org> Fri, 27 Jan 2006 01:09:18 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: Rename mp->tx_ring_skbs to mp->tx_desc_count
    
    tx_ring_skbs is actually a count of tx descriptors currently in use.
    Since there may be multiple descriptors per skb, it is not the
    same as the number of skbs in the ring.
    
    Also change rx_ring_skbs to rx_desc_count to be consistent.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit cf4086c7725dc251551243c28325d446d9b1bf06 
tree 6773df749dd578e77855c5c82ee5de66d4c63dea 
parent ed9b5d457668392182659747a734b38e86820adb 
author Dale Farnsworth <dale@farnsworth.org> Fri, 27 Jan 2006 01:07:48 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: Merge unicast and multicast address filtering code
    
    Remove duplicated code by having unicast and multicast code use
    a common filter table function: eth_port_set_filter_table_entry().
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit ed9b5d457668392182659747a734b38e86820adb 
tree 0d3c6e28ef5b0d2392278ce8d6c0850b09e9e13f 
parent cfc88b07292076f960b6782a7fea770abdac4ce6 
author Dale Farnsworth <dale@farnsworth.org> Fri, 27 Jan 2006 01:06:38 -0700 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:11:16 -0500 

    [PATCH] mv643xx_eth: Remove needless mp->port_mac_addr
    
    mp->port_mac_addr is just a redundant copy of dev->dev_addr, so remove it.
    
    Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit cfc88b07292076f960b6782a7fea770abdac4ce6 
tree 97b034ecc70b3d37e774137789b8d18d7fb965d7 
parent cca4aa83c79bcd571b06c83c50ea63cb75f1c2bb 
parent 6651a5c3839517685c601e44979f19de8b6249c3 
author Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:09:39 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 11:09:39 -0500 

    Merge branch 'upstream-fixes'

commit 7d3d0439f574a4857c97b3ad2e63b082b7382d7e 
tree 320e1024829ee4939f9d66d5bcddcdb43258cbcb 
parent efd51b5c6798d103e3aa683464aebb2019b62119 
author Ravinandan Arakali <Ravinandan.Arakali@neterion.com> Wed, 25 Jan 2006 14:53:07 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 10:34:38 -0500 

    [PATCH] S2io: Large Receive Offload (LRO) feature(v2) for Neterion (s2io) 10GbE Xframe PCI-X and PCI-E NICs
    
    Hi,
    Below is a patch for the Large Receive Offload feature.
    Please review and let us know your comments.
    
    LRO algorithm was described in an OLS 2005 presentation, located at
    ftp.s2io.com
    user: linuxdocs
    password: HALdocs
    
    The same ftp site has Programming Manual for Xframe-I ASIC.
    LRO feature is supported on Neterion Xframe-I, Xframe-II and
    Xframe-Express 10GbE NICs.
    
    Brief description:
    The Large Receive Offload(LRO) feature is a stateless offload
    that is complementary to TSO feature but on the receive path.
    The idea is to combine and collapse(upto 64K maximum) in the
    driver, in-sequence TCP packets belonging to the same session.
    It is mainly designed to improve 1500 mtu receive performance,
    since Jumbo frame performance is already close to 10GbE line
    rate. Some performance numbers are attached below.
    
    Implementation details:
    1. Handle packet chains from multiple sessions(current default
    MAX_LRO_SESSSIONS=32).
    2. Examine each packet for eligiblity to aggregate. A packet is
    considered eligible if it meets all the below criteria.
    a. It is a TCP/IP packet and L2 type is not LLC or SNAP.
    b. The packet has no checksum errors(L3 and L4).
    c. There are no IP options. The only TCP option supported is timestamps.
    d. Search and locate the LRO object corresponding to this
    socket and ensure packet is in TCP sequence.
    e. It's not a special packet(SYN, FIN, RST, URG, PSH etc. flags are not set).
    f. TCP payload is non-zero(It's not a pure ACK).
    g. It's not an IP-fragmented packet.
    3. If a packet is found eligible, the LRO object is updated with
    information such as next sequence number expected, current length
    of aggregated packet and so on. If not eligible or max packets
    reached, update IP and TCP headers of first packet in the chain
    and pass it up to stack.
    4. The frag_list in skb structure is used to chain packets into one
    large packet.
    
    Kernel changes required: None
    
    Performance results:
    Main focus of the initial testing was on 1500 mtu receiver, since this
    is a bottleneck not covered by the existing stateless offloads.
    
    There are couple disclaimers about the performance results below:
    1. Your mileage will vary!!!! We initially concentrated on couple pci-x
    2.0 platforms that are powerful enough to push 10 GbE NIC and do not
    have bottlenecks other than cpu%;  testing on other platforms is still
    in progress. On some lower end systems we are seeing lower gains.
    
    2. Current LRO implementation is still (for the most part) software based,
    and therefore performance potential of the feature is far from being realized.
    Full hw implementation of LRO is expected in the next version of Xframe ASIC.
    
    Performance delta(with MTU=1500) going from LRO disabled to enabled:
    IBM 2-way Xeon (x366) : 3.5 to 7.1 Gbps
    2-way Opteron : 4.5 to 6.1 Gbps
    
    Signed-off-by: Ravinandan Arakali <ravinandan.arakali@neterion.com>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit cca4aa83c79bcd571b06c83c50ea63cb75f1c2bb 
tree ee355d11b62f5f22fcdcfae5f4d5b31629227dfb 
parent 7e0b58f32fb5e9c958078a6d722a7d0b230346a7 
author Eric Sesterhenn / snakebyte <snakebyte@gmx.de> Thu, 26 Jan 2006 22:02:49 +0100 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 10:33:16 -0500 

    [PATCH] BUG_ON() Conversion in net/tulip/winbond-840.c
    
    hi,
    
    this changes if() BUG(); constructs to BUG_ON() which is
    cleaner and can better optimized away
    
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 7e0b58f32fb5e9c958078a6d722a7d0b230346a7 
tree 7bc1545f382d267f1768526e50beb8ab934ac06c 
parent a707cd6e2d0a8c21dd8aeef8e4a0c0ccf8774fa9 
author Eric Sesterhenn / snakebyte <snakebyte@gmx.de> Thu, 26 Jan 2006 22:02:43 +0100 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 10:33:16 -0500 

    [PATCH] BUG_ON() Conversion in net/tulip/de2104x.c
    
    hi,
    
    this changes if() BUG(); constructs to BUG_ON() which is
    cleaner and can better optimized away
    
    One of the if()s contains a call to de_is_running(),
    which seems to be safe to replace, but someone with more
    knownledge of the code might want to verify this...
    
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit a707cd6e2d0a8c21dd8aeef8e4a0c0ccf8774fa9 
tree f28ad3ea7984cb8c69228a6665fbb57368017218 
parent 97309d1a0bbdcb0813ea08574b4473d8e5416012 
author Eric Sesterhenn / snakebyte <snakebyte@gmx.de> Thu, 26 Jan 2006 22:02:51 +0100 
committer Jeff Garzik <jgarzik@pobox.com> Fri, 27 Jan 2006 10:33:16 -0500 

    [PATCH] BUG_ON() Conversion in net/tulip/xircom_cb.c
    
    hi,
    
    this changes if() BUG(); constructs to BUG_ON() which is
    cleaner and can better optimized away
    
    Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 97309d1a0bbdcb0813ea08574b4473d8e5416012 
tree 0dcbcf5aa5146147e0ac1d0c4b73b868a67d333b 
parent b4ea75b649417606fd6b38710a2962ec9770e772 
parent efd51b5c6798d103e3aa683464aebb2019b62119 
author Jeff Garzik <jgarzik@pobox.com> Thu, 26 Jan 2006 22:19:57 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Thu, 26 Jan 2006 22:19:57 -0500 

    Merge branch 'upstream-fixes'

commit 0d615ec2bb1cb8c38087bb24f6d2876dec3a9751 
tree 6fd87eb05df5fd4f8a898680487f0955fd2bd39f 
parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 
author Arnaldo Carvalho de Melo <acme@mandriva.com> Thu, 26 Jan 2006 22:01:38 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Thu, 26 Jan 2006 22:01:38 -0500 

    sundance: Really read addr 0
    
    Make phy 0 actually be read, as it is not being right now as we have:
    
    int mii_status = mdio_read(dev, phy, MII_BMSR);
    int phyx = phy & 0x1f;
    
    When we should have instead:
    
    int phyx = phy & 0x1f;
    int mii_status = mdio_read(dev, phyx, MII_BMSR);
    
    so that when phy, in the end of the (phy = 1; phy <= 32...) loop gets
    to 32 phyx gets to 0, i.e. we were reading at 32, when the intended
    read was for 0.
    
    Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 1de87444f8f91009b726108c9a56600645ee8751 
tree 66f731a701a005be55337792bf873c182470141a 
parent 0a0fc0ddbe732779366ab6b1b879f62195e65967 
author Ingo Molnar <mingo@elte.hu> Tue, 24 Jan 2006 15:22:50 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 15:22:50 -0600 

    JFS: semaphore to mutex conversion.
    
    the conversion was generated via scripts, and the result was validated
    automatically via a script as well.
    
    build and boot tested.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit 0a0fc0ddbe732779366ab6b1b879f62195e65967 
tree 7b42490a676cf39ae0691b6859ecf7fd410f229b 
parent 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a 
parent 3ee68c4af3fd7228c1be63254b9f884614f9ebb2 
author Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 14:34:47 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 24 Jan 2006 14:34:47 -0600 

    Merge with /home/shaggy/git/linus-clean/

commit b4ea75b649417606fd6b38710a2962ec9770e772 
tree 217727bea3813e154dee942a3c835933de26acee 
parent 2baeaaa4dab6b43e35c7150d5350bfaff1284153 
parent 7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3 
author Jeff Garzik <jgarzik@pobox.com> Wed, 18 Jan 2006 16:20:16 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Wed, 18 Jan 2006 16:20:16 -0500 

    Merge branch 'upstream-fixes'

commit 2baeaaa4dab6b43e35c7150d5350bfaff1284153 
tree da95b3796b4c5199c330ff69f8c879b50a97551f 
parent ef6f63a4aafcf6c79ac371f3c78a96b76c0f0596 
parent 77783a78ded96a56e3a1a0c03bbe87c56896fe6e 
author Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:57:15 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:57:15 -0500 

    Merge branch 'upstream'

commit ef6f63a4aafcf6c79ac371f3c78a96b76c0f0596 
tree 710a1abcd4a3f65ada8a4526747e91b756e7c0b5 
parent 03a49eebcaa3486f4ac2c50db83aab996ce5ad9b 
parent 22d4d77183f0af8b3b643544a5ae64ec6105d88b 
author Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:29:28 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:29:28 -0500 

    Merge branch 'upstream'

commit 03a49eebcaa3486f4ac2c50db83aab996ce5ad9b 
tree a92d8a6b3806ec3416ca2b28c45174fca9c4833e 
parent d4fbeabbc9e68c80738fe59135d201c3ed5fe40f 
parent 26df54bffd90977fbc6fe8284f2beaed19fea44f 
author Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:19:20 -0500 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:19:20 -0500 

    Merge branch 'janitor'

commit d4fbeabbc9e68c80738fe59135d201c3ed5fe40f 
tree dc7a965013ec01a54b3e4b265ade1637e8df4a53 
parent 0547993820378ef8140b0470b604737bf1fa6c85 
author Stefan Rompf <stefan@loplof.de> Tue, 17 Jan 2006 22:52:51 +0100 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 19:19:12 -0500 

    [PATCH] starfire: Implement suspend/resume
    
    This patch implements suspend and resume methods for the starfire driver. It
    allows me to put my desktop PC with a starfire dual board into S4.
    
    Signed-Off-By: Stefan Rompf <stefan@loplof.de>
    
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 26df54bffd90977fbc6fe8284f2beaed19fea44f 
tree 008deacb21a6ef3769213e142255d31dce2a5ddd 
parent f03aa2d89ad600a1ed21a223f196776f217cfe00 
author Adrian Bunk <bunk@stusta.de> Sat, 14 Jan 2006 03:09:40 +0100 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 08:39:11 -0500 

    [PATCH] drivers/net/s2io.c: make code static
    
    This patch makes some needlessly global code static.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit f03aa2d89ad600a1ed21a223f196776f217cfe00 
tree c99eec8e63fbc952d5b7180b32fe1cbf5accb9ed 
parent ff5688ae1cedfb175b5ed0f319d03ad2e5ee005d 
author Adrian Bunk <bunk@stusta.de> Sat, 14 Jan 2006 03:10:22 +0100 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 08:38:12 -0500 

    [PATCH] drivers/net/arcnet/: possible cleanups
    
    This patch contains the following possible cleanups:
    - make needlessly global code static
    - arcnet.c: remove the unneeded EXPORT_SYMBOL(arc_proto_null)
    - arcnet.c: remove the unneeded EXPORT_SYMBOL(arcnet_dump_packet)
    
    To make Jeff happy, arcnet.c still prints
    arcnet: v3.93 BETA 2000/04/29 - by Avery Pennarun et al.
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit ff5688ae1cedfb175b5ed0f319d03ad2e5ee005d 
tree eca0d41b3eefc833238591e0100a8136f21269a7 
parent e03d72b99e4027504ada134bf1804d6ea792b206 
author Marcelo Feitoza Parisi <marcelo@feitoza.com.br> Mon, 09 Jan 2006 18:37:15 -0800 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 07:59:23 -0500 

    [PATCH] drivers/net/*: use time_after() and friends
    
    They deal with wrapping correctly and are nicer to read.  Also make
    jiffies-holding variables unsigned long.
    
    Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit e03d72b99e4027504ada134bf1804d6ea792b206 
tree a4c75707712af88ad0ac824e5a40b63488fa7530 
parent 2664b25051f7ab96b22b199aa2f5ef6a949a4296 
author Adrian Bunk <bunk@stusta.de> Mon, 09 Jan 2006 18:34:08 -0800 
committer Jeff Garzik <jgarzik@pobox.com> Tue, 17 Jan 2006 07:45:52 -0500 

    [PATCH] drivers/net/sk98lin/: possible cleanups
    
    This patch contains the following possible cleanups:
    - make needlessly global functions static
    - remove unused code
    
    Signed-off-by: Adrian Bunk <bunk@stusta.de>
    Cc: Stephen Hemminger <shemminger@osdl.org>
    Cc: Jeff Garzik <jgarzik@pobox.com>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

commit 4d5dbd0945d9e0833dd7964a3d6ee33157f7cc7a 
tree 139d47bcbfbbca350536be935961fece7477a7b6 
parent ca869912366f60cb5e0bdd09f65e80ee6816e73c 
author Arjan van de Ven <arjan@infradead.org> Tue, 29 Nov 2005 08:28:58 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Tue, 29 Nov 2005 08:28:58 -0600 

    JFS: make buddy table static
    
    Idea is to reduce false cacheline sharing and stuff
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

commit ca869912366f60cb5e0bdd09f65e80ee6816e73c 
tree a72913a29495ca078987c09fc0008f47e11b900b 
parent dd8a306ac0c918268bd2ae89da2dea627f6e352d 
parent 388f7ef720a982f49925e7b4e96f216f208f8c03 
author Dave Kleikamp <shaggy@austin.ibm.com> Fri, 11 Nov 2005 14:09:06 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Fri, 11 Nov 2005 14:09:06 -0600 

    Merge with /home/shaggy/git/linus-clean/

commit dd8a306ac0c918268bd2ae89da2dea627f6e352d 
tree e3f2c244505931d93b09f7d314014cf3832b0176 
parent 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 
author Dave Kleikamp <shaggy@austin.ibm.com> Thu, 10 Nov 2005 07:50:03 -0600 
committer Dave Kleikamp <shaggy@austin.ibm.com> Thu, 10 Nov 2005 07:50:03 -0600 

    JFS: Add back directory i_size calculations for legacy partitions
    
    Linux-formatted jfs partitions have a different idea about what i_size
    represents than partitions formatted on OS/2.  The i_size calculation is
    now based on the size of the directory index.  For legacy partitions, which
    have no directory index, the i_size is never being updated.
    
    This patch adds back the original i_size calculations for legacy partitions.
    
    Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>