1 files changed, 8 insertions, 12 deletions

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 1c015665ce71..76ef4353d518 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1481,18 +1481,14 @@ void ndisc_send_redirect(struct sk_buff *skb, const struct in6_addr *target)
         if (!buff)
                 goto release;
 
-        skb_put(buff, sizeof(*msg));
-        msg = (struct rd_msg *)icmp6_hdr(buff);
-
-        memset(&msg->icmph, 0, sizeof(struct icmp6hdr));
-        msg->icmph.icmp6_type = NDISC_REDIRECT;
-
-        /*
-         *      copy target and destination addresses
-         */
-
-        msg->target = *target;
-        msg->dest = ipv6_hdr(skb)->daddr;
+        msg = (struct rd_msg *)skb_put(buff, sizeof(*msg));
+        *msg = (struct rd_msg) {
+                .icmph = {
+                        .icmp6_type = NDISC_REDIRECT,
+                },
+                .target = *target,
+                .dest = ipv6_hdr(skb)->daddr,
+        };
 
         /*
          *      include target_address option