Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / net / ipv6 / xfrm6_state.c

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 3fc970135fc66583e5842943246993da7e2b69b4..8a1f9c0d2a13b27ae0b67c9eacf802f30e656115 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -3,11 +3,11 @@
  *
  * Authors:
  *     Mitsuru KANDA @USAGI
- *     Kazunori MIYAZAWA @USAGI
- *     Kunihiro Ishiguro <kunihiro@ipinfusion.com>
- *             IPv6 support
- *     YOSHIFUJI Hideaki @USAGI
- *             Split up af-specific portion
+ *     Kazunori MIYAZAWA @USAGI
+ *     Kunihiro Ishiguro <kunihiro@ipinfusion.com>
+ *             IPv6 support
+ *     YOSHIFUJI Hideaki @USAGI
+ *             Split up af-specific portion
  *
  */
 
@@ -45,10 +45,10 @@ xfrm6_init_temprop(struct xfrm_state *x, const struct xfrm_tmpl *tmpl,
                   const xfrm_address_t *daddr, const xfrm_address_t *saddr)
 {
        x->id = tmpl->id;
-       if (ipv6_addr_any((struct in6_addr*)&x->id.daddr))
+       if (ipv6_addr_any((struct in6_addr *)&x->id.daddr))
                memcpy(&x->id.daddr, daddr, sizeof(x->sel.daddr));
        memcpy(&x->props.saddr, &tmpl->saddr, sizeof(x->props.saddr));
-       if (ipv6_addr_any((struct in6_addr*)&x->props.saddr))
+       if (ipv6_addr_any((struct in6_addr *)&x->props.saddr))
                memcpy(&x->props.saddr, saddr, sizeof(x->props.saddr));
        x->props.mode = tmpl->mode;
        x->props.reqid = tmpl->reqid;