diff options
author | Ian Morris <ipm@chirality.org.uk> | 2014-08-24 16:53:10 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-08-25 01:37:52 -0400 |
commit | 67ba4152e8b77eada6a9c64e3c2c84d6112794fc (patch) | |
tree | 833bd7925ed3b69ef65f759c3f806cdaa8643d00 /net/ipv6/route.c | |
parent | a9b0b2faa8ed299ca617a317e2abb9ea1bf0e733 (diff) |
ipv6: White-space cleansing : Line Layouts
This patch makes no changes to the logic of the code but simply addresses
coding style issues as detected by checkpatch.
Both objdump and diff -w show no differences.
A number of items are addressed in this patch:
* Multiple spaces converted to tabs
* Spaces before tabs removed.
* Spaces in pointer typing cleansed (char *)foo etc.
* Remove space after sizeof
* Ensure spacing around comparators such as if statements.
Signed-off-by: Ian Morris <ipm@chirality.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index f23fbd28a501..76c793096893 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -813,7 +813,7 @@ out: | |||
813 | 813 | ||
814 | } | 814 | } |
815 | 815 | ||
816 | struct dst_entry * ip6_route_lookup(struct net *net, struct flowi6 *fl6, | 816 | struct dst_entry *ip6_route_lookup(struct net *net, struct flowi6 *fl6, |
817 | int flags) | 817 | int flags) |
818 | { | 818 | { |
819 | return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_lookup); | 819 | return fib6_rule_lookup(net, fl6, flags, ip6_pol_route_lookup); |
@@ -1024,7 +1024,7 @@ static struct rt6_info *ip6_pol_route_output(struct net *net, struct fib6_table | |||
1024 | return ip6_pol_route(net, table, fl6->flowi6_oif, fl6, flags); | 1024 | return ip6_pol_route(net, table, fl6->flowi6_oif, fl6, flags); |
1025 | } | 1025 | } |
1026 | 1026 | ||
1027 | struct dst_entry * ip6_route_output(struct net *net, const struct sock *sk, | 1027 | struct dst_entry *ip6_route_output(struct net *net, const struct sock *sk, |
1028 | struct flowi6 *fl6) | 1028 | struct flowi6 *fl6) |
1029 | { | 1029 | { |
1030 | int flags = 0; | 1030 | int flags = 0; |
@@ -1149,7 +1149,7 @@ static void ip6_link_failure(struct sk_buff *skb) | |||
1149 | static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, | 1149 | static void ip6_rt_update_pmtu(struct dst_entry *dst, struct sock *sk, |
1150 | struct sk_buff *skb, u32 mtu) | 1150 | struct sk_buff *skb, u32 mtu) |
1151 | { | 1151 | { |
1152 | struct rt6_info *rt6 = (struct rt6_info*)dst; | 1152 | struct rt6_info *rt6 = (struct rt6_info *)dst; |
1153 | 1153 | ||
1154 | dst_confirm(dst); | 1154 | dst_confirm(dst); |
1155 | if (mtu < dst_mtu(dst) && rt6->rt6i_dst.plen == 128) { | 1155 | if (mtu < dst_mtu(dst) && rt6->rt6i_dst.plen == 128) { |
@@ -1924,7 +1924,7 @@ static struct rt6_info *rt6_get_route_info(struct net *net, | |||
1924 | return NULL; | 1924 | return NULL; |
1925 | 1925 | ||
1926 | read_lock_bh(&table->tb6_lock); | 1926 | read_lock_bh(&table->tb6_lock); |
1927 | fn = fib6_locate(&table->tb6_root, prefix ,prefixlen, NULL, 0); | 1927 | fn = fib6_locate(&table->tb6_root, prefix, prefixlen, NULL, 0); |
1928 | if (!fn) | 1928 | if (!fn) |
1929 | goto out; | 1929 | goto out; |
1930 | 1930 | ||
@@ -1983,7 +1983,7 @@ struct rt6_info *rt6_get_dflt_router(const struct in6_addr *addr, struct net_dev | |||
1983 | return NULL; | 1983 | return NULL; |
1984 | 1984 | ||
1985 | read_lock_bh(&table->tb6_lock); | 1985 | read_lock_bh(&table->tb6_lock); |
1986 | for (rt = table->tb6_root.leaf; rt; rt=rt->dst.rt6_next) { | 1986 | for (rt = table->tb6_root.leaf; rt; rt = rt->dst.rt6_next) { |
1987 | if (dev == rt->dst.dev && | 1987 | if (dev == rt->dst.dev && |
1988 | ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) && | 1988 | ((rt->rt6i_flags & (RTF_ADDRCONF | RTF_DEFAULT)) == (RTF_ADDRCONF | RTF_DEFAULT)) && |
1989 | ipv6_addr_equal(&rt->rt6i_gateway, addr)) | 1989 | ipv6_addr_equal(&rt->rt6i_gateway, addr)) |
@@ -2068,7 +2068,7 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg) | |||
2068 | struct in6_rtmsg rtmsg; | 2068 | struct in6_rtmsg rtmsg; |
2069 | int err; | 2069 | int err; |
2070 | 2070 | ||
2071 | switch(cmd) { | 2071 | switch (cmd) { |
2072 | case SIOCADDRT: /* Add a route */ | 2072 | case SIOCADDRT: /* Add a route */ |
2073 | case SIOCDELRT: /* Delete a route */ | 2073 | case SIOCDELRT: /* Delete a route */ |
2074 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) | 2074 | if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) |
@@ -2191,7 +2191,7 @@ int ip6_route_get_saddr(struct net *net, | |||
2191 | unsigned int prefs, | 2191 | unsigned int prefs, |
2192 | struct in6_addr *saddr) | 2192 | struct in6_addr *saddr) |
2193 | { | 2193 | { |
2194 | struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt); | 2194 | struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); |
2195 | int err = 0; | 2195 | int err = 0; |
2196 | if (rt->rt6i_prefsrc.plen) | 2196 | if (rt->rt6i_prefsrc.plen) |
2197 | *saddr = rt->rt6i_prefsrc.addr; | 2197 | *saddr = rt->rt6i_prefsrc.addr; |
@@ -2486,7 +2486,7 @@ beginning: | |||
2486 | return last_err; | 2486 | return last_err; |
2487 | } | 2487 | } |
2488 | 2488 | ||
2489 | static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh) | 2489 | static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr *nlh) |
2490 | { | 2490 | { |
2491 | struct fib6_config cfg; | 2491 | struct fib6_config cfg; |
2492 | int err; | 2492 | int err; |
@@ -2501,7 +2501,7 @@ static int inet6_rtm_delroute(struct sk_buff *skb, struct nlmsghdr* nlh) | |||
2501 | return ip6_route_del(&cfg); | 2501 | return ip6_route_del(&cfg); |
2502 | } | 2502 | } |
2503 | 2503 | ||
2504 | static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr* nlh) | 2504 | static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh) |
2505 | { | 2505 | { |
2506 | struct fib6_config cfg; | 2506 | struct fib6_config cfg; |
2507 | int err; | 2507 | int err; |
@@ -2693,7 +2693,7 @@ int rt6_dump_route(struct rt6_info *rt, void *p_arg) | |||
2693 | prefix, 0, NLM_F_MULTI); | 2693 | prefix, 0, NLM_F_MULTI); |
2694 | } | 2694 | } |
2695 | 2695 | ||
2696 | static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr* nlh) | 2696 | static int inet6_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh) |
2697 | { | 2697 | { |
2698 | struct net *net = sock_net(in_skb->sk); | 2698 | struct net *net = sock_net(in_skb->sk); |
2699 | struct nlattr *tb[RTA_MAX+1]; | 2699 | struct nlattr *tb[RTA_MAX+1]; |