Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

[linux-2.6] / include / net / dst.h

diff --git a/include/net/dst.h b/include/net/dst.h
index 36d54fc248b001cc1bbd9915039c005931fd14d1..e156e38e4ac37db61db754822e59877299e2f9a0 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -54,6 +54,7 @@ struct dst_entry
        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];
@@ -83,7 +84,7 @@ struct dst_entry
 struct dst_ops
 {
        unsigned short          family;
-       unsigned short          protocol;
+       __be16                  protocol;
        unsigned                gc_thresh;
 
        int                     (*gc)(void);