diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-27 15:57:39 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-27 15:57:39 -0400 |
| commit | bb611874650cff942a7466b456a791e8bfa641e7 (patch) | |
| tree | 32e048e3240dd808e7787ff2b7eb50ed9f0a6182 /net/ipv6 | |
| parent | d328bc839eac685cdd91f5d9d8ad95c070252038 (diff) | |
| parent | cb6a4e461fb427689920472bd7335f926d521747 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/ipmr-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/fib6_rules.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index 8124f16f2ac2..8e44f8f9c188 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c | |||
| @@ -237,8 +237,8 @@ static size_t fib6_rule_nlmsg_payload(struct fib_rule *rule) | |||
| 237 | + nla_total_size(16); /* src */ | 237 | + nla_total_size(16); /* src */ |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | static struct fib_rules_ops fib6_rules_ops_template = { | 240 | static const struct fib_rules_ops __net_initdata fib6_rules_ops_template = { |
| 241 | .family = FIB_RULES_IPV6, | 241 | .family = AF_INET6, |
| 242 | .rule_size = sizeof(struct fib6_rule), | 242 | .rule_size = sizeof(struct fib6_rule), |
| 243 | .addr_size = sizeof(struct in6_addr), | 243 | .addr_size = sizeof(struct in6_addr), |
| 244 | .action = fib6_rule_action, | 244 | .action = fib6_rule_action, |