[Bluetooth] Disable disconnect timer during Simple Pairing

[pandora-kernel.git] / include / net / ip6_fib.h

diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index d8d85b1..7c5c0f7 100644 (file)
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -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;
@@ -187,17 +174,19 @@ struct fib6_table {
 #define RT6_TABLE_LOCAL                RT6_TABLE_MAIN
 #endif
 
-typedef struct rt6_info *(*pol_lookup_t)(struct fib6_table *,
+typedef struct rt6_info *(*pol_lookup_t)(struct net *,
+                                        struct fib6_table *,
                                         struct flowi *, int);
 
 /*
  *     exported functions
  */
 
-extern struct fib6_table *     fib6_get_table(u32 id);
-extern struct fib6_table *     fib6_new_table(u32 id);
-extern struct dst_entry *      fib6_rule_lookup(struct flowi *fl, int flags,
-                                                pol_lookup_t lookup);
+extern struct fib6_table        *fib6_get_table(struct net *net, u32 id);
+extern struct fib6_table        *fib6_new_table(struct net *net, u32 id);
+extern struct dst_entry         *fib6_rule_lookup(struct net *net,
+                                                 struct flowi *fl, int flags,
+                                                 pol_lookup_t lookup);
 
 extern struct fib6_node                *fib6_lookup(struct fib6_node *root,
                                             struct in6_addr *daddr,
@@ -207,7 +196,8 @@ struct fib6_node            *fib6_locate(struct fib6_node *root,
                                             struct in6_addr *daddr, int dst_len,
                                             struct in6_addr *saddr, int src_len);
 
-extern void                    fib6_clean_all(int (*func)(struct rt6_info *, void *arg),
+extern void                    fib6_clean_all(struct net *net,
+                                              int (*func)(struct rt6_info *, void *arg),
                                               int prune, void *arg);
 
 extern int                     fib6_add(struct fib6_node *root,
@@ -220,7 +210,8 @@ extern int                  fib6_del(struct rt6_info *rt,
 extern void                    inet6_rt_notify(int event, struct rt6_info *rt,
                                                struct nl_info *info);
 
-extern void                    fib6_run_gc(unsigned long dummy);
+extern void                    fib6_run_gc(unsigned long expires,
+                                           struct net *net);
 
 extern void                    fib6_gc_cleanup(void);