summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* remove obsolete swsusp_encryptPavel Machek2006-06-301-12/+0
| | | | | | | Remove SWSUSP_ENCRYPT config option; it is no longer implemented. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* arch/arm26/Kconfig typosMatt LaPlante2006-06-301-3/+3
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* Documentation/IPMI typosMatt LaPlante2006-06-301-2/+2
| | | | | Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* Kconfig: Typos in net/sched/KconfigMatt LaPlante2006-06-301-4/+4
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* v9fs: do not include linux/version.hPaul Collins2006-06-302-2/+0
| | | | | | | I noticed that part of v9fs was being rebuilt when version.h changed. Signed-off-by: Paul Collins <paul@ondioline.org> Signed-off-by: Adrian Bunk <bunk@stusta.de>
* Documentation/DocBook/mtdnand.tmpl: typo fixesPatrick Pletscher2006-06-301-3/+3
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes: specfic -> specificAdrian Bunk2006-06-303-3/+3
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes in Documentation/networking/pktgen.txtAdrian Bunk2006-06-301-1/+1
| | | | | | Three typos in only one line... Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes: occuring -> occurringAdrian Bunk2006-06-3013-13/+13
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes: infomation -> informationAdrian Bunk2006-06-307-13/+13
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes: disadvantadge -> disadvantageAdrian Bunk2006-06-302-2/+2
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes: aquire -> acquireAdrian Bunk2006-06-309-30/+30
| | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
* typo fixes: mecanism -> mechanismAdrian Bunk2006-06-308-8/+8
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* typo fixes: bandwith -> bandwidthAdrian Bunk2006-06-308-14/+14
| | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* fix a typo in the RTC_CLASS help textAdrian Bunk2006-06-301-1/+1
| | | | | | | | | This patch fixes a typo spotted by Matt LaPlante <webmaster@cyberdogtech.com>. This patch fixes kernel Bugzilla #6704. Signed-off-by: Adrian Bunk <bunk@stusta.de>
* smb is no longer maintainedAdrian Bunk2006-06-301-7/+0
| | | | | | The smb filesystem in the Linux kernel is unmaintained for years. Signed-off-by: Adrian Bunk <bunk@stusta.de>
* Merge branch 'upstream-linus' of ↵Linus Torvalds2006-06-2921-97/+131
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks() ocfs2: clean up some osb fields ocfs2: fix init of uuid_net_key ocfs2: silence a debug print ocfs2: silence ENOENT during lookup of broken links ocfs2: Cleanup message prints ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() static ocfs2: warn the user on a dead timeout mismatch ocfs2: OCFS2_FS must depend on SYSFS ocfs2: Compile-time disabling of ocfs2 debugging output. configfs: Clear up a few extra spaces where there should be TABs. configfs: Release memory in configfs_example.
| * ocfs2: remove redundant NULL checks in ocfs2_direct_IO_get_blocks()Florin Malita2006-06-291-8/+1
| | | | | | | | | | Signed-off-by: Florin Malita <fmalita@gmail.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: clean up some osb fieldsMark Fasheh2006-06-294-42/+4
| | | | | | | | | | | | | | | | Get rid of osb->uuid, osb->proc_sub_dir, and osb->osb_id. Those fields were unused, or could easily be removed. As a result, we also no longer need MAX_OSB_ID or ocfs2_globals_lock. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: fix init of uuid_net_keyMark Fasheh2006-06-291-1/+1
| | | | | | | | | | | | ocfs2_initialize_super() should be copying from the beginning of the uuid. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: silence a debug printMark Fasheh2006-06-291-1/+1
| | | | | | | | Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: silence ENOENT during lookup of broken linksSunil Mushran2006-06-291-1/+1
| | | | | | | | | | Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: Cleanup message printsSunil Mushran2006-06-293-18/+20
| | | | | | | | | | Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookupJoel Becker2006-06-291-7/+22
| | | | | | | | | | Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * [PATCH] fs/ocfs2/dlm/dlmrecovery.c: make dlm_lockres_master_requery() staticAdrian Bunk2006-06-292-4/+6
| | | | | | | | | | | | | | dlm_lockres_master_requery() became global without any external usage. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: warn the user on a dead timeout mismatchMark Fasheh2006-06-292-0/+21
| | | | | | | | | | | | | | Print a warning to the user when a node with a different dead count joins the region. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: OCFS2_FS must depend on SYSFSAdrian Bunk2006-06-291-1/+1
| | | | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * ocfs2: Compile-time disabling of ocfs2 debugging output.Joel Becker2006-06-294-7/+35
| | | | | | | | | | | | | | | | Give gcc the chance to compile out the debug logging code in ocfs2. This saves some size at the expense of being able to debug the code. Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * configfs: Clear up a few extra spaces where there should be TABs.Joel Becker2006-06-292-4/+4
| | | | | | | | | | Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
| * configfs: Release memory in configfs_example.Joel Becker2006-06-291-4/+15
| | | | | | | | | | | | | | The configfs_example module was missing a ->release(). Signed-off-by: Joel Becker <joel.becker@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2006-06-2989-148/+520
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) [TIPC]: Initial activation message now includes TIPC version number [TIPC]: Improve response to requests for node/link information [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_buf [IrDA]: Fix the AU1000 FIR dependencies [IrDA]: Fix RCU lock pairing on error path [XFRM]: unexport xfrm_state_mtu [NET]: make skb_release_data() static [NETFILTE] ipv4: Fix typo (Bugzilla #6753) [IrDA]: MCS7780 usb_driver struct should be static [BNX2]: Turn off link during shutdown [BNX2]: Use dev_kfree_skb() instead of the _irq version [ATM]: basic sysfs support for ATM devices [ATM]: [suni] change suni_init to __devinit [ATM]: [iphase] should be __devinit not __init [ATM]: [idt77105] should be __devinit not __init [BNX2]: Add NETIF_F_TSO_ECN [NET]: Add ECN support for TSO [AF_UNIX]: Datagram getpeersec [NET]: Fix logical error in skb_gso_ok [PKT_SCHED]: PSCHED_TADD() and PSCHED_TADD2() can result,tv_usec >= 1000000 ...
| * | [TIPC]: Initial activation message now includes TIPC version numberAllan Stephens2006-06-291-1/+2
| | | | | | | | | | | | | | | | | | Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Per Liden <per.liden@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [TIPC]: Improve response to requests for node/link informationAllan Stephens2006-06-292-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now allocates reply space for "get links" request based on number of actual links, not number of potential links. Also, limits reply to "get links" and "get nodes" requests to 32KB to match capabilities of tipc-config utility that issued request. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Per Liden <per.liden@ericsson.com>
| * | [TIPC]: Fixed skb_under_panic caused by tipc_link_bundle_bufAllan Stephens2006-06-291-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now determines tailroom of bundle buffer by directly inspection of buffer. Previously, buffer was assumed to have a max capacity equal to the link MTU, but the addition of link MTU negotiation means that the link MTU can increase after the bundle buffer is allocated. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Per Liden <per.liden@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IrDA]: Fix the AU1000 FIR dependenciesAdrian Bunk2006-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AU1000 FIR is broken, it should depend on SOC_AU1000. Spotted by Jean-Luc Leger. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Samuel Ortiz <samuel@sortiz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IrDA]: Fix RCU lock pairing on error pathJosh Triplett2006-06-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | irlan_client_discovery_indication calls rcu_read_lock and rcu_read_unlock, but returns without unlocking in an error case. Fix that by replacing the return with a goto so that the rcu_read_unlock always gets executed. Signed-off-by: Josh Triplett <josh@freedesktop.org> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Samuel Ortiz samuel@sortiz.org <> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [XFRM]: unexport xfrm_state_mtuAdrian Bunk2006-06-291-2/+0
| | | | | | | | | | | | | | | | | | | | | This patch removes the unused EXPORT_SYMBOL(xfrm_state_mtu). Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: make skb_release_data() staticAdrian Bunk2006-06-293-3/+1
| | | | | | | | | | | | | | | | | | | | | skb_release_data() no longer has any users in other files. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NETFILTE] ipv4: Fix typo (Bugzilla #6753)Matt LaPlante2006-06-291-1/+1
| | | | | | | | | | | | | | | | | | This patch fixes bugzilla #6753, a typo in the netfilter Kconfig Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IrDA]: MCS7780 usb_driver struct should be staticAdrian Bunk2006-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This patch makes a needlessly global struct static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Samuel Ortiz <samuel@sortiz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Turn off link during shutdownMichael Chan2006-06-292-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Minor change in shutdown logic to effect a link down. Update version to 1.4.43. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Use dev_kfree_skb() instead of the _irq versionMichael Chan2006-06-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change all dev_kfree_skb_irq() and dev_kfree_skb_any() to dev_kfree_skb(). These calls are never used in irq context. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [ATM]: basic sysfs support for ATM devicesRoman Kagan2006-06-297-6/+209
| | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [ATM]: [suni] change suni_init to __devinitChas Williams2006-06-292-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [ATM]: [iphase] should be __devinit not __initChas Williams2006-06-291-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [ATM]: [idt77105] should be __devinit not __initChas Williams2006-06-292-2/+2
| | | | | | | | | | | | | | | Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [BNX2]: Add NETIF_F_TSO_ECNMichael Chan2006-06-291-2/+12
| | | | | | | | | | | | | | | | | | | | | Add NETIF_F_TSO_ECN feature for all bnx2 hardware. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: Add ECN support for TSOMichael Chan2006-06-297-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current TSO implementation, NETIF_F_TSO and ECN cannot be turned on together in a TCP connection. The problem is that most hardware that supports TSO does not handle CWR correctly if it is set in the TSO packet. Correct handling requires CWR to be set in the first packet only if it is set in the TSO header. This patch adds the ability to turn on NETIF_F_TSO and ECN using GSO if necessary to handle TSO packets with CWR set. Hardware that handles CWR correctly can turn on NETIF_F_TSO_ECN in the dev-> features flag. All TSO packets with CWR set will have the SKB_GSO_TCPV4_ECN set. If the output device does not have the NETIF_F_TSO_ECN feature set, GSO will split the packet up correctly with CWR only set in the first segment. With help from Herbert Xu <herbert@gondor.apana.org.au>. Since ECN can always be enabled with TSO, the SOCK_NO_LARGESEND sock flag is completely removed. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [AF_UNIX]: Datagram getpeersecCatherine Zhang2006-06-2926-3/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch implements an API whereby an application can determine the label of its peer's Unix datagram sockets via the auxiliary data mechanism of recvmsg. Patch purpose: This patch enables a security-aware application to retrieve the security context of the peer of a Unix datagram socket. The application can then use this security context to determine the security context for processing on behalf of the peer who sent the packet. Patch design and implementation: The design and implementation is very similar to the UDP case for INET sockets. Basically we build upon the existing Unix domain socket API for retrieving user credentials. Linux offers the API for obtaining user credentials via ancillary messages (i.e., out of band/control messages that are bundled together with a normal message). To retrieve the security context, the application first indicates to the kernel such desire by setting the SO_PASSSEC option via getsockopt. Then the application retrieves the security context using the auxiliary data mechanism. An example server application for Unix datagram socket should look like this: toggle = 1; toggle_len = sizeof(toggle); setsockopt(sockfd, SOL_SOCKET, SO_PASSSEC, &toggle, &toggle_len); recvmsg(sockfd, &msg_hdr, 0); if (msg_hdr.msg_controllen > sizeof(struct cmsghdr)) { cmsg_hdr = CMSG_FIRSTHDR(&msg_hdr); if (cmsg_hdr->cmsg_len <= CMSG_LEN(sizeof(scontext)) && cmsg_hdr->cmsg_level == SOL_SOCKET && cmsg_hdr->cmsg_type == SCM_SECURITY) { memcpy(&scontext, CMSG_DATA(cmsg_hdr), sizeof(scontext)); } } sock_setsockopt is enhanced with a new socket option SOCK_PASSSEC to allow a server socket to receive security context of the peer. Testing: We have tested the patch by setting up Unix datagram client and server applications. We verified that the server can retrieve the security context using the auxiliary data mechanism of recvmsg. Signed-off-by: Catherine Zhang <cxzhang@watson.ibm.com> Acked-by: Acked-by: James Morris <jmorris@namei.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET]: Fix logical error in skb_gso_okHerbert Xu2006-06-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test in skb_gso_ok is backwards. Noticed by Michael Chan <mchan@broadcom.com>. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Acked-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
OpenPOWER on IntegriCloud