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

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

diff --git a/include/net/neighbour.h b/include/net/neighbour.h
index bd187daffdb9f51decc99b6ac90b7de778db267c..c8aacbd2e3331198fbde8125b1829e61f779a043 100644 (file)
--- a/include/net/neighbour.h
+++ b/include/net/neighbour.h
@@ -126,6 +126,7 @@ struct pneigh_entry
 {
        struct pneigh_entry     *next;
        struct net_device               *dev;
+       u8                      flags;
        u8                      key[0];
 };