diff options
-rw-r--r-- | include/net/ip_fib.h | 5 | ||||
-rw-r--r-- | net/ipv4/fib_frontend.c | 5 |
2 files changed, 1 insertions, 9 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 82229146bac7..949b932d2f08 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -21,17 +21,14 @@ | |||
21 | #include <net/fib_rules.h> | 21 | #include <net/fib_rules.h> |
22 | 22 | ||
23 | struct fib_config { | 23 | struct fib_config { |
24 | u8 fc_family; | ||
25 | u8 fc_dst_len; | 24 | u8 fc_dst_len; |
26 | u8 fc_src_len; | ||
27 | u8 fc_tos; | 25 | u8 fc_tos; |
28 | u8 fc_protocol; | 26 | u8 fc_protocol; |
29 | u8 fc_scope; | 27 | u8 fc_scope; |
30 | u8 fc_type; | 28 | u8 fc_type; |
31 | /* 1 byte unused */ | 29 | /* 3 bytes unused */ |
32 | u32 fc_table; | 30 | u32 fc_table; |
33 | __be32 fc_dst; | 31 | __be32 fc_dst; |
34 | __be32 fc_src; | ||
35 | __be32 fc_gw; | 32 | __be32 fc_gw; |
36 | int fc_oif; | 33 | int fc_oif; |
37 | u32 fc_flags; | 34 | u32 fc_flags; |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 9c399a70dd5d..af0190d8b6c0 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -482,9 +482,7 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
482 | memset(cfg, 0, sizeof(*cfg)); | 482 | memset(cfg, 0, sizeof(*cfg)); |
483 | 483 | ||
484 | rtm = nlmsg_data(nlh); | 484 | rtm = nlmsg_data(nlh); |
485 | cfg->fc_family = rtm->rtm_family; | ||
486 | cfg->fc_dst_len = rtm->rtm_dst_len; | 485 | cfg->fc_dst_len = rtm->rtm_dst_len; |
487 | cfg->fc_src_len = rtm->rtm_src_len; | ||
488 | cfg->fc_tos = rtm->rtm_tos; | 486 | cfg->fc_tos = rtm->rtm_tos; |
489 | cfg->fc_table = rtm->rtm_table; | 487 | cfg->fc_table = rtm->rtm_table; |
490 | cfg->fc_protocol = rtm->rtm_protocol; | 488 | cfg->fc_protocol = rtm->rtm_protocol; |
@@ -501,9 +499,6 @@ static int rtm_to_fib_config(struct sk_buff *skb, struct nlmsghdr *nlh, | |||
501 | case RTA_DST: | 499 | case RTA_DST: |
502 | cfg->fc_dst = nla_get_be32(attr); | 500 | cfg->fc_dst = nla_get_be32(attr); |
503 | break; | 501 | break; |
504 | case RTA_SRC: | ||
505 | cfg->fc_src = nla_get_be32(attr); | ||
506 | break; | ||
507 | case RTA_OIF: | 502 | case RTA_OIF: |
508 | cfg->fc_oif = nla_get_u32(attr); | 503 | cfg->fc_oif = nla_get_u32(attr); |
509 | break; | 504 | break; |