summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-linus' of ↵Linus Torvalds2006-03-2330-328/+4531
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: (45 commits) [PATCH] Restore channel setting after scan. [PATCH] hostap: Fix memory leak on PCI probe error path [PATCH] hostap: Remove dead code (duplicated idx != 0) [PATCH] hostap: Fix unlikely read overrun in CIS parsing [PATCH] hostap: Fix double free in prism2_config() error path [PATCH] hostap: Fix ap_add_sta() return value verification [PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout [PATCH] wireless/airo: cache wireless scans [PATCH] wireless/airo: define default MTU [PATCH] wireless/airo: clean up printk usage to print device name [PATCH] WE-20 for kernel 2.6.16 [PATCH] softmac: remove function_enter() [PATCH] skge: version 1.5 [PATCH] skge: compute available ring buffers [PATCH] skge: dont free skb until multi-part transmit complete [PATCH] skge: multicast statistics fix [PATCH] skge: rx_reuse called twice [PATCH] skge: dont use dev_alloc_skb for rx buffs [PATCH] skge: align receive buffers [PATCH] sky2: dont need to use dev_kfree_skb_any ...
| * Merge branch 'upstream' of ↵Jeff Garzik2006-03-2316-301/+1264
| |\ | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| | * [PATCH] Restore channel setting after scan.David Woodhouse2006-03-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | After a scan, we weren't switching back to the original channel if we were associated with an AP. So NetworkManager's periodic scans would disrupt connectivity until the ESSID was manually set again. Fix that. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] hostap: Fix memory leak on PCI probe error pathJouni Malinen2006-03-232-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 659, 660) spotted this resource leak on PCI probe error path. Free private data structure if pci_enable_device() fails. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] hostap: Remove dead code (duplicated idx != 0)Jouni Malinen2006-03-231-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 58) spotted this duplicated idx != 0 validation for unicast keys in prism2_ioctl_siwencodeext(). Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] hostap: Fix unlikely read overrun in CIS parsingJouni Malinen2006-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 452, 453, 454, 455, 456) spotted this unlikely read overrun of CIS buffer. Abort if CISTPL_CONFIG or CISTPL_MANFID would not fit in buffer. Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] hostap: Fix double free in prism2_config() error pathEugene Teo2006-03-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 930) spotted this double free on error path (allocation failure). Do not free these here since generic error path will take care of this. Signed-off-by: Eugene Teo <eugene.teo@eugeneteo.net> Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] hostap: Fix ap_add_sta() return value verificationAdrian Bunk2006-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 273) spotted this inconsequent NULL checking (unconditionally dereferencing directly after checking for NULL isn't a good idea). Return immediately to avoid this. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeoutAdrian Bunk2006-03-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Coverity checker (CID: 59) noted that the call to prism2_hw_reset() was dead code. Move prism2_hw_reset() call to a place where it is actually executed. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Jouni Malinen <jkmaline@cc.hut.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] wireless/airo: cache wireless scansDan Williams2006-03-231-59/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Observed problems when multiple processes request scans and subsequently scan results. This causes a scan result request to hit card registers before the scan is complete, returning an incomplete scan list and possibly making the card very angry. Instead, cache the results of a wireless scan and serve result requests from the cache, rather than hitting the hardware for them. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] wireless/airo: define default MTUDan Williams2006-03-231-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | The number 2312 was used all over the place to refer to the card's default MTU. Make it a #define and use that everywhere rather than the number. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] wireless/airo: clean up printk usage to print device nameDan Williams2006-03-231-86/+105
| | | | | | | | | | | | | | | | | | | | | Show the specific device that driver messages are about. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] WE-20 for kernel 2.6.16Jean Tourrilhes2006-03-235-93/+947
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is version 20 of the Wireless Extensions. This is the completion of the RtNetlink work I started early 2004, it enables the full Wireless Extension API over RtNetlink. Few comments on the patch : o totally driver transparent, no change in drivers needed. o iwevent were already RtNetlink based since they were created (around 2.5.7). This adds all the regular SET and GET requests over RtNetlink, using the exact same mechanism and data format as iwevents. o This is a Kconfig option, as currently most people have no need for it. Surprisingly, patch is actually small and well encapsulated. o Tested on SMP, attention as been paid to make it 64 bits clean. o Code do probably too many checks and could be further optimised, but better safe than sorry. o RtNetlink based version of the Wireless Tools available on my web page for people inclined to try out this stuff. I would also like to thank Alexey Kuznetsov for his helpful suggestions to make this patch better. Signed-off-by: Jean Tourrilhes <jt@hpl.hp.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * [PATCH] softmac: remove function_enter()John W. Linville2006-03-233-29/+1
| | | | | | | | | | | | | | | | | | Remove the function_enter() debugging macros. Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * | [PATCH] skge: version 1.5Stephen Hemminger2006-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Update version to allow tracking of complaints. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] skge: compute available ring buffersStephen Hemminger2006-03-232-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't need to keep track of available buffers, it is simpler to just compute the value (ala e1000). Don't need tes on link up because should always have available buffers then. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] skge: dont free skb until multi-part transmit completeStephen Hemminger2006-03-231-35/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't free transmit buffers until the whole set of transmit descriptors has been marked as done. Otherwise, we risk freeing a skb before the whole transmit is done. This changes the transmit completion handling from incremental to a two pass algorithm. First pass scans and records the start of the last done descriptor, second cleans up until that point. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] skge: multicast statistics fixStephen Hemminger2006-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Fix count of multicast packets. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] skge: rx_reuse called twiceStephen Hemminger2006-03-231-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | In the error case we call skge_rx_reuse twice. This is harmless but unnecessary. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] skge: dont use dev_alloc_skb for rx buffsStephen Hemminger2006-03-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The skge driver was using dev_alloc_skb which reserves space for the Ethernet header. This unnecessary and it should just use alloc_skb, also by using GFP_KERNEL during startup it won't run into problems when a user asks for a huge ring size or mtu and potentially drains the reserved atomic pool. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] skge: align receive buffersStephen Hemminger2006-03-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The skge driver aligns the header on the initial receive buffers, but but doesn't on followon receive buffer allocations. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sky2: dont need to use dev_kfree_skb_anyStephen Hemminger2006-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Transmit buffers are always freed with interrupts enabled (softirq), so we can just call dev_kfree_skb. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sky2: Fix RX statsStephen Hemminger2006-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Unicast packets are shown as multicast, real multicast packets are missing. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sky2: typo in last stats patchStephen Hemminger2006-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Typo in last stats patch. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | Merge branch 'master'Jeff Garzik2006-03-23684-5728/+12361
| |\ \
| * \ \ Merge branch 'upstream' of ↵Jeff Garzik2006-03-2215-0/+3238
| |\ \ \ | | | |/ | | |/| | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| | * | [PATCH] Fix softmac scanLarry Finger2006-03-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softmac scanning fails because the stop flag is not cleared before scanning is started. The attached one-line patch fixes this. Signed-Off-By: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: remove dead codeJohannes Berg2006-03-221-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes ieee80211softmac_reassoc which is neither implemented nor used nor necessary. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: add reassociation codeJohannes Berg2006-03-223-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds handling of reassociation to softmac when the AP requests it. Patch from Larry Finger. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: update deauth handler to quiet warningJohannes Berg2006-03-222-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recently the deauth packet handler was updated to use a deauth packet struct (identical to the auth packet struct) and this now gives a warning. This patch updates the code to properly use a deauth struct and deauth variable. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] trivial fixes to softmacJohannes Berg2006-03-222-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch removes a blank line that shouldn't be there and fixes a spelling error in softmac. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] update copyright in softmacJohannes Berg2006-03-227-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the copyright statements in softmac that I erroneously added for 2005 only (when we already had 2006). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] ieee80211_rx_any: filter out packets, call ieee80211_rx or ↵Denis Vlasenko2006-03-221-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ieee80211_rx_mgt Version 2 of the patch. Added checks for version 0 and proper from/to DS bits. Even in promisc mode we won't receive packets from another BSSes. bcm43xx_rx() contains code to filter out packets from foreign BSSes and decide whether to call ieee80211_rx or ieee80211_rx_mgt. This is not bcm specific. Patch adapts that code and adds it to 80211 as ieee80211_rx_any() function. Signed-off-by: Denis Vlasenko <vda@ilport.com.ua> Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: move EXPORT_SYMBOL_GPL right after functionsJohannes Berg2006-03-221-8/+7
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: add MODULE_DESCRIPTION and MODULE_AUTHORsJohannes Berg2006-03-221-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: add copyright and license headersJohannes Berg2006-03-229-3/+229
| | | | | | | | | | | | | | | | | | | | | | | | add copyright and license headers to all softmac files Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: some comment stuffJohannes Berg2006-03-222-2/+1
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: properly check return value of ieee80211softmac_alloc_mgtJohannes Berg2006-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly check return value of ieee80211softmac_alloc_mgt in ieee80211softmac_disassoc_deauth (patch by Denis Vlasenko) Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: scan at least once before selecting a network by essidJohannes Berg2006-03-221-7/+8
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: check if disassociation is for us before processing itJohannes Berg2006-03-221-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: select "best" network based on rssiJohannes Berg2006-03-221-4/+8
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: add fixme for disassocJohannes Berg2006-03-221-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: try to reassociate when being disassociated from the APJohannes Berg2006-03-221-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: correctly use netif_carrier_{on,off}Johannes Berg2006-03-223-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | TODO: add callbacks for ifup/ifdown (see mailing list) Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: convert to use global workqueueJohannes Berg2006-03-227-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | Convert softmac to use global workqueue instead of private one... Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: fix MakefilesJohannes Berg2006-03-222-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] softmac: fix some sparse warningsJohannes Berg2006-03-223-9/+14
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] make softmac depend on IEEE80211 and EXPERIMENTALJohannes Berg2006-03-221-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| | * | [PATCH] wireless: Add softmac layer to the kernelJohannes Berg2006-03-2213-0/+2920
| | | | | | | | | | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | | | Merge branch 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-blockLinus Torvalds2006-03-2329-1293/+2221
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'blktrace' of git://brick.kernel.dk/data/git/linux-2.6-block: [PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23 [PATCH] relay: consolidate sendfile() and read() code [PATCH] relay: add sendfile() support [PATCH] relay: migrate from relayfs to a generic relay API