inet: whitespace cleanup

Ran simple script to find/remove trailing whitespace and blank lines
at EOF because that kind of stuff git whines about and editors leave
behind.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/ethoc.h b/include/net/ethoc.h
index bb7f467da7fcd6957ada0111b9d412f298ebc729..29ba069a1d93689497ece08c2a0201620c96466c 100644 (file)
--- a/include/net/ethoc.h
+++ b/include/net/ethoc.h
@@ -21,4 +21,3 @@ struct ethoc_platform_data {
 };
 
 #endif /* !LINUX_NET_ETHOC_H */
-

diff --git a/include/net/flow.h b/include/net/flow.h
index f1624fd5b1d03630c09f34106ba4aa2de45d7e5c..64e7ee9cb980c0b780ce31bcdc4e0ec6c6de9273 100644 (file)
--- a/include/net/flow.h
+++ b/include/net/flow.h
@@ -125,7 +125,7 @@ static inline void flowi4_update_output(struct flowi4 *fl4, int oif, __u8 tos,
        fl4->daddr = daddr;
        fl4->saddr = saddr;
 }
-                                     
+
 
 struct flowi6 {
        struct flowi_common     __fl_common;

diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index c1a93ce35e6239f3b4f0bd560ffe2fcd8baf41d7..b68fea022a82e19976a9dfbaa1cdc44192e1fc08 100644 (file)
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -49,9 +49,9 @@ struct inet_connection_sock_af_ops {
        u16         net_header_len;
        u16         net_frag_header_len;
        u16         sockaddr_len;
-       int         (*setsockopt)(struct sock *sk, int level, int optname, 
+       int         (*setsockopt)(struct sock *sk, int level, int optname,
                                  char __user *optval, unsigned int optlen);
-       int         (*getsockopt)(struct sock *sk, int level, int optname, 
+       int         (*getsockopt)(struct sock *sk, int level, int optname,
                                  char __user *optval, int __user *optlen);
 #ifdef CONFIG_COMPAT
        int         (*compat_setsockopt)(struct sock *sk,
@@ -67,7 +67,7 @@ struct inet_connection_sock_af_ops {
 
 /** inet_connection_sock - INET connection oriented sock
  *
- * @icsk_accept_queue:    FIFO of established children 
+ * @icsk_accept_queue:    FIFO of established children
  * @icsk_bind_hash:       Bind node
  * @icsk_timeout:         Timeout
  * @icsk_retransmit_timer: Resend (no ack)
@@ -122,7 +122,7 @@ struct inet_connection_sock {
                unsigned long     timeout;       /* Currently scheduled timeout            */
                __u32             lrcvtime;      /* timestamp of last received data packet */
                __u16             last_seg_size; /* Size of last incoming segment          */
-               __u16             rcv_mss;       /* MSS used for delayed ACK decisions     */ 
+               __u16             rcv_mss;       /* MSS used for delayed ACK decisions     */
        } icsk_ack;
        struct {
                int               enabled;
@@ -201,7 +201,7 @@ extern const char inet_csk_timer_bug_msg[];
 static inline void inet_csk_clear_xmit_timer(struct sock *sk, const int what)
 {
        struct inet_connection_sock *icsk = inet_csk(sk);
-       
+
        if (what == ICSK_TIME_RETRANS || what == ICSK_TIME_PROBE0) {
                icsk->icsk_pending = 0;
 #ifdef INET_CSK_CLEAR_TIMERS

diff --git a/include/net/ip.h b/include/net/ip.h
index 746abff9ce517ecbe1d580e5f53edfc93383da1a..fe63ba95d12b15828f767841d27746e7ef8895ca 100644 (file)
--- a/include/net/ip.h
+++ b/include/net/ip.h
@@ -186,15 +186,15 @@ int ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
 void ip4_datagram_release_cb(struct sock *sk);
 
 struct ip_reply_arg {
-       struct kvec iov[1];   
+       struct kvec iov[1];
        int         flags;
        __wsum      csum;
        int         csumoffset; /* u16 offset of csum in iov[0].iov_base */
-                               /* -1 if not needed */ 
+                               /* -1 if not needed */
        int         bound_dev_if;
        u8          tos;
        kuid_t      uid;
-}; 
+};
 
 #define IP_REPLY_ARG_NOSRCCHECK 1
 
@@ -577,13 +577,13 @@ int ip_frag_mem(struct net *net);
 /*
  *     Functions provided by ip_forward.c
  */
- 
+
 int ip_forward(struct sk_buff *skb);
- 
+
 /*
  *     Functions provided by ip_options.c
  */
- 
+
 void ip_options_build(struct sk_buff *skb, struct ip_options *opt,
                      __be32 daddr, struct rtable *rt, int is_frag);
 

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index f80524396c062db27dd4907a79a451fd9535e172..15e19c5c6f26fda881a38f45ecdaa18e7f5cfd76 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -157,7 +157,7 @@ struct fib_result_nl {
        unsigned char   nh_sel;
        unsigned char   type;
        unsigned char   scope;
-       int             err;      
+       int             err;
 };
 
 #ifdef CONFIG_IP_ROUTE_MULTIPATH

diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 7a98cd583c73ca858342a230daf371f5169f23ff..cabd3cdd40154b4dc6ee9e31c44a1536c8648a68 100644 (file)
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -105,8 +105,8 @@
 
 #define IPV6_ADDR_ANY          0x0000U
 
-#define IPV6_ADDR_UNICAST              0x0001U 
-#define IPV6_ADDR_MULTICAST            0x0002U 
+#define IPV6_ADDR_UNICAST      0x0001U
+#define IPV6_ADDR_MULTICAST    0x0002U
 
 #define IPV6_ADDR_LOOPBACK     0x0010U
 #define IPV6_ADDR_LINKLOCAL    0x0020U
@@ -447,7 +447,7 @@ ipv6_masked_addr_cmp(const struct in6_addr *a1, const struct in6_addr *m,
 #endif
 }
 
-static inline void ipv6_addr_prefix(struct in6_addr *pfx, 
+static inline void ipv6_addr_prefix(struct in6_addr *pfx,
                                    const struct in6_addr *addr,
                                    int plen)
 {
@@ -496,7 +496,7 @@ static inline void __ipv6_addr_set_half(__be32 *addr,
        addr[1] = wl;
 }
 
-static inline void ipv6_addr_set(struct in6_addr *addr, 
+static inline void ipv6_addr_set(struct in6_addr *addr,
                                     __be32 w1, __be32 w2,
                                     __be32 w3, __be32 w4)
 {
@@ -732,7 +732,7 @@ static inline int __ipv6_addr_diff32(const void *token1, const void *token2, int
        }
 
        /*
-        *      we should *never* get to this point since that 
+        *      we should *never* get to this point since that
         *      would mean the addrs are equal
         *
         *      However, we do get to it 8) And exacly, when

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 7d2077665c0b05c1716e808d2bfd6c56af65e3c8..aa027ba1d032ffa2c7483eb6f00dd94590582d85 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1267,12 +1267,12 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
 
 static inline void xfrm_sk_free_policy(struct sock *sk) {}
 static inline int xfrm_sk_clone_policy(struct sock *sk, const struct sock *osk) { return 0; }
-static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; }  
-static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; } 
+static inline int xfrm6_route_forward(struct sk_buff *skb) { return 1; }
+static inline int xfrm4_route_forward(struct sk_buff *skb) { return 1; }
 static inline int xfrm6_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
-{ 
-       return 1; 
-} 
+{
+       return 1;
+}
 static inline int xfrm4_policy_check(struct sock *sk, int dir, struct sk_buff *skb)
 {
        return 1;
@@ -1356,7 +1356,7 @@ __xfrm6_state_addr_check(const struct xfrm_state *x,
 {
        if (ipv6_addr_equal((struct in6_addr *)daddr, (struct in6_addr *)&x->id.daddr) &&
            (ipv6_addr_equal((struct in6_addr *)saddr, (struct in6_addr *)&x->props.saddr) ||
-            ipv6_addr_any((struct in6_addr *)saddr) || 
+            ipv6_addr_any((struct in6_addr *)saddr) ||
             ipv6_addr_any((struct in6_addr *)&x->props.saddr)))
                return 1;
        return 0;
@@ -1666,7 +1666,7 @@ int xfrm_user_policy(struct sock *sk, int optname,
 static inline int xfrm_user_policy(struct sock *sk, int optname, u8 __user *optval, int optlen)
 {
        return -ENOPROTOOPT;
-} 
+}
 
 static inline int xfrm4_udp_encap_rcv(struct sock *sk, struct sk_buff *skb)
 {

diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index cd46d7666598e6aa4b01eb2442e550c90d485d67..f31e6575ab91951e8ea2f4c9e4c73912ba544547 100644 (file)
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -171,7 +171,7 @@ static void free_nh_exceptions(struct fib_nh *nh)
                fnhe = rcu_dereference_protected(hash[i].chain, 1);
                while (fnhe) {
                        struct fib_nh_exception *next;
-                       
+
                        next = rcu_dereference_protected(fnhe->fnhe_next, 1);
 
                        rt_fibinfo_free(&fnhe->fnhe_rth_input);

diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index fdabc70283b646fe496a87228f380493eb8fd8ee..d97e83b2dd3336e14c6121d5d9d2dd7553f03a7b 100644 (file)
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -556,4 +556,3 @@ int __init ip_misc_proc_init(void)
 {
        return register_pernet_subsys(&ip_proc_ops);
 }
-

diff --git a/net/ipv4/tunnel4.c b/net/ipv4/tunnel4.c
index ec35eaa5c029d3eeaa5a34435658a3d829692234..c0630013c1aed55b9a515079eaa613ed6957a667 100644 (file)
--- a/net/ipv4/tunnel4.c
+++ b/net/ipv4/tunnel4.c
@@ -90,7 +90,7 @@ EXPORT_SYMBOL(xfrm4_tunnel_deregister);
        for (handler = rcu_dereference(head);           \
             handler != NULL;                           \
             handler = rcu_dereference(handler->next))  \
-       
+
 static int tunnel4_rcv(struct sk_buff *skb)
 {
        struct xfrm_tunnel *handler;

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 796ac4115485362cfd4711f1b7c56d820f9ee3c9..0c752dc3f93bc1fde92c10d93b16128ba640bcba 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -379,4 +379,3 @@ void __init xfrm4_init(void)
        xfrm4_protocol_init();
        register_pernet_subsys(&xfrm4_net_ops);
 }
-

diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index 8e085cc05aebb8ccc14e8fb4973789275c3d610b..d7d0abc7fd0ed3503ee4ff155f4178e5aeb49de1 100644 (file)
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -552,4 +552,3 @@ void ac6_proc_exit(struct net *net)
        remove_proc_entry("anycast6", net->proc_net);
 }
 #endif
-

diff --git a/net/ipv6/exthdrs_core.c b/net/ipv6/exthdrs_core.c
index 11025f8d124b86be72d51f9aa934ad1c85e04626..b643f5ce6c8078ff91f02555a33964acdedcded4 100644 (file)
--- a/net/ipv6/exthdrs_core.c
+++ b/net/ipv6/exthdrs_core.c
@@ -279,4 +279,3 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
        return nexthdr;
 }
 EXPORT_SYMBOL(ipv6_find_hdr);
-

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 24535169663dc501700c95e354761dd824e5a962..4d780c7f013060732dda2db760d7ba0474c812e3 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -1415,4 +1415,3 @@ int compat_ipv6_getsockopt(struct sock *sk, int level, int optname,
 }
 EXPORT_SYMBOL(compat_ipv6_getsockopt);
 #endif
-

diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index b8858c546f41b40598e73e04b5eda7e7e79e5670..1678cf03768859c358ce78036d5cde3a44ed5828 100644 (file)
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -355,4 +355,3 @@ void ipv6_misc_proc_exit(void)
 {
        unregister_pernet_subsys(&ipv6_proc_ops);
 }
-

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index b15075a5c227d29db0171a194f7cd83732e78069..16f434791763f01de79cc0bf1d74715384034392 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -196,4 +196,3 @@ void xfrm6_state_fini(void)
 {
        xfrm_state_unregister_afinfo(&xfrm6_state_afinfo);
 }
-