l2tp: cleanup whitespace use

Fix up various whitespace issues as reported by checkpatch.pl:

 * remove spaces around operators where appropriate,
 * add missing blank lines following declarations,
 * remove multiple blank lines, or trailing blank lines at the end of
   functions.

Signed-off-by: Tom Parkin <tparkin@katalix.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 6434d17..0992d5f 100644 (file)
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -94,7 +94,7 @@ struct l2tp_skb_cb {
        unsigned long           expires;
 };
 
-#define L2TP_SKB_CB(skb)       ((struct l2tp_skb_cb *) &skb->cb[sizeof(struct inet_skb_parm)])
+#define L2TP_SKB_CB(skb)       ((struct l2tp_skb_cb *)&skb->cb[sizeof(struct inet_skb_parm)])
 
 static struct workqueue_struct *l2tp_wq;
 
@@ -134,7 +134,6 @@ static inline struct hlist_head *
 l2tp_session_id_hash_2(struct l2tp_net *pn, u32 session_id)
 {
        return &pn->l2tp_session_hlist[hash_32(session_id, L2TP_HASH_BITS_2)];
-
 }
 
 /* Session hash list.
@@ -648,9 +647,9 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
        L2TP_SKB_CB(skb)->has_seq = 0;
        if (tunnel->version == L2TP_HDR_VER_2) {
                if (hdrflags & L2TP_HDRFLAG_S) {
-                       ns = ntohs(*(__be16 *) ptr);
+                       ns = ntohs(*(__be16 *)ptr);
                        ptr += 2;
-                       nr = ntohs(*(__be16 *) ptr);
+                       nr = ntohs(*(__be16 *)ptr);
                        ptr += 2;
 
                        /* Store L2TP info in the skb */
@@ -662,7 +661,7 @@ void l2tp_recv_common(struct l2tp_session *session, struct sk_buff *skb,
                                 session->name, ns, nr, session->nr);
                }
        } else if (session->l2specific_type == L2TP_L2SPECTYPE_DEFAULT) {
-               u32 l2h = ntohl(*(__be32 *) ptr);
+               u32 l2h = ntohl(*(__be32 *)ptr);
 
                if (l2h & 0x40000000) {
                        ns = l2h & 0x00ffffff;
@@ -777,6 +776,7 @@ EXPORT_SYMBOL(l2tp_recv_common);
 static int l2tp_session_queue_purge(struct l2tp_session *session)
 {
        struct sk_buff *skb = NULL;
+
        BUG_ON(!session);
        BUG_ON(session->magic != L2TP_SESSION_MAGIC);
        while ((skb = skb_dequeue(&session->reorder_q))) {
@@ -828,7 +828,7 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb)
        optr = ptr = skb->data;
 
        /* Get L2TP header flags */
-       hdrflags = ntohs(*(__be16 *) ptr);
+       hdrflags = ntohs(*(__be16 *)ptr);
 
        /* Check protocol version */
        version = hdrflags & L2TP_HDR_VER_MASK;
@@ -859,14 +859,14 @@ static int l2tp_udp_recv_core(struct l2tp_tunnel *tunnel, struct sk_buff *skb)
                        ptr += 2;
 
                /* Extract tunnel and session ID */
-               tunnel_id = ntohs(*(__be16 *) ptr);
+               tunnel_id = ntohs(*(__be16 *)ptr);
                ptr += 2;
-               session_id = ntohs(*(__be16 *) ptr);
+               session_id = ntohs(*(__be16 *)ptr);
                ptr += 2;
        } else {
                ptr += 2;       /* skip reserved bits */
                tunnel_id = tunnel->tunnel_id;
-               session_id = ntohl(*(__be32 *) ptr);
+               session_id = ntohl(*(__be32 *)ptr);
                ptr += 4;
        }
 
@@ -971,13 +971,13 @@ static int l2tp_build_l2tpv3_header(struct l2tp_session *session, void *buf)
         */
        if (tunnel->encap == L2TP_ENCAPTYPE_UDP) {
                u16 flags = L2TP_HDR_VER_3;
-               *((__be16 *) bufp) = htons(flags);
+               *((__be16 *)bufp) = htons(flags);
                bufp += 2;
-               *((__be16 *) bufp) = 0;
+               *((__be16 *)bufp) = 0;
                bufp += 2;
        }
 
-       *((__be32 *) bufp) = htonl(session->peer_session_id);
+       *((__be32 *)bufp) = htonl(session->peer_session_id);
        bufp += 4;
        if (session->cookie_len) {
                memcpy(bufp, &session->cookie[0], session->cookie_len);
@@ -1305,9 +1305,9 @@ static int l2tp_tunnel_sock_create(struct net *net,
                        memcpy(&udp_conf.peer_ip6, cfg->peer_ip6,
                               sizeof(udp_conf.peer_ip6));
                        udp_conf.use_udp6_tx_checksums =
-                         ! cfg->udp6_zero_tx_checksums;
+                         !cfg->udp6_zero_tx_checksums;
                        udp_conf.use_udp6_rx_checksums =
-                         ! cfg->udp6_zero_rx_checksums;
+                         !cfg->udp6_zero_rx_checksums;
                } else
 #endif
                {
@@ -1340,7 +1340,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
                        memcpy(&ip6_addr.l2tp_addr, cfg->local_ip6,
                               sizeof(ip6_addr.l2tp_addr));
                        ip6_addr.l2tp_conn_id = tunnel_id;
-                       err = kernel_bind(sock, (struct sockaddr *) &ip6_addr,
+                       err = kernel_bind(sock, (struct sockaddr *)&ip6_addr,
                                          sizeof(ip6_addr));
                        if (err < 0)
                                goto out;
@@ -1350,7 +1350,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
                               sizeof(ip6_addr.l2tp_addr));
                        ip6_addr.l2tp_conn_id = peer_tunnel_id;
                        err = kernel_connect(sock,
-                                            (struct sockaddr *) &ip6_addr,
+                                            (struct sockaddr *)&ip6_addr,
                                             sizeof(ip6_addr), 0);
                        if (err < 0)
                                goto out;
@@ -1367,7 +1367,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
                        ip_addr.l2tp_family = AF_INET;
                        ip_addr.l2tp_addr = cfg->local_ip;
                        ip_addr.l2tp_conn_id = tunnel_id;
-                       err = kernel_bind(sock, (struct sockaddr *) &ip_addr,
+                       err = kernel_bind(sock, (struct sockaddr *)&ip_addr,
                                          sizeof(ip_addr));
                        if (err < 0)
                                goto out;
@@ -1375,7 +1375,7 @@ static int l2tp_tunnel_sock_create(struct net *net,
                        ip_addr.l2tp_family = AF_INET;
                        ip_addr.l2tp_addr = cfg->peer_ip;
                        ip_addr.l2tp_conn_id = peer_tunnel_id;
-                       err = kernel_connect(sock, (struct sockaddr *) &ip_addr,
+                       err = kernel_connect(sock, (struct sockaddr *)&ip_addr,
                                             sizeof(ip_addr), 0);
                        if (err < 0)
                                goto out;
@@ -1593,6 +1593,7 @@ void __l2tp_session_unhash(struct l2tp_session *session)
                /* For L2TPv3 we have a per-net hash: remove from there, too */
                if (tunnel->version != L2TP_HDR_VER_2) {
                        struct l2tp_net *pn = l2tp_pernet(tunnel->l2tp_net);
+
                        spin_lock_bh(&pn->l2tp_session_hlist_lock);
                        hlist_del_init_rcu(&session->global_hlist);
                        spin_unlock_bh(&pn->l2tp_session_hlist_lock);
@@ -1636,7 +1637,6 @@ void l2tp_session_set_header_len(struct l2tp_session *session, int version)
                if (session->tunnel->encap == L2TP_ENCAPTYPE_UDP)
                        session->hdr_len += 4;
        }
-
 }
 EXPORT_SYMBOL_GPL(l2tp_session_set_header_len);
 

diff --git a/net/l2tp/l2tp_debugfs.c b/net/l2tp/l2tp_debugfs.c
index 35bb4f3..f0301cb 100644 (file)
--- a/net/l2tp/l2tp_debugfs.c
+++ b/net/l2tp/l2tp_debugfs.c
@@ -63,7 +63,6 @@ static void l2tp_dfs_next_session(struct l2tp_dfs_seq_data *pd)
                pd->session_idx = 0;
                l2tp_dfs_next_tunnel(pd);
        }
-
 }
 
 static void *l2tp_dfs_seq_start(struct seq_file *m, loff_t *offs)
@@ -90,7 +89,6 @@ out:
        return pd;
 }
 
-
 static void *l2tp_dfs_seq_next(struct seq_file *m, void *v, loff_t *pos)
 {
        (*pos)++;

diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 3099efa..a84627d 100644 (file)
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -51,7 +51,6 @@ struct l2tp_eth_sess {
        struct net_device __rcu *dev;
 };
 
-
 static int l2tp_eth_dev_init(struct net_device *dev)
 {
        eth_hw_addr_random(dev);
@@ -94,13 +93,12 @@ static void l2tp_eth_get_stats64(struct net_device *dev,
 {
        struct l2tp_eth *priv = netdev_priv(dev);
 
-       stats->tx_bytes   = (unsigned long) atomic_long_read(&priv->tx_bytes);
-       stats->tx_packets = (unsigned long) atomic_long_read(&priv->tx_packets);
-       stats->tx_dropped = (unsigned long) atomic_long_read(&priv->tx_dropped);
-       stats->rx_bytes   = (unsigned long) atomic_long_read(&priv->rx_bytes);
-       stats->rx_packets = (unsigned long) atomic_long_read(&priv->rx_packets);
-       stats->rx_errors  = (unsigned long) atomic_long_read(&priv->rx_errors);
-
+       stats->tx_bytes   = (unsigned long)atomic_long_read(&priv->tx_bytes);
+       stats->tx_packets = (unsigned long)atomic_long_read(&priv->tx_packets);
+       stats->tx_dropped = (unsigned long)atomic_long_read(&priv->tx_dropped);
+       stats->rx_bytes   = (unsigned long)atomic_long_read(&priv->rx_bytes);
+       stats->rx_packets = (unsigned long)atomic_long_read(&priv->rx_packets);
+       stats->rx_errors  = (unsigned long)atomic_long_read(&priv->rx_errors);
 }
 
 static const struct net_device_ops l2tp_eth_netdev_ops = {
@@ -348,13 +346,11 @@ err:
        return rc;
 }
 
-
 static const struct l2tp_nl_cmd_ops l2tp_eth_nl_cmd_ops = {
        .session_create = l2tp_eth_create,
        .session_delete = l2tp_session_delete,
 };
 
-
 static int __init l2tp_eth_init(void)
 {
        int err = 0;

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index 2a3fd31..e5b63ea 100644 (file)
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -126,7 +126,7 @@ static int l2tp_ip_recv(struct sk_buff *skb)
 
        /* Point to L2TP header */
        optr = ptr = skb->data;
-       session_id = ntohl(*((__be32 *) ptr));
+       session_id = ntohl(*((__be32 *)ptr));
        ptr += 4;
 
        /* RFC3931: L2TP/IP packets have the first 4 bytes containing
@@ -176,7 +176,7 @@ pass_up:
        if ((skb->data[0] & 0xc0) != 0xc0)
                goto discard;
 
-       tunnel_id = ntohl(*(__be32 *) &skb->data[4]);
+       tunnel_id = ntohl(*(__be32 *)&skb->data[4]);
        iph = (struct iphdr *)skb_network_header(skb);
 
        read_lock_bh(&l2tp_ip_lock);
@@ -260,7 +260,7 @@ static void l2tp_ip_destroy_sock(struct sock *sk)
 static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 {
        struct inet_sock *inet = inet_sk(sk);
-       struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *) uaddr;
+       struct sockaddr_l2tpip *addr = (struct sockaddr_l2tpip *)uaddr;
        struct net *net = sock_net(sk);
        int ret;
        int chk_addr_ret;
@@ -316,7 +316,7 @@ out:
 
 static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 {
-       struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *) uaddr;
+       struct sockaddr_l2tpip *lsa = (struct sockaddr_l2tpip *)uaddr;
        int rc;
 
        if (addr_len < sizeof(*lsa))
@@ -375,6 +375,7 @@ static int l2tp_ip_getname(struct socket *sock, struct sockaddr *uaddr,
                lsa->l2tp_addr.s_addr = inet->inet_daddr;
        } else {
                __be32 addr = inet->inet_rcv_saddr;
+
                if (!addr)
                        addr = inet->inet_saddr;
                lsa->l2tp_conn_id = lsk->conn_id;
@@ -422,6 +423,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
        /* Get and verify the address. */
        if (msg->msg_name) {
                DECLARE_SOCKADDR(struct sockaddr_l2tpip *, lip, msg->msg_name);
+
                rc = -EINVAL;
                if (msg->msg_namelen < sizeof(*lip))
                        goto out;
@@ -456,7 +458,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
        skb_reset_transport_header(skb);
 
        /* Insert 0 session_id */
-       *((__be32 *) skb_put(skb, 4)) = 0;
+       *((__be32 *)skb_put(skb, 4)) = 0;
 
        /* Copy user data into skb */
        rc = memcpy_from_msg(skb_put(skb, len), msg, len);
@@ -467,7 +469,7 @@ static int l2tp_ip_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
 
        fl4 = &inet->cork.fl.u.ip4;
        if (connected)
-               rt = (struct rtable *) __sk_dst_check(sk, 0);
+               rt = (struct rtable *)__sk_dst_check(sk, 0);
 
        rcu_read_lock();
        if (rt == NULL) {

diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
index 4799bec..d17b9fe 100644 (file)
--- a/net/l2tp/l2tp_ip6.c
+++ b/net/l2tp/l2tp_ip6.c
@@ -138,7 +138,7 @@ static int l2tp_ip6_recv(struct sk_buff *skb)
 
        /* Point to L2TP header */
        optr = ptr = skb->data;
-       session_id = ntohl(*((__be32 *) ptr));
+       session_id = ntohl(*((__be32 *)ptr));
        ptr += 4;
 
        /* RFC3931: L2TP/IP packets have the first 4 bytes containing
@@ -188,7 +188,7 @@ pass_up:
        if ((skb->data[0] & 0xc0) != 0xc0)
                goto discard;
 
-       tunnel_id = ntohl(*(__be32 *) &skb->data[4]);
+       tunnel_id = ntohl(*(__be32 *)&skb->data[4]);
        iph = ipv6_hdr(skb);
 
        read_lock_bh(&l2tp_ip6_lock);
@@ -276,7 +276,7 @@ static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
 {
        struct inet_sock *inet = inet_sk(sk);
        struct ipv6_pinfo *np = inet6_sk(sk);
-       struct sockaddr_l2tpip6 *addr = (struct sockaddr_l2tpip6 *) uaddr;
+       struct sockaddr_l2tpip6 *addr = (struct sockaddr_l2tpip6 *)uaddr;
        struct net *net = sock_net(sk);
        __be32 v4addr = 0;
        int bound_dev_if;
@@ -375,8 +375,8 @@ out_unlock:
 static int l2tp_ip6_connect(struct sock *sk, struct sockaddr *uaddr,
                            int addr_len)
 {
-       struct sockaddr_l2tpip6 *lsa = (struct sockaddr_l2tpip6 *) uaddr;
-       struct sockaddr_in6     *usin = (struct sockaddr_in6 *) uaddr;
+       struct sockaddr_l2tpip6 *lsa = (struct sockaddr_l2tpip6 *)uaddr;
+       struct sockaddr_in6     *usin = (struct sockaddr_in6 *)uaddr;
        struct in6_addr *daddr;
        int     addr_type;
        int rc;
@@ -548,7 +548,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
                daddr = &lsa->l2tp_addr;
                if (np->sndflow) {
                        fl6.flowlabel = lsa->l2tp_flowinfo & IPV6_FLOWINFO_MASK;
-                       if (fl6.flowlabel&IPV6_FLOWLABEL_MASK) {
+                       if (fl6.flowlabel & IPV6_FLOWLABEL_MASK) {
                                flowlabel = fl6_sock_lookup(sk, fl6.flowlabel);
                                if (IS_ERR(flowlabel))
                                        return -EINVAL;
@@ -594,7 +594,7 @@ static int l2tp_ip6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
                        if (IS_ERR(flowlabel))
                                return -EINVAL;
                }
-               if (!(opt->opt_nflen|opt->opt_flen))
+               if (!(opt->opt_nflen | opt->opt_flen))
                        opt = NULL;
        }
 

diff --git a/net/l2tp/l2tp_netlink.c b/net/l2tp/l2tp_netlink.c
index ebb381c..0ce8e94 100644 (file)
--- a/net/l2tp/l2tp_netlink.c
+++ b/net/l2tp/l2tp_netlink.c
@@ -27,7 +27,6 @@
 
 #include "l2tp_core.h"
 
-
 static struct genl_family l2tp_nl_family;
 
 static const struct genl_multicast_group l2tp_multicast_group[] = {
@@ -570,6 +569,7 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
 
                if (info->attrs[L2TP_ATTR_COOKIE]) {
                        u16 len = nla_len(info->attrs[L2TP_ATTR_COOKIE]);
+
                        if (len > 8) {
                                ret = -EINVAL;
                                goto out_tunnel;
@@ -579,6 +579,7 @@ static int l2tp_nl_cmd_session_create(struct sk_buff *skb, struct genl_info *inf
                }
                if (info->attrs[L2TP_ATTR_PEER_COOKIE]) {
                        u16 len = nla_len(info->attrs[L2TP_ATTR_PEER_COOKIE]);
+
                        if (len > 8) {
                                ret = -EINVAL;
                                goto out_tunnel;

diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index c54cb59..6dccffa 100644 (file)
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -351,7 +351,7 @@ error:
  */
 static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 {
-       struct sock *sk = (struct sock *) chan->private;
+       struct sock *sk = (struct sock *)chan->private;
        struct l2tp_session *session;
        struct l2tp_tunnel *tunnel;
        int uhlen, headroom;
@@ -928,6 +928,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
        inet = inet_sk(tunnel->sock);
        if ((tunnel->version == 2) && (tunnel->sock->sk_family == AF_INET)) {
                struct sockaddr_pppol2tp sp;
+
                len = sizeof(sp);
                memset(&sp, 0, len);
                sp.sa_family    = AF_PPPOX;
@@ -984,6 +985,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
 #endif
        } else if (tunnel->version == 3) {
                struct sockaddr_pppol2tpv3 sp;
+
                len = sizeof(sp);
                memset(&sp, 0, len);
                sp.sa_family    = AF_PPPOX;
@@ -1343,7 +1345,7 @@ static int pppol2tp_session_getsockopt(struct sock *sk,
                break;
 
        case PPPOL2TP_SO_REORDERTO:
-               *val = (int) jiffies_to_msecs(session->reorder_timeout);
+               *val = (int)jiffies_to_msecs(session->reorder_timeout);
                l2tp_info(session, L2TP_MSG_CONTROL,
                          "%s: get reorder_timeout=%d\n", session->name, *val);
                break;
@@ -1407,7 +1409,7 @@ static int pppol2tp_getsockopt(struct socket *sock, int level, int optname,
        if (put_user(len, optlen))
                goto end_put_sess;
 
-       if (copy_to_user((void __user *) optval, &val, len))
+       if (copy_to_user((void __user *)optval, &val, len))
                goto end_put_sess;
 
        err = 0;
@@ -1551,6 +1553,7 @@ static void pppol2tp_seq_session_show(struct seq_file *m, void *v)
 
        if (tunnel->sock) {
                struct inet_sock *inet = inet_sk(tunnel->sock);
+
                ip = ntohl(inet->inet_saddr);
                port = ntohs(inet->inet_sport);
        }