netfilter: nft_reject_bridge: restrict reject to prerouting and input

[linux-drm-fsl-dcu.git] / net / ipv6 / xfrm6_policy.c

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 2a0bbda2c76a99dfa687313d230595c251103b45..ac49f84fe2c34026b7af5392df06fc232ea3b9e1 100644 (file)
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -3,11 +3,11 @@
  *
  * Authors:
  *     Mitsuru KANDA @USAGI
- *     Kazunori MIYAZAWA @USAGI
- *     Kunihiro Ishiguro <kunihiro@ipinfusion.com>
- *             IPv6 support
- *     YOSHIFUJI Hideaki
- *             Split up af-specific portion
+ *     Kazunori MIYAZAWA @USAGI
+ *     Kunihiro Ishiguro <kunihiro@ipinfusion.com>
+ *             IPv6 support
+ *     YOSHIFUJI Hideaki
+ *             Split up af-specific portion
  *
  */
 
@@ -84,7 +84,7 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
                           int nfheader_len)
 {
        if (dst->ops->family == AF_INET6) {
-               struct rt6_info *rt = (struct rt6_info*)dst;
+               struct rt6_info *rt = (struct rt6_info *)dst;
                if (rt->rt6i_node)
                        path->path_cookie = rt->rt6i_node->fn_sernum;
        }
@@ -97,7 +97,7 @@ static int xfrm6_init_path(struct xfrm_dst *path, struct dst_entry *dst,
 static int xfrm6_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
                          const struct flowi *fl)
 {
-       struct rt6_info *rt = (struct rt6_info*)xdst->route;
+       struct rt6_info *rt = (struct rt6_info *)xdst->route;
 
        xdst->u.dst.dev = dev;
        dev_hold(dev);
@@ -296,7 +296,7 @@ static struct xfrm_policy_afinfo xfrm6_policy_afinfo = {
        .family =               AF_INET6,
        .dst_ops =              &xfrm6_dst_ops,
        .dst_lookup =           xfrm6_dst_lookup,
-       .get_saddr =            xfrm6_get_saddr,
+       .get_saddr =            xfrm6_get_saddr,
        .decode_session =       _decode_session6,
        .get_tos =              xfrm6_get_tos,
        .init_dst =             xfrm6_init_dst,
@@ -319,9 +319,9 @@ static void xfrm6_policy_fini(void)
 static struct ctl_table xfrm6_policy_table[] = {
        {
                .procname       = "xfrm6_gc_thresh",
-               .data           = &init_net.xfrm.xfrm6_dst_ops.gc_thresh,
-               .maxlen         = sizeof(int),
-               .mode           = 0644,
+               .data           = &init_net.xfrm.xfrm6_dst_ops.gc_thresh,
+               .maxlen         = sizeof(int),
+               .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
        { }