aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Merge branch 'upstream' of ↵Jeff Garzik2006-03-22
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| * [PATCH] Fix softmac scanLarry Finger2006-03-22
| | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | 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-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: add MODULE_DESCRIPTION and MODULE_AUTHORsJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: add copyright and license headersJohannes Berg2006-03-22
| | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: properly check return value of ieee80211softmac_alloc_mgtJohannes Berg2006-03-22
| | | | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: check if disassociation is for us before processing itJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: select "best" network based on rssiJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: add fixme for disassocJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: try to reassociate when being disassociated from the APJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: correctly use netif_carrier_{on,off}Johannes Berg2006-03-22
| | | | | | | | | | | | 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-22
| | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] softmac: fix some sparse warningsJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] make softmac depend on IEEE80211 and EXPERIMENTALJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
| * [PATCH] wireless: Add softmac layer to the kernelJohannes Berg2006-03-22
| | | | | | | | Signed-off-by: John W. Linville <linville@tuxdriver.com>
* | Merge branch 'upstream-linus' of ↵Linus Torvalds2006-03-22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: [PATCH] Use of uninitialized variable in drivers/net/depca.c [PATCH] Use after free in net/tulip/de2104x.c [PATCH] sis900 adm7001 PHY support [PATCH] sky2: more ethtool stats [PATCH] s390: qeth :allow setting of attribute "route6" to "no_router". [PATCH] s390: qeth driver cleanups [PATCH] s390: qeth driver statistics fixes [PATCH] AMD Au1xx0: fix Ethernet TX stats [PATCH] fix spidernet build issue
| * | [PATCH] Use of uninitialized variable in drivers/net/depca.cEric Sesterhenn2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hi, this fixes coverity bug #888, where the variable dev is used uninitialized. I assume the programmer meant to use mdev, which is initialized. Compile tested only. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] Use after free in net/tulip/de2104x.cEric Sesterhenn2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hi, this fixes coverity bug #912, where skb is freed first, and dereferenced a few lines later with skb->len. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sis900 adm7001 PHY supportArtur Skawina2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | this patch is required to get a SIS964 based motherboard ethernet working (FSC D1875) (picking the #1 transceiver, instead of the last one, in case no known ones were found might be a better default, and would have worked in this case too) Signed-off-by: Artur Skawina <art_k@o2.pl> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] sky2: more ethtool statsStephen Hemminger2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | Expose all the available hardware statistics via ethtool. And cleanup some of the statistics definitions. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] s390: qeth :allow setting of attribute "route6" to "no_router".Frank Pavlic2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 4/6] s390: qeth :allow setting of attribute "route6" to "no_router". From: Ursula Braun <braunu@de.ibm.com> when setting route6 attribute back to no_router qeth does not issue an IP ASSIST command to reset router value to no_router. Once primary_router is set device stays in this mode. Issue an IP ASSIST command when no_router is set in route6. Device will be reset and thus will not longer run as a primary router. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> diffstat: qeth_main.c | 5 ----- 1 files changed, 5 deletions(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] s390: qeth driver cleanupsFrank Pavlic2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 3/6] s390: qeth driver cleanups From: Ursula Braun <braunu@de.ibm.com> - code analyzing tool BEAM has found some unreachable and unnecessary statements and also conditions which are always true. - removed some useless MII code since OSA card will never allow to set such values. Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> diffstat: qeth_main.c | 49 ++++--------------------------------------------- qeth_proc.c | 18 +++++++++--------- qeth_sys.c | 2 +- 3 files changed, 14 insertions(+), 55 deletions(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] s390: qeth driver statistics fixesFrank Pavlic2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [patch 2/6] s390: qeth driver statistics fixes From: Ursula Braun <braunu@de.ibm.com> - display "unsigned int" values in /proc/qeth_perf with %u instead of %i - omit qdio header length when increasing card->stats.tx_bytes Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com> diffstat: qeth_main.c | 3 ++- qeth_proc.c | 38 +++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 20 deletions(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] AMD Au1xx0: fix Ethernet TX statsSergei Shtylylov2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With Au1xx0 Ethernet driver, TX bytes/packets always remain zero. The problem seems to be that when packet has been transmitted, the length word in DMA buffer is zero. The patch updates the TX stats when a buffer is fed to DMA. The initial 2.4 patch was posted to linux-mips@linux-mips.org by Thomas Lange 21 Jan 2005. Signed-off-by: Thomas Lange <thomas@corelatus.se> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Jordan Crouse <jordan.crouse@amd.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
| * | [PATCH] fix spidernet build issueJens Osterkamp2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | <unchangelogged> Signed-off-by: Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Jeff Garzik <jeff@garzik.org>
* | | scsi: link in the debug driver lastLinus Torvalds2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the debug driver is built-in, link it in last, so that any real drivers will probe first, rather than having the debug driver pick the first scsi slots.. Signed-off-by: Douglas Gilbert <dougg@torque.net> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-03-22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [TCP]: Do not use inet->id of global tcp_socket when sending RST. [NETFILTER]: Fix undefined references to get_h225_addr [NETFILTER]: futher {ip,ip6,arp}_tables unification [NETFILTER]: Fix xt_policy address matching [NETFILTER]: nf_conntrack: support for layer 3 protocol load on demand [NETFILTER]: x_tables: set the protocol family in x_tables targets/matches [NETFILTER]: conntrack: cleanup the conntrack ID initialization [NETFILTER]: nfnetlink_queue: fix nfnetlink message size [NETFILTER]: ctnetlink: Fix expectaction mask dumping [NETFILTER]: Fix Kconfig typos [NETFILTER]: Fix ip6tables breakage from {get,set}sockopt compat layer
| * | | [TCP]: Do not use inet->id of global tcp_socket when sending RST.Alexey Kuznetsov2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is in ip_push_pending_frames(), which uses: if (!df) { __ip_select_ident(iph, &rt->u.dst, 0); } else { iph->id = htons(inet->id++); } instead of ip_select_ident(). Right now I think the code is a nonsense. Most likely, I copied it from old ip_build_xmit(), where it was really special, we had to decide whether to generate unique ID when generating the first (well, the last) fragment. In ip_push_pending_frames() it does not make sense, it should use plain ip_select_ident() instead. Signed-off-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Fix undefined references to get_h225_addrPatrick McHardy2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_h225_addr is exported, but declared static, which fails when linking statically. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: futher {ip,ip6,arp}_tables unificationDmitry Mishin2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves {ip,ip6,arp}t_entry_{match,target} definitions to x_tables.h. This move simplifies code and future compatibility fixes. Signed-off-by: Dmitry Mishin <dim@openvz.org> Acked-off-by: Kirill Korotaev <dev@openvz.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Fix xt_policy address matchingPatrick McHardy2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing inversion in address matching, it was broken during the conversion to x_tables. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: nf_conntrack: support for layer 3 protocol load on demandPablo Neira Ayuso2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | x_tables matches and targets that require nf_conntrack_ipv[4|6] to work don't have enough information to load on demand these modules. This patch introduces the following changes to solve this issue: o nf_ct_l3proto_try_module_get: try to load the layer 3 connection tracker module and increases the refcount. o nf_ct_l3proto_module put: drop the refcount of the module. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: x_tables: set the protocol family in x_tables targets/matchesPablo Neira Ayuso2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the family field in xt_[matches|targets] registered. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: conntrack: cleanup the conntrack ID initializationPablo Neira Ayuso2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the first conntrack ID assigned is 2, use 1 instead. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: nfnetlink_queue: fix nfnetlink message sizePablo Neira Ayuso2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix oversized message, use NLMSG_SPACE just one since it reserves space for the netlink header and NFA_SPACE for every attribute. Thanks to Harald Welte for the feedback Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: ctnetlink: Fix expectaction mask dumpingPablo Neira Ayuso2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The expectation mask has some particularities that requires a different handling. The protocol number fields can be set to non-valid protocols, ie. l3num is set to 0xFFFF. Since that protocol does not exist, the mask tuple will not be dumped. Moreover, this results in a kernel panic when nf_conntrack accesses the array of protocol handlers, that is PF_MAX (0x1F) long. This patch introduces the function ctnetlink_exp_dump_mask, that correctly dumps the expectation mask. Such function uses the l3num value from the expectation tuple that is a valid layer 3 protocol number. The value of the l3num mask isn't dumped since it is meaningless from the userspace side. Thanks to Yasuyuki Kozakai and Patrick McHardy for the feedback. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Fix Kconfig typosThomas Vögtle2006-03-22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Vögtle <tv@lio96.de> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [NETFILTER]: Fix ip6tables breakage from {get,set}sockopt compat layerPatrick McHardy2006-03-22
| | |/ | |/| | | | | | | | | | | | | | | | | | | do_ipv6_getsockopt returns -EINVAL for unknown options, not -ENOPROTOOPT as do_ipv6_setsockopt. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge master.kernel.org:/home/rmk/linux-2.6-serialLinus Torvalds2006-03-22
|\ \ \ | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Merge avlab serial board entries in parport_serial [SERIAL] kernel console should send CRLF not LFCR
| * | | [SERIAL] Merge avlab serial board entries in parport_serialRussell King2006-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As can be seen from this patch, the avlab_*_[68]50 table entries are identical to the plain avlab_* entries in every respect. Hence, there is no need to list them separately in the pciserial_board nor parport_pc_pci card tables - they can re-use the plain avlab_* entries. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [SERIAL] kernel console should send CRLF not LFCRRussell King2006-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Glen Turner reported that writing LFCR rather than the more traditional CRLF causes issues with some terminals. Since this aflicts many serial drivers, extract the common code to a library function (uart_console_write) and arrange for each driver to supply a "putchar" function. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>