From: Maciej Żenczykowski <m...@google.com>

(allows for better compiler optimization)

Signed-off-by: Maciej Żenczykowski <m...@google.com>
---
 net/ipv6/route.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index d28f83e01593..6f252fa914c2 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2508,16 +2508,15 @@ void ip6_redirect(struct sk_buff *skb, struct net *net, 
int oif, u32 mark,
 {
        const struct ipv6hdr *iph = (struct ipv6hdr *) skb->data;
        struct dst_entry *dst;
-       struct flowi6 fl6;
-
-       memset(&fl6, 0, sizeof(fl6));
-       fl6.flowi6_iif = LOOPBACK_IFINDEX;
-       fl6.flowi6_oif = oif;
-       fl6.flowi6_mark = mark;
-       fl6.daddr = iph->daddr;
-       fl6.saddr = iph->saddr;
-       fl6.flowlabel = ip6_flowinfo(iph);
-       fl6.flowi6_uid = uid;
+       struct flowi6 fl6 = {
+               .flowi6_iif = LOOPBACK_IFINDEX,
+               .flowi6_oif = oif,
+               .flowi6_mark = mark,
+               .daddr = iph->daddr,
+               .saddr = iph->saddr,
+               .flowlabel = ip6_flowinfo(iph),
+               .flowi6_uid = uid,
+       };
 
        dst = ip6_route_redirect(net, &fl6, skb, &ipv6_hdr(skb)->saddr);
        rt6_do_redirect(dst, NULL, skb);
-- 
2.19.0.605.g01d371f741-goog

Reply via email to