Commit graph

125 commits

Author SHA1 Message Date
Greg Kroah-Hartman
049e62614a Staging: wireless drivers Kconfig change
Change the wireless drivers to depend on CONFIG_WLAN instead of
CONFIG_WLAN_80211 which is going away soon.


Cc: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-10-30 14:47:44 -07:00
Alexander Beregalov
6fdc7f80c9 Staging: wlan-ng: remove dependency on WIRELESS_EXT version
As the driver is in mainline now we can remove such dependency.
WIRELESS_EXT is 22 now and it is always defined.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:37 -07:00
Karl Relton
d89505998e Staging: wlan-ng: Convert firmware loading to load binary ihex format
Convert prism2_usb firmware loading to load firmware in pre-compiled
binary 'ihex' format rather than ascii 'srec' format. This moves the
srec processing and sorting of records out of kernel space into a
pre-compiler. The driver now just works with the binary image, but
still does the 'pda plugging' of that image at runtime, as required
by the prism hardware.

Some Notes:

- The firmware is now expected to be in the same 'ihex' (.fw) format
  used by other drivers.

- The now driver assumes the data records are already sorted into ascending
  address order.

- Plug and crc records are still recognised by special address locations
  as in original srec processing.

- The srec S7 start address record is assumed to have been converted
  into a data record with another special address location (0xff400000),
  with the original start address being stored as a 4 byte data word
  (little endian).

Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:35 -07:00
Moritz Muehlenhoff
c4004175eb Staging: wlan-ng: Remove more superflous comments
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:35 -07:00
Moritz Muehlenhoff
84d9bd7d55 Staging: wlan-ng: Drop the special case handling of older wireless extensions, WIRELESS_EXT is at 22 for the current kernel.
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:34 -07:00
Moritz Muehlenhoff
2f5851917c Staging: wlan-ng: Use kzfree() to securely zero-out the WEP key when freeing it
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:34 -07:00
Moritz Muehlenhoff
0d0202fd88 Staging: wlan-ng: Remove some superflous comments
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:34 -07:00
Mithlesh Thukral
297f06cea6 staging: wlan-ng: scripts/checkpatch.pl error fixes.
scripts/checkpatch.pl error fixes. This is a TODO item.
This patch fixes most of the errors reported by checkpatch.pl in
wlan-ng directory of staging tree.

Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-09-15 12:01:26 -07:00
Patrick McHardy
ec634fe328 net: convert remaining non-symbolic return values in ndo_start_xmit() functions
This patch converts the remaining occurences of raw return values to their
symbolic counterparts in ndo_start_xmit() functions that were missed by the
previous automatic conversion.

Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero
is changed to explicitly use NETDEV_TX_OK.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-07-05 19:23:38 -07:00
Mithlesh Thukral
94993ce462 Staging: wlan-ng: Update README file. Remove Lindent task
Remove Lindent changes as a TODO item in the wlan-ng directory of staging tree.

Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:39 -07:00
Mithlesh Thukral
75f49e0752 Staging: wlan-ng: Lindent cleanups
Lindent script cleanups in wlan-ng driver in the staging tree.
This is a item in the TODO list.

Signed-off-by: Mithlesh Thukral <mithlesh@linsyssoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:38 -07:00
Julia Lawall
1611a52c39 Staging: wlan-ng: p80211wext.c: problem with IW_ENCODE_ALG_WEP
The expression !(ext->alg & IW_ENCODE_ALG_WEP) appears to be incorrect,
because there are several possible values for ext->alg that give 1 when
bit-anded with IW_ENCODE_ALG_WEP.  Therefore Richard Kennedy suggested to
rewrite the code with !=

Added \n at the end of the debug string as well.

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:38 -07:00
Karl Relton
f2b50b40d1 Staging: wlan-ng: Change KERN_DEBUG or pr_debug to match orig driver
Change uses of KERN_DEBUG over to pr_debug to match original driver
where messages are only needed during driver development.

Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:38 -07:00
Karl Relton
76e3e7c409 Staging: wlan-ng: Move firmware loading into driver
Move prism2 firmware loading from userspace into driver, using linux
request_firmware(). Firmware is now loaded (if available) on device
probing, before it is registered as a netdevice and advertised to userspace.

Signed-off-by: Karl Relton <karllinuxtest.relton@ntlworld.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:38 -07:00
Huang Weiyi
727cbafa51 Staging: remove unused #include <linux/version.h>'s
Remove unused #include <linux/version.h>'s.

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2009-06-19 11:00:36 -07:00
David S. Miller
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
Patrick McHardy
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
Jean Delvare
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
Alexander Beregalov
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
Greg Kroah-Hartman
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
Stoyan Gaydarov
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
Richard Kennedy
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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
Moritz Muehlenhoff
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