linux.git/drivers/net/wireless/hostap, branch v2.6.31 Linux kernel source tree Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 2009-06-15T10:02:23+00:00 David S. Miller davem@davemloft.net 2009-06-15T10:02:23+00:00 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c 
Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c
net: use symbolic values for ndo_start_xmit() return codes 2009-06-13T08:18:50+00:00 Patrick McHardy kaber@trash.net 2009-06-12T06:22:29+00:00 5b548140225c6bbbbd560551dd1048b2c0ce58be 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> 
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>
trivial: Kconfig: .ko is normally not included in module names 2009-06-12T16:01:50+00:00 Pavel Machek pavel@ucw.cz 2009-06-04T22:44:53+00:00 4737f0978d6e64eae468e01fa181abf6499e6b84 .ko is normally not included in Kconfig help, make it consistent. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz> 
.ko is normally not included in Kconfig help, make it consistent.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
net: remove needless (now buggy) & from dev->dev_addr 2009-05-17T18:59:47+00:00 Jiri Pirko jpirko@redhat.com 2009-05-11T23:37:15+00:00 3a6d54c56326c29c5357655779cfe6cf36481b17 Patch fixes issues with dev->dev_addr changing from array to pointer. Hopefully there are no others. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Patch fixes issues with dev->dev_addr changing from array to pointer.
Hopefully there are no others.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
wireless: remove some (bogus?) 'may be used uninitialized' warnings 2009-04-24T19:41:41+00:00 John W. Linville linville@tuxdriver.com 2009-04-24T19:35:42+00:00 d3feaf5ad12259927039a675cfb25dc342b403ab net/mac80211/tx.c: In function ‘ieee80211_tx_h_select_key’: net/mac80211/tx.c:448: warning: ‘key’ may be used uninitialized in this function drivers/net/wireless/ath/ath9k/rc.c: In function ‘ath_rc_rate_getidx’: drivers/net/wireless/ath/ath9k/rc.c:815: warning: ‘nextindex’ may be used uninitialized in this function drivers/net/wireless/hostap/hostap_plx.c: In function ‘prism2_plx_probe’: drivers/net/wireless/hostap/hostap_plx.c:438: warning: ‘cor_index’ may be used uninitialized in this function drivers/net/wireless/hostap/hostap_plx.c:438: warning: ‘cor_offset’ may be used uninitialized in this function Signed-off-by: John W. Linville <linville@tuxdriver.com> 
net/mac80211/tx.c: In function ‘ieee80211_tx_h_select_key’:
net/mac80211/tx.c:448: warning: ‘key’ may be used uninitialized in this function

drivers/net/wireless/ath/ath9k/rc.c: In function ‘ath_rc_rate_getidx’:
drivers/net/wireless/ath/ath9k/rc.c:815: warning: ‘nextindex’ may be used uninitialized in this function

drivers/net/wireless/hostap/hostap_plx.c: In function ‘prism2_plx_probe’:
drivers/net/wireless/hostap/hostap_plx.c:438: warning: ‘cor_index’ may be used uninitialized in this function
drivers/net/wireless/hostap/hostap_plx.c:438: warning: ‘cor_offset’ may be used uninitialized in this function

Signed-off-by: John W. Linville <linville@tuxdriver.com>
hostap: convert to net_device_ops 2009-03-22T05:55:36+00:00 Stephen Hemminger shemminger@vyatta.com 2009-03-20T19:36:43+00:00 5ae4efbcd2611562a8b93596be034e63495706a5 Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hostap: convert to internal net_device_stats 2009-03-22T05:55:34+00:00 Stephen Hemminger shemminger@vyatta.com 2009-03-20T19:36:42+00:00 4cfa8e45f4bb26ff38155f94a810a876b739958d Use pre-existing net_device_stats in network_device struct. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: David S. Miller <davem@davemloft.net> 
Use pre-existing net_device_stats in network_device struct.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hostap: convert usage of net/ieee80211.h to linux/ieee80211.h 2009-02-27T19:51:41+00:00 Dan Williams dcbw@redhat.com 2009-02-11T22:17:10+00:00 1ea893fde29d8cf1639da8989f4b843dc3283ca8 So that net/ieee80211.h can be made private to ipw2x00 in a follow-up. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> 
So that net/ieee80211.h can be made private to ipw2x00 in a follow-up.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
wireless: replace uses of __constant_{endian} 2009-02-09T20:03:43+00:00 Harvey Harrison harvey.harrison@gmail.com 2009-01-29T21:26:44+00:00 c1b4aa3fb619782213af2af6652663c8f9cef373 The base versions handle constant folding now. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> 
The base versions handle constant folding now.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
hostap: select required crypto bits in Kconfig 2008-12-05T14:32:10+00:00 John W. Linville linville@tuxdriver.com 2008-12-03T18:55:38+00:00 04adf890667050b83a58abaf63610e53a604261b This is fallout from moving the crypto stuff to the new lib80211 component. Signed-off-by: John W. Linville <linville@tuxdriver.com> 
This is fallout from moving the crypto stuff to the new lib80211
component.

Signed-off-by: John W. Linville <linville@tuxdriver.com>