9cbc1cb8cd
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
...
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
2009-06-15 03:02:23 -07:00
5b54814022
net: use symbolic values for ndo_start_xmit() return codes
...
Convert magic values 1 and -1 to NETDEV_TX_BUSY and NETDEV_TX_LOCKED respectively.
0 (NETDEV_TX_OK) is not changed to keep the noise down, except in very few cases
where its in direct proximity to one of the other values.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-06-13 01:18:50 -07:00
3ac49a1c99
trivial: fix ETIMEOUT -> ETIMEDOUT typos
...
fix ETIMEOUT -> ETIMEDOUT typos
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-06-12 18:01:50 +02:00
cea9677819
Staging: wlan-ng: convert to netdev_ops
...
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-17 11:06:25 -07:00
4e9bf410dc
staging: document that the wifi staging drivers a bit better
...
The Linux wireless developers don't want to hear anything about the
staging wireless drivers, for a wide range of miopic reasons.
The following patch, based on a patch from Johannes Berg, tries to
document this issue a bit better.
Cc: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:27 -07:00
2961f24f78
Staging: BUG to BUG_ON changes
...
Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:54:26 -07:00
cfde74517b
Staging: wlan-ng: block ioctls until card fully initialised
...
Add a mutex to block ioctls before the card is fully initialised and
only allow one ioctl at a time.
This stops udev trying to load the firmware before to card is fully up.
patch ported from wlan-ng-devel
Karl Relton <karllinuxtest.relton@ntlworld.com> spotted that this was
missing from the staging version,
http://lists.linux-wlan.com/pipermail/linux-wlan-devel/2009-February/003890.html
Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk>
Cc: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:24 -07:00
18c7f792be
Staging: wlan-ng: Replace local byteorder macros
...
Replace hfa384x2host_16(), hfa384x2host_32(), host2hfa384x_16()
and host2hfa384x_32() with standard byteorder macros.
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:24 -07:00
465e7417b1
Staging: wlan-ng: Remove the now empty wlan_compat.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
3897cd0c40
Staging: wlan-ng: Remove dead code from p80211netdev.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
7c98f71878
Staging: wlan-ng: Remove unnecessary checks for NULL before calling kfree()
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
e469ee7f56
Staging: wlan-ng: Remove more dead code from hfa384x_usb.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
d01f4677a8
Staging: wlan-ng: Remove dead code from prism2mib.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
450238eab0
Staging: wlan-ng: prism2mgmt.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
21dc0f8987
Staging: wlan-ng: hfa384x_usb.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:23 -07:00
b4b3f0da84
Staging: wlan-ng: p80211netdev.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
f342288244
Staging: wlan-ng: prism2sta.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
f4ee0f42a7
Staging: wlan-ng: prism2usb.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
ec7466f091
Staging: wlan-ng: prism2mib.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
bb12793243
Staging: wlan-ng: p80211mgmt.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
a32fb5f754
Staging: wlan-ng: p80211netdev.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
c27f880c34
Staging: wlan-ng: p80211msg.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
356925c713
Staging: wlan-ng: p80211types.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
82eaca7d9a
Staging: wlan-ng: p80211conv.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
c979aec791
Staging: wlan-ng: p80211conv.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
d6c82d9719
Staging: wlan-ng: p80211hdr.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
ea75ad7b8b
Staging: wlan-ng: p80211metastruct.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:22 -07:00
77ebd0471a
Staging: wlan-ng: p80211ioctl.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
90de180a29
Staging: wlan-ng: p80211meta.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
c7d4bd7d29
Staging: wlan-ng: p80211wext.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
e573aaa4fd
Staging: wlan-ng: hfa384x.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
2407486b83
Staging: wlan-ng: prism2mgmt.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
b1de9675ac
Staging: wlan-ng: p80211req.c: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
4793a5e2fd
Staging: wlan-ng: p80211req.h: Coding style cleanups
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
a7cf7bae32
Staging: wlan-ng: Replace WLAN_LOG_DEBUG() with printk(KERN_DEBUG
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
16910554f3
Staging: wlan-ng: Move wlan_mkprintstr() and wlan_hexchar() macros into prism2sta.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
96c5abd7f8
Staging: wlan-ng: Move netdevice_t typedef into p80211netdev.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
ea045ba020
Staging: wlan-ng: Remove WLAN_INCLUDE_DEBUG and some related, mostly unused
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
40a67411de
Staging: wlan-ng: Remove more dead/unused code from hfa384x.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:21 -07:00
acb7e24208
Staging: wlan-ng: Remove dead/unused code from hfa384x.h and p80211metamsg.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
849d908ec3
Staging: wlan-ng: Remove dead/unused code from p80211ioctl.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
4033fefab3
Staging: wlan-ng: Remove dead/unused code from p80211metadef.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
fc71f4a544
Staging: wlan-ng: Remove unused header file p80211metamib.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
28aed9e369
Staging: wlan-ng: Remove dead code from hfa384x_usb.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
7dd33a43d5
Staging: wlan-ng: Remove dead code from prism2mgmt.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
4c9d98d9f6
Staging: wlan-ng: Remove dead/unused code from prism2sta.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
8521258c76
Staging: wlan-ng: Remove more dead/unused code from p80211types.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:20 -07:00
482a41361a
Staging: wlan-ng: Replace SSWAP() with the generic swap(). Also remove a
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:19 -07:00
4ae14c368a
Staging: wlan-ng: Remove dead/unused code from p80211req.c
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:19 -07:00
3e7dbde929
Staging: wlan-ng: Remove dead/unused code from p80211conv.h
...
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-04-03 14:53:18 -07:00
David S. Miller
Patrick McHardy
Jean Delvare
Alexander Beregalov
Greg Kroah-Hartman
Stoyan Gaydarov
Richard Kennedy
Moritz Muehlenhoff