projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
[linux-drm-fsl-dcu.git]
/
net
/
ipv6
/
fib6_rules.c
diff --git
a/net/ipv6/fib6_rules.c
b/net/ipv6/fib6_rules.c
index 5e463c43fcc27a3abdfaf257a0bae134819154ae..8e44f8f9c18846c8929e44b14e99c8825783916a 100644
(file)
--- a/
net/ipv6/fib6_rules.c
+++ b/
net/ipv6/fib6_rules.c
@@
-208,7
+208,6
@@
static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
{
struct fib6_rule *rule6 = (struct fib6_rule *) rule;
{
struct fib6_rule *rule6 = (struct fib6_rule *) rule;
- frh->family = AF_INET6;
frh->dst_len = rule6->dst.plen;
frh->src_len = rule6->src.plen;
frh->tos = rule6->tclass;
frh->dst_len = rule6->dst.plen;
frh->src_len = rule6->src.plen;
frh->tos = rule6->tclass;
@@
-238,7
+237,7
@@
static size_t fib6_rule_nlmsg_payload(struct fib_rule *rule)
+ nla_total_size(16); /* src */
}
+ nla_total_size(16); /* src */
}
-static
struct fib_rules_ops
fib6_rules_ops_template = {
+static
const struct fib_rules_ops __net_initdata
fib6_rules_ops_template = {
.family = AF_INET6,
.rule_size = sizeof(struct fib6_rule),
.addr_size = sizeof(struct in6_addr),
.family = AF_INET6,
.rule_size = sizeof(struct fib6_rule),
.addr_size = sizeof(struct in6_addr),