OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Linus Torvalds 2005-07-24 20:39:30 -07:00
parent e89227889c 7686ee1ad9
commit 6b6a93c687
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/w1/w1_int.c
View File

@ -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);

2
include/linux/netlink.h
View File

@ -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 */

2
net/ipv6/ip6_tunnel.c
View File

@ -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 = {

16
net/sched/em_meta.c
View File

@ -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),