Automatic merge of /spare/repo/netdev-2.6 branch we18

This commit is contained in:
2005-05-27 22:07:40 -04:00
committed by Jeff Garzik
431 changed files with 28923 additions and 11724 deletions

View File

@@ -2,8 +2,8 @@
* include/net/act_generic.h
*
*/
#ifndef ACT_GENERIC_H
#define ACT_GENERIC_H
#ifndef _NET_ACT_GENERIC_H
#define _NET_ACT_GENERIC_H
static inline int tcf_defact_release(struct tcf_defact *p, int bind)
{
int ret = 0;

View File

@@ -515,6 +515,8 @@ struct xfrm_dst
struct dst_entry *route;
u32 route_mtu_cached;
u32 child_mtu_cached;
u32 route_cookie;
u32 path_cookie;
};
static inline void xfrm_dst_destroy(struct xfrm_dst *xdst)