git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bluetooth: Fix double L2CAP connection request
[safe/jmp/linux-2.6]
/
include
/
net
/
fib_rules.h
diff --git
a/include/net/fib_rules.h
b/include/net/fib_rules.h
index
e4ba781
..
c2bb5ca
100644
(file)
--- a/
include/net/fib_rules.h
+++ b/
include/net/fib_rules.h
@@
-5,7
+5,7
@@
#include <linux/netdevice.h>
#include <linux/fib_rules.h>
#include <net/flow.h>
#include <linux/netdevice.h>
#include <linux/fib_rules.h>
#include <net/flow.h>
-#include <net/netlink.h>
+#include <net/
rt
netlink.h>
struct fib_rule
{
struct fib_rule
{
@@
-19,7
+19,10
@@
struct fib_rule
u32 flags;
u32 table;
u8 action;
u32 flags;
u32 table;
u8 action;
+ u32 target;
+ struct fib_rule * ctarget;
struct rcu_head rcu;
struct rcu_head rcu;
+ struct net * fr_net;
};
struct fib_lookup_arg
};
struct fib_lookup_arg
@@
-34,6
+37,9
@@
struct fib_rules_ops
int family;
struct list_head list;
int rule_size;
int family;
struct list_head list;
int rule_size;
+ int addr_size;
+ int unresolved_rules;
+ int nr_goto_rules;
int (*action)(struct fib_rule *,
struct flowi *, int,
int (*action)(struct fib_rule *,
struct flowi *, int,
@@
-51,12
+57,18
@@
struct fib_rules_ops
int (*fill)(struct fib_rule *, struct sk_buff *,
struct nlmsghdr *,
struct fib_rule_hdr *);
int (*fill)(struct fib_rule *, struct sk_buff *,
struct nlmsghdr *,
struct fib_rule_hdr *);
- u32 (*default_pref)(void);
+ u32 (*default_pref)(struct fib_rules_ops *ops);
+ size_t (*nlmsg_payload)(struct fib_rule *);
+
+ /* Called after modifications to the rules set, must flush
+ * the route cache if one exists. */
+ void (*flush_cache)(struct fib_rules_ops *ops);
int nlgroup;
int nlgroup;
-
struct nla_policy
*policy;
- struct list_head
*
rules_list;
+
const struct nla_policy
*policy;
+ struct list_head rules_list;
struct module *owner;
struct module *owner;
+ struct net *fro_net;
};
#define FRA_GENERIC_POLICY \
};
#define FRA_GENERIC_POLICY \
@@
-64,7
+76,8
@@
struct fib_rules_ops
[FRA_PRIORITY] = { .type = NLA_U32 }, \
[FRA_FWMARK] = { .type = NLA_U32 }, \
[FRA_FWMASK] = { .type = NLA_U32 }, \
[FRA_PRIORITY] = { .type = NLA_U32 }, \
[FRA_FWMARK] = { .type = NLA_U32 }, \
[FRA_FWMASK] = { .type = NLA_U32 }, \
- [FRA_TABLE] = { .type = NLA_U32 }
+ [FRA_TABLE] = { .type = NLA_U32 }, \
+ [FRA_GOTO] = { .type = NLA_U32 }
static inline void fib_rule_get(struct fib_rule *rule)
{
static inline void fib_rule_get(struct fib_rule *rule)
{
@@
-74,6
+87,7
@@
static inline void fib_rule_get(struct fib_rule *rule)
static inline void fib_rule_put_rcu(struct rcu_head *head)
{
struct fib_rule *rule = container_of(head, struct fib_rule, rcu);
static inline void fib_rule_put_rcu(struct rcu_head *head)
{
struct fib_rule *rule = container_of(head, struct fib_rule, rcu);
+ release_net(rule->fr_net);
kfree(rule);
}
kfree(rule);
}
@@
-90,17
+104,14
@@
static inline u32 frh_get_table(struct fib_rule_hdr *frh, struct nlattr **nla)
return frh->table;
}
return frh->table;
}
-extern int fib_rules_register(struct fib_rules_ops *);
-extern int fib_rules_unregister(struct fib_rules_ops *);
+extern int fib_rules_register(struct fib_rules_ops *);
+extern void fib_rules_unregister(struct fib_rules_ops *);
+extern void fib_rules_cleanup_ops(struct fib_rules_ops *);
extern int fib_rules_lookup(struct fib_rules_ops *,
struct flowi *, int flags,
struct fib_lookup_arg *);
extern int fib_rules_lookup(struct fib_rules_ops *,
struct flowi *, int flags,
struct fib_lookup_arg *);
-
-extern int fib_nl_newrule(struct sk_buff *,
- struct nlmsghdr *, void *);
-extern int fib_nl_delrule(struct sk_buff *,
- struct nlmsghdr *, void *);
-extern int fib_rules_dump(struct sk_buff *,
- struct netlink_callback *, int);
+extern int fib_default_rule_add(struct fib_rules_ops *,
+ u32 pref, u32 table,
+ u32 flags);
#endif
#endif