Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42fae7fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET]: Fix networking compilation errors
  [AF_RXRPC/AFS]: Arch-specific fixes.
  [AFS]: Fix VLocation record update wakeup
  [NET]: Revert sk_buff walker cleanups.
parents f0054636 b8b8fd2d

arch/ia64/lib/csum_partial_copy.c

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst, 
	return (__force __wsum)result;

}



EXPORT_SYMBOL(csum_partial_copy_from_user);



__wsum

csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)

{

fs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2020,6 +2020,7 @@ config AFS_FS 
	tristate "Andrew File System support (AFS) (EXPERIMENTAL)"

	depends on INET && EXPERIMENTAL

	select AF_RXRPC

	select KEYS

	help

	  If you say Y here, you will get an experimental Andrew File System

	  driver. It currently only supports unsecured read-only AFS access.

fs/afs/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ struct afs_uuid { 
	u32		time_low;			/* low part of timestamp */

	u16		time_mid;			/* mid part of timestamp */

	u16		time_hi_and_version;		/* high part of timestamp and version  */

#define AFS_UUID_TO_UNIX_TIME	0x01b21dd213814000

#define AFS_UUID_TO_UNIX_TIME	0x01b21dd213814000ULL

#define AFS_UUID_TIMEHI_MASK	0x0fff

#define AFS_UUID_VERSION_TIME	0x1000	/* time-based UUID */

#define AFS_UUID_VERSION_NAME	0x3000	/* name-based UUID */

fs/afs/rxrpc.c

+1 −1
Original line number Diff line number Diff line
@@ -772,7 +772,7 @@ int afs_extract_data(struct afs_call *call, struct sk_buff *skb, 


	if (call->offset < count) {

		if (last) {

			_leave(" = -EBADMSG [%d < %lu]", call->offset, count);

			_leave(" = -EBADMSG [%d < %zu]", call->offset, count);

			return -EBADMSG;

		}

		_leave(" = -EAGAIN");

fs/afs/use-rtnetlink.c

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static int afs_read_rtm(struct afs_rtm_desc *desc) 
		desc->datalen = kernel_recvmsg(desc->nlsock, &msg, iov, 1,

					       desc->datamax, 0);

		if (desc->datalen < 0) {

			_leave(" = %ld [recv]", desc->datalen);

			_leave(" = %zd [recv]", desc->datalen);

			return desc->datalen;

		}