aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/ip6_flowlabel.c
diff options
context:
space:
mode:
authorIan Morris <ipm@chirality.org.uk>2014-08-24 16:53:10 -0400
committerDavid S. Miller <davem@davemloft.net>2014-08-25 01:37:52 -0400
commit67ba4152e8b77eada6a9c64e3c2c84d6112794fc (patch)
tree833bd7925ed3b69ef65f759c3f806cdaa8643d00 /net/ipv6/ip6_flowlabel.c
parenta9b0b2faa8ed299ca617a317e2abb9ea1bf0e733 (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/ip6_flowlabel.c')
-rw-r--r--net/ipv6/ip6_flowlabel.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 4052694c6f2c..2ace4749bef4 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -136,7 +136,7 @@ static void ip6_fl_gc(unsigned long dummy)
136 136
137 spin_lock(&ip6_fl_lock); 137 spin_lock(&ip6_fl_lock);
138 138
139 for (i=0; i<=FL_HASH_MASK; i++) { 139 for (i = 0; i <= FL_HASH_MASK; i++) {
140 struct ip6_flowlabel *fl; 140 struct ip6_flowlabel *fl;
141 struct ip6_flowlabel __rcu **flp; 141 struct ip6_flowlabel __rcu **flp;
142 142
@@ -239,7 +239,7 @@ static struct ip6_flowlabel *fl_intern(struct net *net,
239 239
240/* Socket flowlabel lists */ 240/* Socket flowlabel lists */
241 241
242struct ip6_flowlabel * fl6_sock_lookup(struct sock *sk, __be32 label) 242struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label)
243{ 243{
244 struct ipv6_fl_socklist *sfl; 244 struct ipv6_fl_socklist *sfl;
245 struct ipv6_pinfo *np = inet6_sk(sk); 245 struct ipv6_pinfo *np = inet6_sk(sk);
@@ -293,11 +293,11 @@ void fl6_free_socklist(struct sock *sk)
293 following rthdr. 293 following rthdr.
294 */ 294 */
295 295
296struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space, 296struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions *opt_space,
297 struct ip6_flowlabel * fl, 297 struct ip6_flowlabel *fl,
298 struct ipv6_txoptions * fopt) 298 struct ipv6_txoptions *fopt)
299{ 299{
300 struct ipv6_txoptions * fl_opt = fl->opt; 300 struct ipv6_txoptions *fl_opt = fl->opt;
301 301
302 if (fopt == NULL || fopt->opt_flen == 0) 302 if (fopt == NULL || fopt->opt_flen == 0)
303 return fl_opt; 303 return fl_opt;
@@ -388,7 +388,7 @@ fl_create(struct net *net, struct sock *sk, struct in6_flowlabel_req *freq,
388 goto done; 388 goto done;
389 389
390 msg.msg_controllen = olen; 390 msg.msg_controllen = olen;
391 msg.msg_control = (void*)(fl->opt+1); 391 msg.msg_control = (void *)(fl->opt+1);
392 memset(&flowi6, 0, sizeof(flowi6)); 392 memset(&flowi6, 0, sizeof(flowi6));
393 393
394 err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt, 394 err = ip6_datagram_send_ctl(net, sk, &msg, &flowi6, fl->opt,
@@ -517,7 +517,7 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
517 struct net *net = sock_net(sk); 517 struct net *net = sock_net(sk);
518 struct ipv6_pinfo *np = inet6_sk(sk); 518 struct ipv6_pinfo *np = inet6_sk(sk);
519 struct in6_flowlabel_req freq; 519 struct in6_flowlabel_req freq;
520 struct ipv6_fl_socklist *sfl1=NULL; 520 struct ipv6_fl_socklist *sfl1 = NULL;
521 struct ipv6_fl_socklist *sfl; 521 struct ipv6_fl_socklist *sfl;
522 struct ipv6_fl_socklist __rcu **sflp; 522 struct ipv6_fl_socklist __rcu **sflp;
523 struct ip6_flowlabel *fl, *fl1 = NULL; 523 struct ip6_flowlabel *fl, *fl1 = NULL;
@@ -542,7 +542,7 @@ int ipv6_flowlabel_opt(struct sock *sk, char __user *optval, int optlen)
542 } 542 }
543 spin_lock_bh(&ip6_sk_fl_lock); 543 spin_lock_bh(&ip6_sk_fl_lock);
544 for (sflp = &np->ipv6_fl_list; 544 for (sflp = &np->ipv6_fl_list;
545 (sfl = rcu_dereference(*sflp))!=NULL; 545 (sfl = rcu_dereference(*sflp)) != NULL;
546 sflp = &sfl->next) { 546 sflp = &sfl->next) {
547 if (sfl->fl->label == freq.flr_label) { 547 if (sfl->fl->label == freq.flr_label) {
548 if (freq.flr_label == (np->flow_label&IPV6_FLOWLABEL_MASK)) 548 if (freq.flr_label == (np->flow_label&IPV6_FLOWLABEL_MASK))