git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
net
/
dst.h
diff --git
a/include/net/dst.h
b/include/net/dst.h
index
5161e89
..
62b7e75
100644
(file)
--- a/
include/net/dst.h
+++ b/
include/net/dst.h
@@
-8,7
+8,6
@@
#ifndef _NET_DST_H
#define _NET_DST_H
#ifndef _NET_DST_H
#define _NET_DST_H
-#include <linux/config.h>
#include <linux/netdevice.h>
#include <linux/rtnetlink.h>
#include <linux/rcupdate.h>
#include <linux/netdevice.h>
#include <linux/rtnetlink.h>
#include <linux/rcupdate.h>
@@
-55,6
+54,7
@@
struct dst_entry
unsigned long expires;
unsigned short header_len; /* more space at head required */
unsigned long expires;
unsigned short header_len; /* more space at head required */
+ unsigned short nfheader_len; /* more non-fragment space at head required */
unsigned short trailer_len; /* space to reserve at tail */
u32 metrics[RTAX_MAX];
unsigned short trailer_len; /* space to reserve at tail */
u32 metrics[RTAX_MAX];
@@
-84,7
+84,7
@@
struct dst_entry
struct dst_ops
{
unsigned short family;
struct dst_ops
{
unsigned short family;
-
unsigned short
protocol;
+
__be16
protocol;
unsigned gc_thresh;
int (*gc)(void);
unsigned gc_thresh;
int (*gc)(void);
@@
-98,7
+98,7
@@
struct dst_ops
int entry_size;
atomic_t entries;
int entry_size;
atomic_t entries;
-
kmem_cache_t
*kmem_cachep;
+
struct kmem_cache
*kmem_cachep;
};
#ifdef __KERNEL__
};
#ifdef __KERNEL__