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>

1 files changed, 50 insertions, 50 deletions

diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 617f0958e164..70881795da96 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -232,7 +232,7 @@ int ipv6_sock_mc_drop(struct sock *sk, int ifindex, const struct in6_addr *addr)
         spin_lock(&ipv6_sk_mc_lock);
         for (lnk = &np->ipv6_mc_list;
              (mc_lst = rcu_dereference_protected(*lnk,
-                        lockdep_is_held(&ipv6_sk_mc_lock))) !=NULL ;
+                        lockdep_is_held(&ipv6_sk_mc_lock))) != NULL;
               lnk = &mc_lst->next) {
                 if ((ifindex == 0 || mc_lst->ifindex == ifindex) &&
                     ipv6_addr_equal(&mc_lst->addr, addr)) {
@@ -390,7 +390,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
                 if (!psl)
                         goto done;      /* err = -EADDRNOTAVAIL */
                 rv = !0;
-                for (i=0; i<psl->sl_count; i++) {
+                for (i = 0; i < psl->sl_count; i++) {
                         rv = !ipv6_addr_equal(&psl->sl_addr[i], source);
                         if (rv == 0)
                                 break;
@@ -407,7 +407,7 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
                 /* update the interface filter */
                 ip6_mc_del_src(idev, group, omode, 1, source, 1);
 
-                for (j=i+1; j<psl->sl_count; j++)
+                for (j = i+1; j < psl->sl_count; j++)
                         psl->sl_addr[j-1] = psl->sl_addr[j];
                 psl->sl_count--;
                 err = 0;
@@ -433,19 +433,19 @@ int ip6_mc_source(int add, int omode, struct sock *sk,
                 newpsl->sl_max = count;
                 newpsl->sl_count = count - IP6_SFBLOCK;
                 if (psl) {
-                        for (i=0; i<psl->sl_count; i++)
+                        for (i = 0; i < psl->sl_count; i++)
                                 newpsl->sl_addr[i] = psl->sl_addr[i];
                         sock_kfree_s(sk, psl, IP6_SFLSIZE(psl->sl_max));
                 }
                 pmc->sflist = psl = newpsl;
         }
         rv = 1; /* > 0 for insert logic below if sl_count is 0 */
-        for (i=0; i<psl->sl_count; i++) {
+        for (i = 0; i < psl->sl_count; i++) {
                 rv = !ipv6_addr_equal(&psl->sl_addr[i], source);
                 if (rv == 0) /* There is an error in the address. */
                         goto done;
         }
-        for (j=psl->sl_count-1; j>=i; j--)
+        for (j = psl->sl_count-1; j >= i; j--)
                 psl->sl_addr[j+1] = psl->sl_addr[j];
         psl->sl_addr[i] = *source;
         psl->sl_count++;
@@ -514,7 +514,7 @@ int ip6_mc_msfilter(struct sock *sk, struct group_filter *gsf)
                         goto done;
                 }
                 newpsl->sl_max = newpsl->sl_count = gsf->gf_numsrc;
-                for (i=0; i<newpsl->sl_count; ++i) {
+                for (i = 0; i < newpsl->sl_count; ++i) {
                         struct sockaddr_in6 *psin6;
 
                         psin6 = (struct sockaddr_in6 *)&gsf->gf_slist[i];
@@ -606,7 +606,7 @@ int ip6_mc_msfget(struct sock *sk, struct group_filter *gsf,
          * on ipv6_sk_mc_lock and a write lock on pmc->sflock. We
          * have the socket lock, so reading here is safe.
          */
-        for (i=0; i<copycount; i++) {
+        for (i = 0; i < copycount; i++) {
                 struct sockaddr_in6 *psin6;
                 struct sockaddr_storage ss;
 
@@ -648,7 +648,7 @@ bool inet6_mc_check(struct sock *sk, const struct in6_addr *mc_addr,
         } else {
                 int i;
 
-                for (i=0; i<psl->sl_count; i++) {
+                for (i = 0; i < psl->sl_count; i++) {
                         if (ipv6_addr_equal(&psl->sl_addr[i], src_addr))
                                 break;
                 }
@@ -762,7 +762,7 @@ static void mld_add_delrec(struct inet6_dev *idev, struct ifmcaddr6 *im)
                 pmc->mca_tomb = im->mca_tomb;
                 pmc->mca_sources = im->mca_sources;
                 im->mca_tomb = im->mca_sources = NULL;
-                for (psf=pmc->mca_sources; psf; psf=psf->sf_next)
+                for (psf = pmc->mca_sources; psf; psf = psf->sf_next)
                         psf->sf_crcount = pmc->mca_crcount;
         }
         spin_unlock_bh(&im->mca_lock);
@@ -780,7 +780,7 @@ static void mld_del_delrec(struct inet6_dev *idev, const struct in6_addr *pmca)
 
         spin_lock_bh(&idev->mc_lock);
         pmc_prev = NULL;
-        for (pmc=idev->mc_tomb; pmc; pmc=pmc->next) {
+        for (pmc = idev->mc_tomb; pmc; pmc = pmc->next) {
                 if (ipv6_addr_equal(&pmc->mca_addr, pmca))
                         break;
                 pmc_prev = pmc;
@@ -794,7 +794,7 @@ static void mld_del_delrec(struct inet6_dev *idev, const struct in6_addr *pmca)
         spin_unlock_bh(&idev->mc_lock);
 
         if (pmc) {
-                for (psf=pmc->mca_tomb; psf; psf=psf_next) {
+                for (psf = pmc->mca_tomb; psf; psf = psf_next) {
                         psf_next = psf->sf_next;
                         kfree(psf);
                 }
@@ -821,14 +821,14 @@ static void mld_clear_delrec(struct inet6_dev *idev)
 
         /* clear dead sources, too */
         read_lock_bh(&idev->lock);
-        for (pmc=idev->mc_list; pmc; pmc=pmc->next) {
+        for (pmc = idev->mc_list; pmc; pmc = pmc->next) {
                 struct ip6_sf_list *psf, *psf_next;
 
                 spin_lock_bh(&pmc->mca_lock);
                 psf = pmc->mca_tomb;
                 pmc->mca_tomb = NULL;
                 spin_unlock_bh(&pmc->mca_lock);
-                for (; psf; psf=psf_next) {
+                for (; psf; psf = psf_next) {
                         psf_next = psf->sf_next;
                         kfree(psf);
                 }
@@ -917,7 +917,7 @@ int __ipv6_dev_mc_dec(struct inet6_dev *idev, const struct in6_addr *addr)
         struct ifmcaddr6 *ma, **map;
 
         write_lock_bh(&idev->lock);
-        for (map = &idev->mc_list; (ma=*map) != NULL; map = &ma->next) {
+        for (map = &idev->mc_list; (ma = *map) != NULL; map = &ma->next) {
                 if (ipv6_addr_equal(&ma->mca_addr, addr)) {
                         if (--ma->mca_users == 0) {
                                 *map = ma->next;
@@ -968,7 +968,7 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
         idev = __in6_dev_get(dev);
         if (idev) {
                 read_lock_bh(&idev->lock);
-                for (mc = idev->mc_list; mc; mc=mc->next) {
+                for (mc = idev->mc_list; mc; mc = mc->next) {
                         if (ipv6_addr_equal(&mc->mca_addr, group))
                                 break;
                 }
@@ -977,7 +977,7 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
                                 struct ip6_sf_list *psf;
 
                                 spin_lock_bh(&mc->mca_lock);
-                                for (psf=mc->mca_sources;psf;psf=psf->sf_next) {
+                                for (psf = mc->mca_sources; psf; psf = psf->sf_next) {
                                         if (ipv6_addr_equal(&psf->sf_addr, src_addr))
                                                 break;
                                 }
@@ -986,7 +986,7 @@ bool ipv6_chk_mcast_addr(struct net_device *dev, const struct in6_addr *group,
                                                 psf->sf_count[MCAST_EXCLUDE] !=
                                                 mc->mca_sfcount[MCAST_EXCLUDE];
                                 else
-                                        rv = mc->mca_sfcount[MCAST_EXCLUDE] !=0;
+                                        rv = mc->mca_sfcount[MCAST_EXCLUDE] != 0;
                                 spin_unlock_bh(&mc->mca_lock);
                         } else
                                 rv = true; /* don't filter unspecified source */
@@ -1077,10 +1077,10 @@ static bool mld_xmarksources(struct ifmcaddr6 *pmc, int nsrcs,
         int i, scount;
 
         scount = 0;
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next) {
                 if (scount == nsrcs)
                         break;
-                for (i=0; i<nsrcs; i++) {
+                for (i = 0; i < nsrcs; i++) {
                         /* skip inactive filters */
                         if (psf->sf_count[MCAST_INCLUDE] ||
                             pmc->mca_sfcount[MCAST_EXCLUDE] !=
@@ -1110,10 +1110,10 @@ static bool mld_marksources(struct ifmcaddr6 *pmc, int nsrcs,
         /* mark INCLUDE-mode sources */
 
         scount = 0;
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next) {
                 if (scount == nsrcs)
                         break;
-                for (i=0; i<nsrcs; i++) {
+                for (i = 0; i < nsrcs; i++) {
                         if (ipv6_addr_equal(&srcs[i], &psf->sf_addr)) {
                                 psf->sf_gsresp = 1;
                                 scount++;
@@ -1364,13 +1364,13 @@ int igmp6_event_query(struct sk_buff *skb)
 
         read_lock_bh(&idev->lock);
         if (group_type == IPV6_ADDR_ANY) {
-                for (ma = idev->mc_list; ma; ma=ma->next) {
+                for (ma = idev->mc_list; ma; ma = ma->next) {
                         spin_lock_bh(&ma->mca_lock);
                         igmp6_group_queried(ma, max_delay);
                         spin_unlock_bh(&ma->mca_lock);
                 }
         } else {
-                for (ma = idev->mc_list; ma; ma=ma->next) {
+                for (ma = idev->mc_list; ma; ma = ma->next) {
                         if (!ipv6_addr_equal(group, &ma->mca_addr))
                                 continue;
                         spin_lock_bh(&ma->mca_lock);
@@ -1434,7 +1434,7 @@ int igmp6_event_report(struct sk_buff *skb)
          */
 
         read_lock_bh(&idev->lock);
-        for (ma = idev->mc_list; ma; ma=ma->next) {
+        for (ma = idev->mc_list; ma; ma = ma->next) {
                 if (ipv6_addr_equal(&ma->mca_addr, &mld->mld_mca)) {
                         spin_lock(&ma->mca_lock);
                         if (del_timer(&ma->mca_timer))
@@ -1498,7 +1498,7 @@ mld_scount(struct ifmcaddr6 *pmc, int type, int gdeleted, int sdeleted)
         struct ip6_sf_list *psf;
         int scount = 0;
 
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next) {
                 if (!is_in(pmc, psf, type, gdeleted, sdeleted))
                         continue;
                 scount++;
@@ -1712,7 +1712,7 @@ static struct sk_buff *add_grec(struct sk_buff *skb, struct ifmcaddr6 *pmc,
         }
         first = 1;
         psf_prev = NULL;
-        for (psf=*psf_list; psf; psf=psf_next) {
+        for (psf = *psf_list; psf; psf = psf_next) {
                 struct in6_addr *psrc;
 
                 psf_next = psf->sf_next;
@@ -1791,7 +1791,7 @@ static void mld_send_report(struct inet6_dev *idev, struct ifmcaddr6 *pmc)
 
         read_lock_bh(&idev->lock);
         if (!pmc) {
-                for (pmc=idev->mc_list; pmc; pmc=pmc->next) {
+                for (pmc = idev->mc_list; pmc; pmc = pmc->next) {
                         if (pmc->mca_flags & MAF_NOREPORT)
                                 continue;
                         spin_lock_bh(&pmc->mca_lock);
@@ -1824,7 +1824,7 @@ static void mld_clear_zeros(struct ip6_sf_list **ppsf)
         struct ip6_sf_list *psf_prev, *psf_next, *psf;
 
         psf_prev = NULL;
-        for (psf=*ppsf; psf; psf = psf_next) {
+        for (psf = *ppsf; psf; psf = psf_next) {
                 psf_next = psf->sf_next;
                 if (psf->sf_crcount == 0) {
                         if (psf_prev)
@@ -1848,7 +1848,7 @@ static void mld_send_cr(struct inet6_dev *idev)
 
         /* deleted MCA's */
         pmc_prev = NULL;
-        for (pmc=idev->mc_tomb; pmc; pmc=pmc_next) {
+        for (pmc = idev->mc_tomb; pmc; pmc = pmc_next) {
                 pmc_next = pmc->next;
                 if (pmc->mca_sfmode == MCAST_INCLUDE) {
                         type = MLD2_BLOCK_OLD_SOURCES;
@@ -1881,7 +1881,7 @@ static void mld_send_cr(struct inet6_dev *idev)
         spin_unlock(&idev->mc_lock);
 
         /* change recs */
-        for (pmc=idev->mc_list; pmc; pmc=pmc->next) {
+        for (pmc = idev->mc_list; pmc; pmc = pmc->next) {
                 spin_lock_bh(&pmc->mca_lock);
                 if (pmc->mca_sfcount[MCAST_EXCLUDE]) {
                         type = MLD2_BLOCK_OLD_SOURCES;
@@ -2018,7 +2018,7 @@ static void mld_send_initial_cr(struct inet6_dev *idev)
 
         skb = NULL;
         read_lock_bh(&idev->lock);
-        for (pmc=idev->mc_list; pmc; pmc=pmc->next) {
+        for (pmc = idev->mc_list; pmc; pmc = pmc->next) {
                 spin_lock_bh(&pmc->mca_lock);
                 if (pmc->mca_sfcount[MCAST_EXCLUDE])
                         type = MLD2_CHANGE_TO_EXCLUDE;
@@ -2063,7 +2063,7 @@ static int ip6_mc_del1_src(struct ifmcaddr6 *pmc, int sfmode,
         int rv = 0;
 
         psf_prev = NULL;
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next) {
                 if (ipv6_addr_equal(&psf->sf_addr, psfsrc))
                         break;
                 psf_prev = psf;
@@ -2104,7 +2104,7 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,
         if (!idev)
                 return -ENODEV;
         read_lock_bh(&idev->lock);
-        for (pmc=idev->mc_list; pmc; pmc=pmc->next) {
+        for (pmc = idev->mc_list; pmc; pmc = pmc->next) {
                 if (ipv6_addr_equal(pmca, &pmc->mca_addr))
                         break;
         }
@@ -2124,7 +2124,7 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,
                 pmc->mca_sfcount[sfmode]--;
         }
         err = 0;
-        for (i=0; i<sfcount; i++) {
+        for (i = 0; i < sfcount; i++) {
                 int rv = ip6_mc_del1_src(pmc, sfmode, &psfsrc[i]);
 
                 changerec |= rv > 0;
@@ -2140,7 +2140,7 @@ static int ip6_mc_del_src(struct inet6_dev *idev, const struct in6_addr *pmca,
                 pmc->mca_sfmode = MCAST_INCLUDE;
                 pmc->mca_crcount = idev->mc_qrv;
                 idev->mc_ifc_count = pmc->mca_crcount;
-                for (psf=pmc->mca_sources; psf; psf = psf->sf_next)
+                for (psf = pmc->mca_sources; psf; psf = psf->sf_next)
                         psf->sf_crcount = 0;
                 mld_ifc_event(pmc->idev);
         } else if (sf_setstate(pmc) || changerec)
@@ -2159,7 +2159,7 @@ static int ip6_mc_add1_src(struct ifmcaddr6 *pmc, int sfmode,
         struct ip6_sf_list *psf, *psf_prev;
 
         psf_prev = NULL;
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next) {
                 if (ipv6_addr_equal(&psf->sf_addr, psfsrc))
                         break;
                 psf_prev = psf;
@@ -2184,7 +2184,7 @@ static void sf_markstate(struct ifmcaddr6 *pmc)
         struct ip6_sf_list *psf;
         int mca_xcount = pmc->mca_sfcount[MCAST_EXCLUDE];
 
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next)
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next)
                 if (pmc->mca_sfcount[MCAST_EXCLUDE]) {
                         psf->sf_oldin = mca_xcount ==
                                 psf->sf_count[MCAST_EXCLUDE] &&
@@ -2201,7 +2201,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)
         int new_in, rv;
 
         rv = 0;
-        for (psf=pmc->mca_sources; psf; psf=psf->sf_next) {
+        for (psf = pmc->mca_sources; psf; psf = psf->sf_next) {
                 if (pmc->mca_sfcount[MCAST_EXCLUDE]) {
                         new_in = mca_xcount == psf->sf_count[MCAST_EXCLUDE] &&
                                 !psf->sf_count[MCAST_INCLUDE];
@@ -2211,8 +2211,8 @@ static int sf_setstate(struct ifmcaddr6 *pmc)
                         if (!psf->sf_oldin) {
                                 struct ip6_sf_list *prev = NULL;
 
-                                for (dpsf=pmc->mca_tomb; dpsf;
-                                     dpsf=dpsf->sf_next) {
+                                for (dpsf = pmc->mca_tomb; dpsf;
+                                     dpsf = dpsf->sf_next) {
                                         if (ipv6_addr_equal(&dpsf->sf_addr,
                                             &psf->sf_addr))
                                                 break;
@@ -2234,7 +2234,7 @@ static int sf_setstate(struct ifmcaddr6 *pmc)
                          * add or update "delete" records if an active filter
                          * is now inactive
                          */
-                        for (dpsf=pmc->mca_tomb; dpsf; dpsf=dpsf->sf_next)
+                        for (dpsf = pmc->mca_tomb; dpsf; dpsf = dpsf->sf_next)
                                 if (ipv6_addr_equal(&dpsf->sf_addr,
                                     &psf->sf_addr))
                                         break;
@@ -2268,7 +2268,7 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
         if (!idev)
                 return -ENODEV;
         read_lock_bh(&idev->lock);
-        for (pmc=idev->mc_list; pmc; pmc=pmc->next) {
+        for (pmc = idev->mc_list; pmc; pmc = pmc->next) {
                 if (ipv6_addr_equal(pmca, &pmc->mca_addr))
                         break;
         }
@@ -2284,7 +2284,7 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
         if (!delta)
                 pmc->mca_sfcount[sfmode]++;
         err = 0;
-        for (i=0; i<sfcount; i++) {
+        for (i = 0; i < sfcount; i++) {
                 err = ip6_mc_add1_src(pmc, sfmode, &psfsrc[i]);
                 if (err)
                         break;
@@ -2294,7 +2294,7 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
 
                 if (!delta)
                         pmc->mca_sfcount[sfmode]--;
-                for (j=0; j<i; j++)
+                for (j = 0; j < i; j++)
                         ip6_mc_del1_src(pmc, sfmode, &psfsrc[j]);
         } else if (isexclude != (pmc->mca_sfcount[MCAST_EXCLUDE] != 0)) {
                 struct ip6_sf_list *psf;
@@ -2308,7 +2308,7 @@ static int ip6_mc_add_src(struct inet6_dev *idev, const struct in6_addr *pmca,
 
                 pmc->mca_crcount = idev->mc_qrv;
                 idev->mc_ifc_count = pmc->mca_crcount;
-                for (psf=pmc->mca_sources; psf; psf = psf->sf_next)
+                for (psf = pmc->mca_sources; psf; psf = psf->sf_next)
                         psf->sf_crcount = 0;
                 mld_ifc_event(idev);
         } else if (sf_setstate(pmc))
@@ -2322,12 +2322,12 @@ static void ip6_mc_clear_src(struct ifmcaddr6 *pmc)
 {
         struct ip6_sf_list *psf, *nextpsf;
 
-        for (psf=pmc->mca_tomb; psf; psf=nextpsf) {
+        for (psf = pmc->mca_tomb; psf; psf = nextpsf) {
                 nextpsf = psf->sf_next;
                 kfree(psf);
         }
         pmc->mca_tomb = NULL;
-        for (psf=pmc->mca_sources; psf; psf=nextpsf) {
+        for (psf = pmc->mca_sources; psf; psf = nextpsf) {
                 nextpsf = psf->sf_next;
                 kfree(psf);
         }
@@ -2471,7 +2471,7 @@ void ipv6_mc_down(struct inet6_dev *idev)
         mld_gq_stop_timer(idev);
         mld_dad_stop_timer(idev);
 
-        for (i = idev->mc_list; i; i=i->next)
+        for (i = idev->mc_list; i; i = i->next)
                 igmp6_group_dropped(i);
         read_unlock_bh(&idev->lock);
 
@@ -2488,7 +2488,7 @@ void ipv6_mc_up(struct inet6_dev *idev)
         /* Install multicast list, except for all-nodes (already installed) */
 
         read_lock_bh(&idev->lock);
-        for (i = idev->mc_list; i; i=i->next)
+        for (i = idev->mc_list; i; i = i->next)
                 igmp6_group_added(i);
         read_unlock_bh(&idev->lock);
 }