[PATCH PATCH net-next 00/18] net whitespace cleanups

[PATCH PATCH net-next 00/18] net whitespace cleanups

[Stephen Hemminger]

Ran script that I use to check for trailing whitespace and
blank lines at end of files across all files in net/ directory.
These are errors that checkpatch reports and git flags.

These are the resulting fixes broken up mostly by subsystem.

Stephen Hemminger (18):
  sched: fix trailing whitespace
  wimax: remove blank lines at EOF
  rds: remove trailing whitespace and blank lines
  llc: fix whitespace issues
  mpls: remove trailing whitepace
  xfrm: remove blank lines at EOF
  ceph: fix whitespace
  sctp: whitespace fixes
  ila: remove blank lines at EOF
  9p: fix whitespace issues
  atm: remove blank lines at EOF
  ax25: remove blank line at EOF
  x25: remove blank lines at EOF
  decnet: whitespace fixes
  sunrpc: whitespace fixes
  bpfilter: remove trailing newline
  l2tp: remove trailing newline
  net: remove blank lines at end of file

 net/8021q/Makefile                      | 1 -
 net/9p/client.c                         | 4 ++--
 net/9p/trans_virtio.c                   | 2 +-
 net/9p/util.c                           | 1 -
 net/Kconfig                             | 2 +-
 net/atm/mpoa_proc.c                     | 6 ------
 net/ax25/ax25_addr.c                    | 1 -
 net/ax25/ax25_ds_in.c                   | 1 -
 net/ax25/ax25_ds_subr.c                 | 1 -
 net/ax25/ax25_ip.c                      | 1 -
 net/ax25/ax25_out.c                     | 1 -
 net/bpfilter/Kconfig                    | 1 -
 net/ceph/Kconfig                        | 1 -
 net/ceph/Makefile                       | 1 -
 net/ceph/auth_none.c                    | 1 -
 net/ceph/auth_none.h                    | 1 -
 net/ceph/auth_x.c                       | 2 --
 net/ceph/auth_x.h                       | 1 -
 net/ceph/mon_client.c                   | 2 +-
 net/ceph/pagevec.c                      | 1 -
 net/core/neighbour.c                    | 1 -
 net/decnet/Kconfig                      | 1 -
 net/decnet/Makefile                     | 1 -
 net/decnet/TODO                         | 5 ++---
 net/decnet/dn_fib.c                     | 2 --
 net/decnet/dn_nsp_in.c                  | 1 -
 net/decnet/dn_nsp_out.c                 | 1 -
 net/decnet/dn_route.c                   | 1 -
 net/decnet/dn_rules.c                   | 2 --
 net/decnet/netfilter/Makefile           | 1 -
 net/decnet/netfilter/dn_rtmsg.c         | 1 -
 net/dns_resolver/dns_key.c              | 1 -
 net/ieee802154/core.c                   | 1 -
 net/ieee802154/nl_policy.c              | 1 -
 net/ipv4/Kconfig                        | 4 ++--
 net/ipv4/Makefile                       | 2 +-
 net/ipv4/bpfilter/Makefile              | 1 -
 net/ipv6/Kconfig                        | 2 +-
 net/ipv6/ila/ila_common.c               | 1 -
 net/ipv6/ila/ila_xlat.c                 | 1 -
 net/iucv/af_iucv.c                      | 1 -
 net/kcm/Kconfig                         | 1 -
 net/kcm/kcmsock.c                       | 1 -
 net/l2tp/l2tp_core.c                    | 1 -
 net/llc/Kconfig                         | 2 +-
 net/llc/Makefile                        | 2 +-
 net/llc/llc_if.c                        | 1 -
 net/mac80211/rc80211_minstrel.c         | 1 -
 net/mpls/mpls_iptunnel.c                | 2 +-
 net/rds/Kconfig                         | 1 -
 net/rds/Makefile                        | 1 -
 net/rds/ib.c                            | 1 -
 net/rds/message.c                       | 1 -
 net/rds/rdma_transport.c                | 1 -
 net/rds/tcp.c                           | 1 -
 net/rds/transport.c                     | 1 -
 net/sched/Kconfig                       | 4 ++--
 net/sched/Makefile                      | 2 +-
 net/sched/act_connmark.c                | 1 -
 net/sched/act_pedit.c                   | 1 -
 net/sched/cls_basic.c                   | 1 -
 net/sctp/Kconfig                        | 4 ++--
 net/sctp/sm_sideeffect.c                | 1 -
 net/sunrpc/auth_gss/auth_gss.c          | 2 +-
 net/sunrpc/auth_gss/gss_generic_token.c | 1 -
 net/sunrpc/auth_gss/gss_krb5_crypto.c   | 1 -
 net/sunrpc/auth_gss/gss_krb5_keys.c     | 1 -
 net/sunrpc/auth_gss/gss_krb5_seal.c     | 1 -
 net/sunrpc/auth_gss/gss_krb5_unseal.c   | 1 -
 net/sunrpc/auth_gss/gss_krb5_wrap.c     | 1 -
 net/sunrpc/auth_gss/svcauth_gss.c       | 2 +-
 net/sunrpc/backchannel_rqst.c           | 1 -
 net/sunrpc/clnt.c                       | 2 +-
 net/sunrpc/rpcb_clnt.c                  | 2 +-
 net/sunrpc/stats.c                      | 1 -
 net/sunrpc/sunrpc.h                     | 1 -
 net/sunrpc/xprt.c                       | 2 +-
 net/sunrpc/xprtsock.c                   | 1 -
 net/wimax/Makefile                      | 2 --
 net/wimax/debugfs.c                     | 2 --
 net/wimax/op-msg.c                      | 1 -
 net/wimax/stack.c                       | 1 -
 net/x25/Kconfig                         | 2 --
 net/x25/x25_subr.c                      | 1 -
 net/xfrm/Kconfig                        | 1 -
 net/xfrm/xfrm_user.c                    | 1 -
 86 files changed, 24 insertions(+), 103 deletions(-)

-- 
2.18.0

[PATCH PATCH net-next 03/18] rds: remove trailing whitespace and blank lines

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/rds/Kconfig          | 1 -
 net/rds/Makefile         | 1 -
 net/rds/ib.c             | 1 -
 net/rds/message.c        | 1 -
 net/rds/rdma_transport.c | 1 -
 net/rds/tcp.c            | 1 -
 net/rds/transport.c      | 1 -
 7 files changed, 7 deletions(-)

diff --git a/net/rds/Kconfig b/net/rds/Kconfig
index bffde4b46c5d..41f75563b54b 100644
--- a/net/rds/Kconfig
+++ b/net/rds/Kconfig
@@ -24,4 +24,3 @@ config RDS_DEBUG
         bool "RDS debugging messages"
 	depends on RDS
         default n
-
diff --git a/net/rds/Makefile b/net/rds/Makefile
index b5d568bd479c..e647f9de104a 100644
--- a/net/rds/Makefile
+++ b/net/rds/Makefile
@@ -15,4 +15,3 @@ rds_tcp-y :=		tcp.o tcp_connect.o tcp_listen.o tcp_recv.o \
 			tcp_send.o tcp_stats.o
 
 ccflags-$(CONFIG_RDS_DEBUG)	:=	-DRDS_DEBUG
-
diff --git a/net/rds/ib.c b/net/rds/ib.c
index 63d95ea7cdff..a4245c42d43b 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -568,4 +568,3 @@ int rds_ib_init(void)
 }
 
 MODULE_LICENSE("GPL");
-
diff --git a/net/rds/message.c b/net/rds/message.c
index a35f76971984..4b00b1152a5f 100644
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -514,4 +514,3 @@ void rds_message_unmapped(struct rds_message *rm)
 	wake_up_interruptible(&rm->m_flush_wait);
 }
 EXPORT_SYMBOL_GPL(rds_message_unmapped);
-
diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index bd67e55354f4..ad78929036ef 100644
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -281,4 +281,3 @@ module_exit(rds_rdma_exit);
 MODULE_AUTHOR("Oracle Corporation <rds-devel@oss.oracle.com>");
 MODULE_DESCRIPTION("RDS: IB transport");
 MODULE_LICENSE("Dual BSD/GPL");
-
diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 7028d6e51947..f23925af0b8d 100644
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -717,4 +717,3 @@ module_init(rds_tcp_init);
 MODULE_AUTHOR("Oracle Corporation <rds-devel@oss.oracle.com>");
 MODULE_DESCRIPTION("RDS: TCP transport");
 MODULE_LICENSE("Dual BSD/GPL");
-
diff --git a/net/rds/transport.c b/net/rds/transport.c
index c9788dbce441..46f709a4b577 100644
--- a/net/rds/transport.c
+++ b/net/rds/transport.c
@@ -159,4 +159,3 @@ unsigned int rds_trans_stats_info_copy(struct rds_info_iterator *iter,
 
 	return total;
 }
-
-- 
2.18.0

[PATCH PATCH net-next 04/18] llc: fix whitespace issues

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/llc/Kconfig  | 2 +-
 net/llc/Makefile | 2 +-
 net/llc/llc_if.c | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/llc/Kconfig b/net/llc/Kconfig
index b91c65108162..176a6c1521a5 100644
--- a/net/llc/Kconfig
+++ b/net/llc/Kconfig
@@ -6,5 +6,5 @@ config LLC2
 	tristate "ANSI/IEEE 802.2 LLC type 2 Support"
 	select LLC
 	help
-	  This is a Logical Link Layer type 2, connection oriented support. 
+	  This is a Logical Link Layer type 2, connection oriented support.
 	  Select this if you want to have support for PF_LLC sockets.
diff --git a/net/llc/Makefile b/net/llc/Makefile
index 4e260cff3c5d..5e0ef436daae 100644
--- a/net/llc/Makefile
+++ b/net/llc/Makefile
@@ -4,7 +4,7 @@
 # Copyright (c) 1997 by Procom Technology,Inc.
 #		2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
 #
-# This program can be redistributed or modified under the terms of the 
+# This program can be redistributed or modified under the terms of the
 # GNU General Public License as published by the Free Software Foundation.
 # This program is distributed without any warranty or implied warranty
 # of merchantability or fitness for a particular purpose.
diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c
index 6daf391b3e84..8db03c2d5440 100644
--- a/net/llc/llc_if.c
+++ b/net/llc/llc_if.c
@@ -151,4 +151,3 @@ int llc_send_disc(struct sock *sk)
 	sock_put(sk);
 	return rc;
 }
-
-- 
2.18.0

[PATCH PATCH net-next 07/18] ceph: fix whitespace

[Stephen Hemminger]

Remove blank lines at end of file and trailing whitespace.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/ceph/Kconfig      | 1 -
 net/ceph/Makefile     | 1 -
 net/ceph/auth_none.c  | 1 -
 net/ceph/auth_none.h  | 1 -
 net/ceph/auth_x.c     | 2 --
 net/ceph/auth_x.h     | 1 -
 net/ceph/mon_client.c | 2 +-
 net/ceph/pagevec.c    | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/net/ceph/Kconfig b/net/ceph/Kconfig
index f8cceb99e732..cd2d5b9301a1 100644
--- a/net/ceph/Kconfig
+++ b/net/ceph/Kconfig
@@ -41,4 +41,3 @@ config CEPH_LIB_USE_DNS_RESOLVER
 	  Documentation/networking/dns_resolver.txt
 
 	  If unsure, say N.
-
diff --git a/net/ceph/Makefile b/net/ceph/Makefile
index 12bf49772d24..db09defe27d0 100644
--- a/net/ceph/Makefile
+++ b/net/ceph/Makefile
@@ -15,4 +15,3 @@ libceph-y := ceph_common.o messenger.o msgpool.o buffer.o pagelist.o \
 	auth_x.o \
 	ceph_fs.o ceph_strings.o ceph_hash.o \
 	pagevec.o snapshot.o string_table.o
-
diff --git a/net/ceph/auth_none.c b/net/ceph/auth_none.c
index 41d2a0c72236..edb7042479ed 100644
--- a/net/ceph/auth_none.c
+++ b/net/ceph/auth_none.c
@@ -142,4 +142,3 @@ int ceph_auth_none_init(struct ceph_auth_client *ac)
 	ac->ops = &ceph_auth_none_ops;
 	return 0;
 }
-
diff --git a/net/ceph/auth_none.h b/net/ceph/auth_none.h
index 860ed9875791..4158f064302e 100644
--- a/net/ceph/auth_none.h
+++ b/net/ceph/auth_none.h
@@ -26,4 +26,3 @@ struct ceph_auth_none_info {
 int ceph_auth_none_init(struct ceph_auth_client *ac);
 
 #endif
-
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c
index 2f4a1baf5f52..32c7f5c4b1a6 100644
--- a/net/ceph/auth_x.c
+++ b/net/ceph/auth_x.c
@@ -823,5 +823,3 @@ int ceph_x_init(struct ceph_auth_client *ac)
 out:
 	return ret;
 }
-
-
diff --git a/net/ceph/auth_x.h b/net/ceph/auth_x.h
index 454cb54568af..a71c4c282b57 100644
--- a/net/ceph/auth_x.h
+++ b/net/ceph/auth_x.h
@@ -52,4 +52,3 @@ struct ceph_x_info {
 int ceph_x_init(struct ceph_auth_client *ac);
 
 #endif
-
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index d7a7a2330ef7..18deb3d889c4 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -1249,7 +1249,7 @@ static void dispatch(struct ceph_connection *con, struct ceph_msg *msg)
 		if (monc->client->extra_mon_dispatch &&
 		    monc->client->extra_mon_dispatch(monc->client, msg) == 0)
 			break;
-			
+
 		pr_err("received unknown message type %d %s\n", type,
 		       ceph_msg_type_name(type));
 	}
diff --git a/net/ceph/pagevec.c b/net/ceph/pagevec.c
index e560d3975f41..d3736f5bffec 100644
--- a/net/ceph/pagevec.c
+++ b/net/ceph/pagevec.c
@@ -197,4 +197,3 @@ void ceph_zero_page_vector_range(int off, int len, struct page **pages)
 	}
 }
 EXPORT_SYMBOL(ceph_zero_page_vector_range);
-
-- 
2.18.0

[PATCH PATCH net-next 09/18] ila: remove blank lines at EOF

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/ipv6/ila/ila_common.c | 1 -
 net/ipv6/ila/ila_xlat.c   | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net/ipv6/ila/ila_common.c b/net/ipv6/ila/ila_common.c
index 579310466eac..95e9146918cc 100644
--- a/net/ipv6/ila/ila_common.c
+++ b/net/ipv6/ila/ila_common.c
@@ -153,4 +153,3 @@ void ila_update_ipv6_locator(struct sk_buff *skb, struct ila_params *p,
 	/* Now change destination address */
 	iaddr->loc = p->locator;
 }
-
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c
index 51a15ce50a64..17c455ff69ff 100644
--- a/net/ipv6/ila/ila_xlat.c
+++ b/net/ipv6/ila/ila_xlat.c
@@ -663,4 +663,3 @@ static int ila_xlat_addr(struct sk_buff *skb, bool sir2ila)
 
 	return 0;
 }
-
-- 
2.18.0

[PATCH PATCH net-next 11/18] atm: remove blank lines at EOF

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/atm/mpoa_proc.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c
index b93cc0f18292..46d6cd9a36ae 100644
--- a/net/atm/mpoa_proc.c
+++ b/net/atm/mpoa_proc.c
@@ -307,9 +307,3 @@ void mpc_proc_clean(void)
 }
 
 #endif /* CONFIG_PROC_FS */
-
-
-
-
-
-
-- 
2.18.0

[PATCH PATCH net-next 13/18] x25: remove blank lines at EOF

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/x25/Kconfig    | 2 --
 net/x25/x25_subr.c | 1 -
 2 files changed, 3 deletions(-)

diff --git a/net/x25/Kconfig b/net/x25/Kconfig
index e2fa133f9fba..59fcb41fc5e6 100644
--- a/net/x25/Kconfig
+++ b/net/x25/Kconfig
@@ -31,5 +31,3 @@ config X25
 
 	  To compile this driver as a module, choose M here: the module
 	  will be called x25. If unsure, say N.
-
-
diff --git a/net/x25/x25_subr.c b/net/x25/x25_subr.c
index 9c214ec681ac..743103786652 100644
--- a/net/x25/x25_subr.c
+++ b/net/x25/x25_subr.c
@@ -381,4 +381,3 @@ void x25_check_rbuf(struct sock *sk)
 		x25_stop_timer(sk);
 	}
 }
-
-- 
2.18.0

[PATCH PATCH net-next 14/18] decnet: whitespace fixes

[Stephen Hemminger]

Remove trailing whitespace and extra lines at EOF

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/decnet/Kconfig              | 1 -
 net/decnet/Makefile             | 1 -
 net/decnet/TODO                 | 5 ++---
 net/decnet/dn_fib.c             | 2 --
 net/decnet/dn_nsp_in.c          | 1 -
 net/decnet/dn_nsp_out.c         | 1 -
 net/decnet/dn_route.c           | 1 -
 net/decnet/dn_rules.c           | 2 --
 net/decnet/netfilter/Makefile   | 1 -
 net/decnet/netfilter/dn_rtmsg.c | 1 -
 10 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/net/decnet/Kconfig b/net/decnet/Kconfig
index f3393e154f0f..dcc74956badd 100644
--- a/net/decnet/Kconfig
+++ b/net/decnet/Kconfig
@@ -40,4 +40,3 @@ config DECNET_ROUTER
 	  to work.
 
 	  See <file:Documentation/networking/decnet.txt> for more information.
-
diff --git a/net/decnet/Makefile b/net/decnet/Makefile
index 9e38122d942b..07b38e441b2d 100644
--- a/net/decnet/Makefile
+++ b/net/decnet/Makefile
@@ -8,4 +8,3 @@ decnet-$(CONFIG_DECNET_ROUTER) += dn_fib.o dn_rules.o dn_table.o
 decnet-y += sysctl_net_decnet.o
 
 obj-$(CONFIG_NETFILTER) += netfilter/
-
diff --git a/net/decnet/TODO b/net/decnet/TODO
index ebb5ac69d128..358e9eb49016 100644
--- a/net/decnet/TODO
+++ b/net/decnet/TODO
@@ -16,14 +16,14 @@ Steve's quick list of things that need finishing off:
 
  o Verify errors etc. against POSIX 1003.1g (draft)
 
- o Using send/recvmsg() to get at connect/disconnect data (POSIX 1003.1g) 
+ o Using send/recvmsg() to get at connect/disconnect data (POSIX 1003.1g)
    [maybe this should be done at socket level... the control data in the
     send/recvmsg() calls should simply be a vector of set/getsockopt()
     calls]
 
  o check MSG_CTRUNC is set where it should be.
 
- o Find all the commonality between DECnet and IPv4 routing code and extract 
+ o Find all the commonality between DECnet and IPv4 routing code and extract
    it into a small library of routines. [probably a project for 2.7.xx]
 
  o Add perfect socket hashing - an idea suggested by Paul Koning. Currently
@@ -38,4 +38,3 @@ Steve's quick list of things that need finishing off:
  o DECnet sendpages() function
 
  o AIO for DECnet
-
diff --git a/net/decnet/dn_fib.c b/net/decnet/dn_fib.c
index fce94cbd4378..f78fe58eafc8 100644
--- a/net/decnet/dn_fib.c
+++ b/net/decnet/dn_fib.c
@@ -797,5 +797,3 @@ void __init dn_fib_init(void)
 	rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_DELROUTE,
 			     dn_fib_rtm_delroute, NULL, 0);
 }
-
-
diff --git a/net/decnet/dn_nsp_in.c b/net/decnet/dn_nsp_in.c
index 34aba55ed573..2fb5e055ba25 100644
--- a/net/decnet/dn_nsp_in.c
+++ b/net/decnet/dn_nsp_in.c
@@ -912,4 +912,3 @@ int dn_nsp_backlog_rcv(struct sock *sk, struct sk_buff *skb)
 
 	return NET_RX_SUCCESS;
 }
-
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c
index 56a52a004c56..a1779de6bd9c 100644
--- a/net/decnet/dn_nsp_out.c
+++ b/net/decnet/dn_nsp_out.c
@@ -701,4 +701,3 @@ void dn_nsp_send_conninit(struct sock *sk, unsigned char msgflg)
 
 	dn_nsp_send(skb);
 }
-
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index e74765024d88..3107a2e24e6b 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1925,4 +1925,3 @@ void __exit dn_route_cleanup(void)
 	remove_proc_entry("decnet_cache", init_net.proc_net);
 	dst_entries_destroy(&dn_dst_ops);
 }
-
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index 72236695db3d..4a4e3c17740c 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -256,5 +256,3 @@ void __exit dn_fib_rules_cleanup(void)
 	rtnl_unlock();
 	rcu_barrier();
 }
-
-
diff --git a/net/decnet/netfilter/Makefile b/net/decnet/netfilter/Makefile
index 255c1ae9daeb..b579e52130aa 100644
--- a/net/decnet/netfilter/Makefile
+++ b/net/decnet/netfilter/Makefile
@@ -3,4 +3,3 @@
 #
 
 obj-$(CONFIG_DECNET_NF_GRABULATOR) += dn_rtmsg.o
-
diff --git a/net/decnet/netfilter/dn_rtmsg.c b/net/decnet/netfilter/dn_rtmsg.c
index ab395e55cd78..a4faacadd8a8 100644
--- a/net/decnet/netfilter/dn_rtmsg.c
+++ b/net/decnet/netfilter/dn_rtmsg.c
@@ -158,4 +158,3 @@ MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_DNRTMSG);
 
 module_init(dn_rtmsg_init);
 module_exit(dn_rtmsg_fini);
-
-- 
2.18.0

[PATCH PATCH net-next 15/18] sunrpc: whitespace fixes

[Stephen Hemminger]

Remove trailing whitespace and blank line at EOF

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/sunrpc/auth_gss/auth_gss.c          | 2 +-
 net/sunrpc/auth_gss/gss_generic_token.c | 1 -
 net/sunrpc/auth_gss/gss_krb5_crypto.c   | 1 -
 net/sunrpc/auth_gss/gss_krb5_keys.c     | 1 -
 net/sunrpc/auth_gss/gss_krb5_seal.c     | 1 -
 net/sunrpc/auth_gss/gss_krb5_unseal.c   | 1 -
 net/sunrpc/auth_gss/gss_krb5_wrap.c     | 1 -
 net/sunrpc/auth_gss/svcauth_gss.c       | 2 +-
 net/sunrpc/backchannel_rqst.c           | 1 -
 net/sunrpc/clnt.c                       | 2 +-
 net/sunrpc/rpcb_clnt.c                  | 2 +-
 net/sunrpc/stats.c                      | 1 -
 net/sunrpc/sunrpc.h                     | 1 -
 net/sunrpc/xprt.c                       | 2 +-
 net/sunrpc/xprtsock.c                   | 1 -
 15 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index be8f103d22fd..b67ad98a36a6 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -1571,7 +1571,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred)
 	if (test_bit(RPCAUTH_CRED_NEGATIVE, &cred->cr_flags)) {
 		unsigned long now = jiffies;
 		unsigned long begin, expire;
-		struct gss_cred *gss_cred; 
+		struct gss_cred *gss_cred;
 
 		gss_cred = container_of(cred, struct gss_cred, gc_base);
 		begin = gss_cred->gc_upcall_timestamp;
diff --git a/net/sunrpc/auth_gss/gss_generic_token.c b/net/sunrpc/auth_gss/gss_generic_token.c
index 254defe446a7..fe97f3106536 100644
--- a/net/sunrpc/auth_gss/gss_generic_token.c
+++ b/net/sunrpc/auth_gss/gss_generic_token.c
@@ -231,4 +231,3 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,
 }
 
 EXPORT_SYMBOL_GPL(g_verify_token_header);
-
diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
index 8654494b4d0a..a1acee106faa 100644
--- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
+++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
@@ -1077,4 +1077,3 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,
 	dprintk("%s: returning %d\n", __func__, err);
 	return err;
 }
-
diff --git a/net/sunrpc/auth_gss/gss_krb5_keys.c b/net/sunrpc/auth_gss/gss_krb5_keys.c
index 870133146026..f7fe2d2b851f 100644
--- a/net/sunrpc/auth_gss/gss_krb5_keys.c
+++ b/net/sunrpc/auth_gss/gss_krb5_keys.c
@@ -324,4 +324,3 @@ u32 gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e,
 err_out:
 	return ret;
 }
-
diff --git a/net/sunrpc/auth_gss/gss_krb5_seal.c b/net/sunrpc/auth_gss/gss_krb5_seal.c
index 94a2b3f082a8..eaad9bc7a0bd 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
@@ -229,4 +229,3 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
 		return gss_get_mic_v2(ctx, text, token);
 	}
 }
-
diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
index b601a73cc9db..ef2b25b86d2f 100644
--- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
@@ -225,4 +225,3 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
 		return gss_verify_mic_v2(ctx, message_buffer, read_token);
 	}
 }
-
diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
index a737c2da0837..286fd22404f2 100644
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@@ -623,4 +623,3 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)
 		return gss_unwrap_kerberos_v2(kctx, offset, buf);
 	}
 }
-
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index 5089dbb96d58..860f2a1bbb67 100644
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1389,7 +1389,7 @@ static void destroy_use_gss_proxy_proc_entry(struct net *net)
 	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
 
 	if (sn->use_gssp_proc) {
-		remove_proc_entry("use-gss-proxy", sn->proc_net_rpc); 
+		remove_proc_entry("use-gss-proxy", sn->proc_net_rpc);
 		clear_gssp_clnt(sn);
 	}
 }
diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
index c2c68a15b59d..3c15a99b9700 100644
--- a/net/sunrpc/backchannel_rqst.c
+++ b/net/sunrpc/backchannel_rqst.c
@@ -362,4 +362,3 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)
 	wake_up(&bc_serv->sv_cb_waitq);
 	spin_unlock(&bc_serv->sv_cb_lock);
 }
-
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index d839c33ae7d9..3818e4d55c66 100644
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -892,7 +892,7 @@ rpc_free_client(struct rpc_clnt *clnt)
 /*
  * Free an RPC client
  */
-static struct rpc_clnt * 
+static struct rpc_clnt *
 rpc_free_auth(struct rpc_clnt *clnt)
 {
 	if (clnt->cl_auth == NULL)
diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
index c526f8fb37c9..c7872bc13860 100644
--- a/net/sunrpc/rpcb_clnt.c
+++ b/net/sunrpc/rpcb_clnt.c
@@ -213,7 +213,7 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt,
 	sn->rpcb_local_clnt = clnt;
 	sn->rpcb_local_clnt4 = clnt4;
 	sn->rpcb_is_af_local = is_af_local ? 1 : 0;
-	smp_wmb(); 
+	smp_wmb();
 	sn->rpcb_users = 1;
 	dprintk("RPC:       created new rpcb local clients (rpcb_local_clnt: "
 		"%p, rpcb_local_clnt4: %p) for net %x%s\n",
diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
index f68aa46c9dd7..86f316503c7c 100644
--- a/net/sunrpc/stats.c
+++ b/net/sunrpc/stats.c
@@ -310,4 +310,3 @@ void rpc_proc_exit(struct net *net)
 	dprintk("RPC:       unregistering /proc/net/rpc\n");
 	remove_proc_entry("rpc", net->proc_net);
 }
-
diff --git a/net/sunrpc/sunrpc.h b/net/sunrpc/sunrpc.h
index 09a0315ea77b..c9bacb3c930f 100644
--- a/net/sunrpc/sunrpc.h
+++ b/net/sunrpc/sunrpc.h
@@ -57,4 +57,3 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
 int rpc_clients_notifier_register(void);
 void rpc_clients_notifier_unregister(void);
 #endif /* _NET_SUNRPC_SUNRPC_H */
-
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 3fabf9f6a0f9..a8db2e3f8904 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -880,7 +880,7 @@ static void xprt_wait_on_pinned_rqst(struct rpc_rqst *req)
 __must_hold(&req->rq_xprt->recv_lock)
 {
 	struct rpc_task *task = req->rq_task;
-	
+
 	if (task && test_bit(RPC_TASK_MSG_RECV, &task->tk_runstate)) {
 		spin_unlock(&req->rq_xprt->recv_lock);
 		set_bit(RPC_TASK_MSG_RECV_WAIT, &task->tk_runstate);
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 9e1c5024aba9..6b7539c0466e 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -3375,4 +3375,3 @@ module_param_named(tcp_max_slot_table_entries, xprt_max_tcp_slot_table_entries,
 		   max_slot_table_size, 0644);
 module_param_named(udp_slot_table_entries, xprt_udp_slot_table_entries,
 		   slot_table_size, 0644);
-
-- 
2.18.0

[PATCH PATCH net-next 16/18] bpfilter: remove trailing newline

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/bpfilter/Kconfig       | 1 -
 net/ipv4/bpfilter/Makefile | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net/bpfilter/Kconfig b/net/bpfilter/Kconfig
index 76deb6615883..e558b46596c4 100644
--- a/net/bpfilter/Kconfig
+++ b/net/bpfilter/Kconfig
@@ -13,4 +13,3 @@ config BPFILTER_UMH
 	help
 	  This builds bpfilter kernel module with embedded user mode helper
 endif
-
diff --git a/net/ipv4/bpfilter/Makefile b/net/ipv4/bpfilter/Makefile
index ce262d76cc48..e9e42f99725e 100644
--- a/net/ipv4/bpfilter/Makefile
+++ b/net/ipv4/bpfilter/Makefile
@@ -1,2 +1 @@
 obj-$(CONFIG_BPFILTER) += sockopt.o
-
-- 
2.18.0

[PATCH PATCH net-next 17/18] l2tp: remove trailing newline

[Stephen Hemminger]

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 net/l2tp/l2tp_core.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 1ea285bad84b..c8fc0f7f0b4b 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1795,4 +1795,3 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>");
 MODULE_DESCRIPTION("L2TP core");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(L2TP_DRV_VERSION);
-
-- 
2.18.0

Re: [PATCH PATCH net-next 15/18] sunrpc: whitespace fixes

[Anna Schumaker]

On 07/24/2018 03:29 PM, Stephen Hemminger wrote:
> Remove trailing whitespace and blank line at EOF

Looks good to me, I've applied it to my tree.

Thanks!
Anna

> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---
>  net/sunrpc/auth_gss/auth_gss.c          | 2 +-
>  net/sunrpc/auth_gss/gss_generic_token.c | 1 -
>  net/sunrpc/auth_gss/gss_krb5_crypto.c   | 1 -
>  net/sunrpc/auth_gss/gss_krb5_keys.c     | 1 -
>  net/sunrpc/auth_gss/gss_krb5_seal.c     | 1 -
>  net/sunrpc/auth_gss/gss_krb5_unseal.c   | 1 -
>  net/sunrpc/auth_gss/gss_krb5_wrap.c     | 1 -
>  net/sunrpc/auth_gss/svcauth_gss.c       | 2 +-
>  net/sunrpc/backchannel_rqst.c           | 1 -
>  net/sunrpc/clnt.c                       | 2 +-
>  net/sunrpc/rpcb_clnt.c                  | 2 +-
>  net/sunrpc/stats.c                      | 1 -
>  net/sunrpc/sunrpc.h                     | 1 -
>  net/sunrpc/xprt.c                       | 2 +-
>  net/sunrpc/xprtsock.c                   | 1 -
>  15 files changed, 5 insertions(+), 15 deletions(-)
> 
> diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
> index be8f103d22fd..b67ad98a36a6 100644
> --- a/net/sunrpc/auth_gss/auth_gss.c
> +++ b/net/sunrpc/auth_gss/auth_gss.c
> @@ -1571,7 +1571,7 @@ static int gss_cred_is_negative_entry(struct rpc_cred *cred)
>  	if (test_bit(RPCAUTH_CRED_NEGATIVE, &cred->cr_flags)) {
>  		unsigned long now = jiffies;
>  		unsigned long begin, expire;
> -		struct gss_cred *gss_cred; 
> +		struct gss_cred *gss_cred;
>  
>  		gss_cred = container_of(cred, struct gss_cred, gc_base);
>  		begin = gss_cred->gc_upcall_timestamp;
> diff --git a/net/sunrpc/auth_gss/gss_generic_token.c b/net/sunrpc/auth_gss/gss_generic_token.c
> index 254defe446a7..fe97f3106536 100644
> --- a/net/sunrpc/auth_gss/gss_generic_token.c
> +++ b/net/sunrpc/auth_gss/gss_generic_token.c
> @@ -231,4 +231,3 @@ g_verify_token_header(struct xdr_netobj *mech, int *body_size,
>  }
>  
>  EXPORT_SYMBOL_GPL(g_verify_token_header);
> -
> diff --git a/net/sunrpc/auth_gss/gss_krb5_crypto.c b/net/sunrpc/auth_gss/gss_krb5_crypto.c
> index 8654494b4d0a..a1acee106faa 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_crypto.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_crypto.c
> @@ -1077,4 +1077,3 @@ krb5_rc4_setup_enc_key(struct krb5_ctx *kctx, struct crypto_skcipher *cipher,
>  	dprintk("%s: returning %d\n", __func__, err);
>  	return err;
>  }
> -
> diff --git a/net/sunrpc/auth_gss/gss_krb5_keys.c b/net/sunrpc/auth_gss/gss_krb5_keys.c
> index 870133146026..f7fe2d2b851f 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_keys.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_keys.c
> @@ -324,4 +324,3 @@ u32 gss_krb5_aes_make_key(const struct gss_krb5_enctype *gk5e,
>  err_out:
>  	return ret;
>  }
> -
> diff --git a/net/sunrpc/auth_gss/gss_krb5_seal.c b/net/sunrpc/auth_gss/gss_krb5_seal.c
> index 94a2b3f082a8..eaad9bc7a0bd 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_seal.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
> @@ -229,4 +229,3 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
>  		return gss_get_mic_v2(ctx, text, token);
>  	}
>  }
> -
> diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
> index b601a73cc9db..ef2b25b86d2f 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
> @@ -225,4 +225,3 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
>  		return gss_verify_mic_v2(ctx, message_buffer, read_token);
>  	}
>  }
> -
> diff --git a/net/sunrpc/auth_gss/gss_krb5_wrap.c b/net/sunrpc/auth_gss/gss_krb5_wrap.c
> index a737c2da0837..286fd22404f2 100644
> --- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
> +++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
> @@ -623,4 +623,3 @@ gss_unwrap_kerberos(struct gss_ctx *gctx, int offset, struct xdr_buf *buf)
>  		return gss_unwrap_kerberos_v2(kctx, offset, buf);
>  	}
>  }
> -
> diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
> index 5089dbb96d58..860f2a1bbb67 100644
> --- a/net/sunrpc/auth_gss/svcauth_gss.c
> +++ b/net/sunrpc/auth_gss/svcauth_gss.c
> @@ -1389,7 +1389,7 @@ static void destroy_use_gss_proxy_proc_entry(struct net *net)
>  	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);
>  
>  	if (sn->use_gssp_proc) {
> -		remove_proc_entry("use-gss-proxy", sn->proc_net_rpc); 
> +		remove_proc_entry("use-gss-proxy", sn->proc_net_rpc);
>  		clear_gssp_clnt(sn);
>  	}
>  }
> diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c
> index c2c68a15b59d..3c15a99b9700 100644
> --- a/net/sunrpc/backchannel_rqst.c
> +++ b/net/sunrpc/backchannel_rqst.c
> @@ -362,4 +362,3 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied)
>  	wake_up(&bc_serv->sv_cb_waitq);
>  	spin_unlock(&bc_serv->sv_cb_lock);
>  }
> -
> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
> index d839c33ae7d9..3818e4d55c66 100644
> --- a/net/sunrpc/clnt.c
> +++ b/net/sunrpc/clnt.c
> @@ -892,7 +892,7 @@ rpc_free_client(struct rpc_clnt *clnt)
>  /*
>   * Free an RPC client
>   */
> -static struct rpc_clnt * 
> +static struct rpc_clnt *
>  rpc_free_auth(struct rpc_clnt *clnt)
>  {
>  	if (clnt->cl_auth == NULL)
> diff --git a/net/sunrpc/rpcb_clnt.c b/net/sunrpc/rpcb_clnt.c
> index c526f8fb37c9..c7872bc13860 100644
> --- a/net/sunrpc/rpcb_clnt.c
> +++ b/net/sunrpc/rpcb_clnt.c
> @@ -213,7 +213,7 @@ static void rpcb_set_local(struct net *net, struct rpc_clnt *clnt,
>  	sn->rpcb_local_clnt = clnt;
>  	sn->rpcb_local_clnt4 = clnt4;
>  	sn->rpcb_is_af_local = is_af_local ? 1 : 0;
> -	smp_wmb(); 
> +	smp_wmb();
>  	sn->rpcb_users = 1;
>  	dprintk("RPC:       created new rpcb local clients (rpcb_local_clnt: "
>  		"%p, rpcb_local_clnt4: %p) for net %x%s\n",
> diff --git a/net/sunrpc/stats.c b/net/sunrpc/stats.c
> index f68aa46c9dd7..86f316503c7c 100644
> --- a/net/sunrpc/stats.c
> +++ b/net/sunrpc/stats.c
> @@ -310,4 +310,3 @@ void rpc_proc_exit(struct net *net)
>  	dprintk("RPC:       unregistering /proc/net/rpc\n");
>  	remove_proc_entry("rpc", net->proc_net);
>  }
> -
> diff --git a/net/sunrpc/sunrpc.h b/net/sunrpc/sunrpc.h
> index 09a0315ea77b..c9bacb3c930f 100644
> --- a/net/sunrpc/sunrpc.h
> +++ b/net/sunrpc/sunrpc.h
> @@ -57,4 +57,3 @@ int svc_send_common(struct socket *sock, struct xdr_buf *xdr,
>  int rpc_clients_notifier_register(void);
>  void rpc_clients_notifier_unregister(void);
>  #endif /* _NET_SUNRPC_SUNRPC_H */
> -
> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
> index 3fabf9f6a0f9..a8db2e3f8904 100644
> --- a/net/sunrpc/xprt.c
> +++ b/net/sunrpc/xprt.c
> @@ -880,7 +880,7 @@ static void xprt_wait_on_pinned_rqst(struct rpc_rqst *req)
>  __must_hold(&req->rq_xprt->recv_lock)
>  {
>  	struct rpc_task *task = req->rq_task;
> -	
> +
>  	if (task && test_bit(RPC_TASK_MSG_RECV, &task->tk_runstate)) {
>  		spin_unlock(&req->rq_xprt->recv_lock);
>  		set_bit(RPC_TASK_MSG_RECV_WAIT, &task->tk_runstate);
> diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
> index 9e1c5024aba9..6b7539c0466e 100644
> --- a/net/sunrpc/xprtsock.c
> +++ b/net/sunrpc/xprtsock.c
> @@ -3375,4 +3375,3 @@ module_param_named(tcp_max_slot_table_entries, xprt_max_tcp_slot_table_entries,
>  		   max_slot_table_size, 0644);
>  module_param_named(udp_slot_table_entries, xprt_udp_slot_table_entries,
>  		   slot_table_size, 0644);
> -
>