aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/fib_frontend.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/fib_frontend.c')
-rw-r--r--net/ipv4/fib_frontend.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index fe10bcd0f307..76105284a81c 100644
--- a/net/ipv4/fib_frontend.c
+++ b/net/ipv4/fib_frontend.c
@@ -200,9 +200,9 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
200 int ret; 200 int ret;
201 struct net *net; 201 struct net *net;
202 202
203 fl.oif = 0; 203 fl.flowi_oif = 0;
204 fl.iif = oif; 204 fl.flowi_iif = oif;
205 fl.mark = mark; 205 fl.flowi_mark = mark;
206 fl.fl4_dst = src; 206 fl.fl4_dst = src;
207 fl.fl4_src = dst; 207 fl.fl4_src = dst;
208 fl.fl4_tos = tos; 208 fl.fl4_tos = tos;
@@ -215,7 +215,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
215 rpf = IN_DEV_RPFILTER(in_dev); 215 rpf = IN_DEV_RPFILTER(in_dev);
216 accept_local = IN_DEV_ACCEPT_LOCAL(in_dev); 216 accept_local = IN_DEV_ACCEPT_LOCAL(in_dev);
217 if (mark && !IN_DEV_SRC_VMARK(in_dev)) 217 if (mark && !IN_DEV_SRC_VMARK(in_dev))
218 fl.mark = 0; 218 fl.flowi_mark = 0;
219 } 219 }
220 220
221 if (in_dev == NULL) 221 if (in_dev == NULL)
@@ -253,7 +253,7 @@ int fib_validate_source(__be32 src, __be32 dst, u8 tos, int oif,
253 goto last_resort; 253 goto last_resort;
254 if (rpf == 1) 254 if (rpf == 1)
255 goto e_rpf; 255 goto e_rpf;
256 fl.oif = dev->ifindex; 256 fl.flowi_oif = dev->ifindex;
257 257
258 ret = 0; 258 ret = 0;
259 if (fib_lookup(net, &fl, &res) == 0) { 259 if (fib_lookup(net, &fl, &res) == 0) {
@@ -797,7 +797,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb)
797 797
798 struct fib_result res; 798 struct fib_result res;
799 struct flowi fl = { 799 struct flowi fl = {
800 .mark = frn->fl_mark, 800 .flowi_mark = frn->fl_mark,
801 .fl4_dst = frn->fl_addr, 801 .fl4_dst = frn->fl_addr,
802 .fl4_tos = frn->fl_tos, 802 .fl4_tos = frn->fl_tos,
803 .fl4_scope = frn->fl_scope, 803 .fl4_scope = frn->fl_scope,