net: clean up codestyle

This is a pure codestyle cleanup patch. No functional change intended.

Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dst.h b/include/net/dst.h
index 6ae2e625050dbd9da571f5f75f36986d9b56c94c..8ea8812b0b41891177b0900dda14397b23c1038b 100644 (file)
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -214,7 +214,7 @@ dst_allfrag(const struct dst_entry *dst)
 static inline int
 dst_metric_locked(const struct dst_entry *dst, int metric)
 {
-       return dst_metric(dst, RTAX_LOCK) & (1<<metric);
+       return dst_metric(dst, RTAX_LOCK) & (1 << metric);
 }
 
 static inline void dst_hold(struct dst_entry *dst)

diff --git a/include/net/sock.h b/include/net/sock.h
index 064637d1ddf60e8ebc950f4aa14bda06da0d57f3..b943731fa879df80fa3406ead50decbe5147e6b1 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1478,7 +1478,7 @@ sk_rmem_schedule(struct sock *sk, struct sk_buff *skb, int size)
 {
        if (!sk_has_account(sk))
                return true;
-       return size<= sk->sk_forward_alloc ||
+       return size <= sk->sk_forward_alloc ||
                __sk_mem_schedule(sk, size, SK_MEM_RECV) ||
                skb_pfmemalloc(skb);
 }

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 3b387dc3864f35f088e65e0aa0aafacf9aa5daf4..8f2e974a1e4d78acbcf48732bb17050b2e616a26 100644 (file)
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -784,7 +784,7 @@ EXPORT_SYMBOL(icmp_ndo_send);
 
 static void icmp_socket_deliver(struct sk_buff *skb, u32 info)
 {
-       const struct iphdr *iph = (const struct iphdr *) skb->data;
+       const struct iphdr *iph = (const struct iphdr *)skb->data;
        const struct net_protocol *ipprot;
        int protocol = iph->protocol;
 

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index f0f234727547a087c0a677c138a4aa531211bf60..b931d0b02e49cf9b8f05690cc62f5d687a674463 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1536,7 +1536,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
        ip_select_ident(net, skb, sk);
 
        if (opt) {
-               iph->ihl += opt->optlen>>2;
+               iph->ihl += opt->optlen >> 2;
                ip_options_build(skb, opt, cork->addr, rt, 0);
        }
 

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 19a947bf0faa01415b76965e9c9eb2be7899cab4..248856b301c4570268b006b691889ce9ac74cd09 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -293,7 +293,8 @@ EXPORT_SYMBOL_GPL(ping_close);
 
 /* Checks the bind address and possibly modifies sk->sk_bound_dev_if. */
 static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
-                               struct sockaddr *uaddr, int addr_len) {
+                               struct sockaddr *uaddr, int addr_len)
+{
        struct net *net = sock_net(sk);
        if (sk->sk_family == AF_INET) {
                struct sockaddr_in *addr = (struct sockaddr_in *) uaddr;
@@ -634,7 +635,8 @@ static int ping_v4_push_pending_frames(struct sock *sk, struct pingfakehdr *pfh,
 }
 
 int ping_common_sendmsg(int family, struct msghdr *msg, size_t len,
-                       void *user_icmph, size_t icmph_len) {
+                       void *user_icmph, size_t icmph_len)
+{
        u8 type, code;
 
        if (len > 0xFFFF)

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 96fcdfb9bb26bfbfb416133939b74291c82dba12..2c05b863ae434fbe3fcb4b87348a467b0d63b76f 100644 (file)
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -623,7 +623,7 @@ static inline u32 fnhe_hashfun(__be32 daddr)
        u32 hval;
 
        net_get_random_once(&fnhe_hashrnd, sizeof(fnhe_hashrnd));
-       hval = jhash_1word((__force u32) daddr, fnhe_hashrnd);
+       hval = jhash_1word((__force u32)daddr, fnhe_hashrnd);
        return hash_32(hval, FNHE_HASH_SHIFT);
 }
 
@@ -1062,7 +1062,7 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, struct sock *sk,
 void ipv4_update_pmtu(struct sk_buff *skb, struct net *net, u32 mtu,
                      int oif, u8 protocol)
 {
-       const struct iphdr *iph = (const struct iphdr *) skb->data;
+       const struct iphdr *iph = (const struct iphdr *)skb->data;
        struct flowi4 fl4;
        struct rtable *rt;
        u32 mark = IP4_REPLY_MARK(net, skb->mark);
@@ -1097,7 +1097,7 @@ static void __ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)
 
 void ipv4_sk_update_pmtu(struct sk_buff *skb, struct sock *sk, u32 mtu)
 {
-       const struct iphdr *iph = (const struct iphdr *) skb->data;
+       const struct iphdr *iph = (const struct iphdr *)skb->data;
        struct flowi4 fl4;
        struct rtable *rt;
        struct dst_entry *odst = NULL;
@@ -1152,7 +1152,7 @@ EXPORT_SYMBOL_GPL(ipv4_sk_update_pmtu);
 void ipv4_redirect(struct sk_buff *skb, struct net *net,
                   int oif, u8 protocol)
 {
-       const struct iphdr *iph = (const struct iphdr *) skb->data;
+       const struct iphdr *iph = (const struct iphdr *)skb->data;
        struct flowi4 fl4;
        struct rtable *rt;
 
@@ -1308,7 +1308,7 @@ static unsigned int ipv4_default_advmss(const struct dst_entry *dst)
 
 static unsigned int ipv4_mtu(const struct dst_entry *dst)
 {
-       const struct rtable *rt = (const struct rtable *) dst;
+       const struct rtable *rt = (const struct rtable *)dst;
        unsigned int mtu = rt->rt_pmtu;
 
        if (!mtu || time_after_eq(jiffies, rt->dst.expires))