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

Commit 6b6a93c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents e8922788 7686ee1a

drivers/w1/w1_int.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ static struct w1_master * w1_alloc_dev(u32 id, int slave_count, int slave_ttl, 


	dev->groups = 23;

	dev->seq = 1;

	dev->nls = netlink_kernel_create(NETLINK_NFLOG, NULL);

	dev->nls = netlink_kernel_create(NETLINK_W1, NULL);

	if (!dev->nls) {

		printk(KERN_ERR "Failed to create new netlink socket(%u) for w1 master %s.\n",

			NETLINK_NFLOG, dev->dev.bus_id);

include/linux/netlink.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <linux/types.h>



#define NETLINK_ROUTE		0	/* Routing/device hook				*/

#define NETLINK_SKIP		1	/* Reserved for ENskip  			*/

#define NETLINK_W1		1	/* 1-wire subsystem				*/

#define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/

#define NETLINK_FIREWALL	3	/* Firewalling hook				*/

#define NETLINK_TCPDIAG		4	/* TCP socket monitoring			*/

net/ipv6/ip6_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ static inline int ip6ip6_register(void) 


static inline int ip6ip6_unregister(void)

{

	return xfrm6_tunnel_unregister(&ip6ip6_handler);

	return xfrm6_tunnel_deregister(&ip6ip6_handler);

}

#else

static struct inet6_protocol xfrm6_tunnel_protocol = {

net/sched/em_meta.c

+8 −8
Original line number Diff line number Diff line
@@ -209,12 +209,14 @@ META_COLLECTOR(int_maclen) 
 * Netfilter

 **************************************************************************/



#ifdef CONFIG_NETFILTER

META_COLLECTOR(int_nfmark)

{

#ifdef CONFIG_NETFILTER

	dst->value = skb->nfmark;

}

#else

	dst->value = 0;

#endif

}



/**************************************************************************

 * Traffic Control
@@ -229,15 +231,17 @@ META_COLLECTOR(int_tcindex) 
 * Routing

 **************************************************************************/



#ifdef CONFIG_NET_CLS_ROUTE

META_COLLECTOR(int_rtclassid)

{

	if (unlikely(skb->dst == NULL))

		*err = -1;

	else

#ifdef CONFIG_NET_CLS_ROUTE

		dst->value = skb->dst->tclassid;

}

#else

		dst->value = 0;

#endif

}



META_COLLECTOR(int_rtiif)

{
@@ -487,13 +491,9 @@ static struct meta_ops __meta_ops[TCF_META_TYPE_MAX+1][TCF_META_ID_MAX+1] = { 
		[META_ID(PKTLEN)]		= META_FUNC(int_pktlen),

		[META_ID(DATALEN)]		= META_FUNC(int_datalen),

		[META_ID(MACLEN)]		= META_FUNC(int_maclen),

#ifdef CONFIG_NETFILTER

		[META_ID(NFMARK)]		= META_FUNC(int_nfmark),

#endif

		[META_ID(TCINDEX)]		= META_FUNC(int_tcindex),

#ifdef CONFIG_NET_CLS_ROUTE

		[META_ID(RTCLASSID)]		= META_FUNC(int_rtclassid),

#endif

		[META_ID(RTIIF)]		= META_FUNC(int_rtiif),

		[META_ID(SK_FAMILY)]		= META_FUNC(int_sk_family),

		[META_ID(SK_STATE)]		= META_FUNC(int_sk_state),