6 files changed, 27 insertions, 27 deletions

diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index 8086787a2c51..6feeb1f1c9cc 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -494,8 +494,8 @@ int ip_vs_check_template(struct ip_vs_conn *ct)
          * Checking the dest server status.
          */
         if ((dest == NULL) ||
-            !(dest->flags & IP_VS_DEST_F_AVAILABLE) || 
-            (sysctl_ip_vs_expire_quiescent_template && 
+            !(dest->flags & IP_VS_DEST_F_AVAILABLE) ||
+            (sysctl_ip_vs_expire_quiescent_template &&
              (atomic_read(&dest->weight) == 0))) {
                 IP_VS_DBG(9, "check_template: dest not available for "
                           "protocol %s s:%u.%u.%u.%u:%d v:%u.%u.%u.%u:%d "
@@ -667,7 +667,7 @@ static void *ip_vs_conn_array(struct seq_file *seq, loff_t pos)
 {
         int idx;
         struct ip_vs_conn *cp;
-        
+
         for(idx = 0; idx < IP_VS_CONN_TAB_SIZE; idx++) {
                 ct_read_lock_bh(idx);
                 list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) {
@@ -695,7 +695,7 @@ static void *ip_vs_conn_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         int idx;
 
         ++*pos;
-        if (v == SEQ_START_TOKEN) 
+        if (v == SEQ_START_TOKEN)
                 return ip_vs_conn_array(seq, 0);
 
         /* more on same hash chain? */
@@ -710,7 +710,7 @@ static void *ip_vs_conn_seq_next(struct seq_file *seq, void *v, loff_t *pos)
                 list_for_each_entry(cp, &ip_vs_conn_tab[idx], c_list) {
                         seq->private = &ip_vs_conn_tab[idx];
                         return cp;
-                }       
+                }
                 ct_read_unlock_bh(idx);
         }
         seq->private = NULL;
diff --git a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
index 34257520a3a6..24d7b66eb6d2 100644
--- a/net/ipv4/ipvs/ip_vs_core.c
+++ b/net/ipv4/ipvs/ip_vs_core.c
@@ -813,14 +813,14 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb,
         skb->nh.iph->saddr = cp->vaddr;
         ip_send_check(skb->nh.iph);
 
-        /* For policy routing, packets originating from this
-         * machine itself may be routed differently to packets
-         * passing through.  We want this packet to be routed as
-         * if it came from this machine itself.  So re-compute
-         * the routing information.
-         */
-        if (ip_route_me_harder(pskb, RTN_LOCAL) != 0)
-                goto drop;
+        /* For policy routing, packets originating from this
+         * machine itself may be routed differently to packets
+         * passing through.  We want this packet to be routed as
+         * if it came from this machine itself.  So re-compute
+         * the routing information.
+         */
+        if (ip_route_me_harder(pskb, RTN_LOCAL) != 0)
+                goto drop;
         skb = *pskb;
 
         IP_VS_DBG_PKT(10, pp, skb, 0, "After SNAT");
@@ -847,7 +847,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff **pskb,
  *      forward to the right destination host if relevant.
  *      Currently handles error types - unreachable, quench, ttl exceeded.
  */
-static int 
+static int
 ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum)
 {
         struct sk_buff *skb = *pskb;
@@ -863,7 +863,7 @@ ip_vs_in_icmp(struct sk_buff **pskb, int *related, unsigned int hooknum)
         /* reassemble IP fragments */
         if (skb->nh.iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) {
                 skb = ip_vs_gather_frags(skb,
-                                         hooknum == NF_IP_LOCAL_IN ?
+                                         hooknum == NF_IP_LOCAL_IN ?
                                          IP_DEFRAG_VS_IN : IP_DEFRAG_VS_FWD);
                 if (!skb)
                         return NF_STOLEN;
diff --git a/net/ipv4/ipvs/ip_vs_ftp.c b/net/ipv4/ipvs/ip_vs_ftp.c
index 687c1de1146f..847c47af040c 100644
--- a/net/ipv4/ipvs/ip_vs_ftp.c
+++ b/net/ipv4/ipvs/ip_vs_ftp.c
@@ -370,7 +370,7 @@ static int __init ip_vs_ftp_init(void)
                 if (ret)
                         break;
                 IP_VS_INFO("%s: loaded support on port[%d] = %d\n",
-                           app->name, i, ports[i]);
+                           app->name, i, ports[i]);
         }
 
         if (ret)
diff --git a/net/ipv4/ipvs/ip_vs_lblc.c b/net/ipv4/ipvs/ip_vs_lblc.c
index a4385a2180ee..76fd1fb91878 100644
--- a/net/ipv4/ipvs/ip_vs_lblc.c
+++ b/net/ipv4/ipvs/ip_vs_lblc.c
@@ -118,7 +118,7 @@ static ctl_table vs_vars_table[] = {
                 .procname       = "lblc_expiration",
                 .data           = &sysctl_ip_vs_lblc_expiration,
                 .maxlen         = sizeof(int),
-                .mode           = 0644, 
+                .mode           = 0644,
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         { .ctl_name = 0 }
@@ -128,7 +128,7 @@ static ctl_table vs_table[] = {
         {
                 .ctl_name       = NET_IPV4_VS,
                 .procname       = "vs",
-                .mode           = 0555, 
+                .mode           = 0555,
                 .child          = vs_vars_table
         },
         { .ctl_name = 0 }
@@ -137,7 +137,7 @@ static ctl_table vs_table[] = {
 static ctl_table ipvs_ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4,
-                .procname       = "ipv4", 
+                .procname       = "ipv4",
                 .mode           = 0555,
                 .child          = vs_table
         },
@@ -147,8 +147,8 @@ static ctl_table ipvs_ipv4_table[] = {
 static ctl_table lblc_root_table[] = {
         {
                 .ctl_name       = CTL_NET,
-                .procname       = "net", 
-                .mode           = 0555, 
+                .procname       = "net",
+                .mode           = 0555,
                 .child          = ipvs_ipv4_table
         },
         { .ctl_name = 0 }
@@ -288,7 +288,7 @@ static inline void ip_vs_lblc_full_check(struct ip_vs_lblc_table *tbl)
 
                 write_lock(&tbl->lock);
                 list_for_each_entry_safe(en, nxt, &tbl->bucket[j], list) {
-                        if (time_before(now, 
+                        if (time_before(now,
                                         en->lastuse + sysctl_ip_vs_lblc_expiration))
                                 continue;
 
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index fe1af5d079af..bf1e7f272b84 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -307,7 +307,7 @@ static ctl_table vs_vars_table[] = {
                 .procname       = "lblcr_expiration",
                 .data           = &sysctl_ip_vs_lblcr_expiration,
                 .maxlen         = sizeof(int),
-                .mode           = 0644, 
+                .mode           = 0644,
                 .proc_handler   = &proc_dointvec_jiffies,
         },
         { .ctl_name = 0 }
@@ -326,7 +326,7 @@ static ctl_table vs_table[] = {
 static ctl_table ipvs_ipv4_table[] = {
         {
                 .ctl_name       = NET_IPV4,
-                .procname       = "ipv4", 
+                .procname       = "ipv4",
                 .mode           = 0555,
                 .child          = vs_table
         },
@@ -336,8 +336,8 @@ static ctl_table ipvs_ipv4_table[] = {
 static ctl_table lblcr_root_table[] = {
         {
                 .ctl_name       = CTL_NET,
-                .procname       = "net", 
-                .mode           = 0555, 
+                .procname       = "net",
+                .mode           = 0555,
                 .child          = ipvs_ipv4_table
         },
         { .ctl_name = 0 }
diff --git a/net/ipv4/ipvs/ip_vs_rr.c b/net/ipv4/ipvs/ip_vs_rr.c
index b23bab231cab..433f8a947924 100644
--- a/net/ipv4/ipvs/ip_vs_rr.c
+++ b/net/ipv4/ipvs/ip_vs_rr.c
@@ -68,7 +68,7 @@ ip_vs_rr_schedule(struct ip_vs_service *svc, const struct sk_buff *skb)
                         q = q->next;
                         continue;
                 }
-                
+
                 dest = list_entry(q, struct ip_vs_dest, n_list);
                 if (!(dest->flags & IP_VS_DEST_F_OVERLOAD) &&
                     atomic_read(&dest->weight) > 0)