Merge branch 'akpm' (patches from Andrew)

[deliverable/linux.git] / net / mpls / internal.h

diff --git a/net/mpls/internal.h b/net/mpls/internal.h
index bde52ce88c949e76083ec704ed010493b60d6466..732a5c17e9862940aee1f032fb98b48abefdc80a 100644 (file)
--- a/net/mpls/internal.h
+++ b/net/mpls/internal.h
@@ -41,6 +41,7 @@ enum mpls_payload_type {
 
 struct mpls_nh { /* next hop label forwarding entry */
        struct net_device __rcu *nh_dev;
+       unsigned int            nh_flags;
        u32                     nh_label[MAX_NEW_LABELS];
        u8                      nh_labels;
        u8                      nh_via_alen;
@@ -74,6 +75,7 @@ struct mpls_route { /* next hop label forwarding entry */
        u8                      rt_payload_type;
        u8                      rt_max_alen;
        unsigned int            rt_nhn;
+       unsigned int            rt_nhn_alive;
        struct mpls_nh          rt_nh[0];
 };