[SPARC]: Merge asm-sparc{,64}/bugs.h

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

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 4cefcffe773e29d88b0e6284e998f5424b4ffd67..953d6040ff50349a61130a06cae45b916a5f09fc 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -101,7 +101,7 @@ struct rt6_info
        atomic_t                        rt6i_ref;
 
        /* more non-fragment space at head required */
-       unsigned short                  nfheader_len;
+       unsigned short                  rt6i_nfheader_len;
 
        u8                              rt6i_protocol;
 
@@ -150,19 +150,6 @@ struct rt6_statistics {
  *
  */
 
-#define RTPRI_FIREWALL 8               /* Firewall control information */
-#define RTPRI_FLOW     16              /* Flow based forwarding rules  */
-#define RTPRI_KERN_CTL 32              /* Kernel control routes        */
-
-#define RTPRI_USER_MIN 256             /* Mimimum user priority        */
-#define RTPRI_USER_MAX 1024            /* Maximum user priority        */
-
-#define RTPRI_KERN_DFLT        4096            /* Kernel default routes        */
-
-#define        MAX_FLOW_BACKTRACE      32
-
-
-typedef void                   (*f_pnode)(struct fib6_node *fn, void *);
 
 struct fib6_table {
        struct hlist_node       tb6_hlist;
@@ -224,10 +211,20 @@ extern void                       fib6_run_gc(unsigned long dummy);
 
 extern void                    fib6_gc_cleanup(void);
 
-extern void                    fib6_init(void);
+extern int                     fib6_init(void);
 
-extern void                    fib6_rules_init(void);
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+extern int                     fib6_rules_init(void);
 extern void                    fib6_rules_cleanup(void);
-
+#else
+static inline int               fib6_rules_init(void)
+{
+       return 0;
+}
+static inline void              fib6_rules_cleanup(void)
+{
+       return ;
+}
+#endif
 #endif
 #endif