Commit dd13810b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [AF_KEY]: suppress a warning for 64k pages.
  [TIPC]: Fix headercheck wrt. tipc_config.h
  [COMPAT]: Fix build on COMPAT platforms when CONFIG_NET is disabled.
  [CONNECTOR]: Fix a spurious kfree_skb() call
  [COMPAT]: Fix new dev_ifname32 returning -EFAULT
  [NET]: Fix incorrect sg_mark_end() calls.
  [IPVS]: Remove /proc/net/ip_vs_lblcr
  [IPV6]: remove duplicate call to proc_net_remove
  [NETNS]: fix net released by rcu callback
  [NET]: Fix free_netdev on register_netdev failure.
  [WAN]: fix drivers/net/wan/lmc/ compilation
parents a3634d71 298bb621

drivers/connector/connector.c

+1 −4
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static void cn_rx_skb(struct sk_buff *__skb) 
		    skb->len < nlh->nlmsg_len ||

		    nlh->nlmsg_len > CONNECTOR_MAX_MSG_SIZE) {

			kfree_skb(skb);

			goto out;

			return;

		}



		len = NLMSG_ALIGN(nlh->nlmsg_len);
@@ -229,9 +229,6 @@ static void cn_rx_skb(struct sk_buff *__skb) 
		if (err < 0)

			kfree_skb(skb);

	}



out:

	kfree_skb(__skb);

}



/*

drivers/net/wan/lmc/lmc_main.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int lmc_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd) /*fold00*/ 
        sc->lmc_xinfo.Magic1 = 0xDEADBEEF;



        if (copy_to_user(ifr->ifr_data, &sc->lmc_xinfo,

					sizeof(struct lmc_xinfo))) {

			 sizeof(struct lmc_xinfo)))

		ret = -EFAULT;

	else

		ret = 0;

fs/compat_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int dev_ifname32(unsigned int fd, unsigned int cmd, unsigned long arg) 
	int err;



	uifr = compat_alloc_user_space(sizeof(struct ifreq));

	if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32)));

	if (copy_in_user(uifr, compat_ptr(arg), sizeof(struct ifreq32)))

		return -EFAULT;



	err = sys_ioctl(fd, SIOCGIFNAME, (unsigned long)uifr);

include/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -326,6 +326,7 @@ unifdef-y += sonypi.h 
unifdef-y += soundcard.h

unifdef-y += stat.h

unifdef-y += stddef.h

unifdef-y += string.h

unifdef-y += synclink.h

unifdef-y += sysctl.h

unifdef-y += tcp.h

include/linux/string.h

+3 −9
Original line number Diff line number Diff line
@@ -3,16 +3,14 @@ 


/* We don't want strings.h stuff being user by user stuff by accident */



#ifdef __KERNEL__

#ifndef __KERNEL__

#include <string.h>

#else



#include <linux/compiler.h>	/* for inline */

#include <linux/types.h>	/* for size_t */

#include <linux/stddef.h>	/* for NULL */



#ifdef __cplusplus

extern "C" {

#endif



extern char *strndup_user(const char __user *, long);



/*
@@ -111,9 +109,5 @@ extern void *kmemdup(const void *src, size_t len, gfp_t gfp); 
extern char **argv_split(gfp_t gfp, const char *str, int *argcp);

extern void argv_free(char **argv);



#ifdef __cplusplus

}

#endif



#endif

#endif /* _LINUX_STRING_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE