1 files changed, 60 insertions, 60 deletions
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 454e523b506a..dc206f1f914f 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -788,53 +788,53 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 }
 const struct proto_ops inet_stream_ops = {
-        .family =       PF_INET,
+        .family            = PF_INET,
-        .owner =        THIS_MODULE,
+        .owner             = THIS_MODULE,
-        .release =      inet_release,
+        .release           = inet_release,
-        .bind =         inet_bind,
+        .bind              = inet_bind,
-        .connect =      inet_stream_connect,
+        .connect           = inet_stream_connect,
-        .socketpair =   sock_no_socketpair,
+        .socketpair        = sock_no_socketpair,
-        .accept =       inet_accept,
+        .accept            = inet_accept,
-        .getname =      inet_getname,
+        .getname           = inet_getname,
-        .poll =         tcp_poll,
+        .poll              = tcp_poll,
-        .ioctl =        inet_ioctl,
+        .ioctl             = inet_ioctl,
-        .listen =       inet_listen,
+        .listen            = inet_listen,
-        .shutdown =     inet_shutdown,
+        .shutdown          = inet_shutdown,
-        .setsockopt =   sock_common_setsockopt,
+        .setsockopt        = sock_common_setsockopt,
-        .getsockopt =   sock_common_getsockopt,
+        .getsockopt        = sock_common_getsockopt,
+        .sendmsg           = inet_sendmsg,
+        .recvmsg           = sock_common_recvmsg,
+        .mmap              = sock_no_mmap,
+        .sendpage          = tcp_sendpage,
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_sock_common_setsockopt,
+        .compat_setsockopt = compat_sock_common_setsockopt,
-        .compat_getsockopt      = compat_sock_common_getsockopt,
+        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif
-        .sendmsg =      inet_sendmsg,
-        .recvmsg =      sock_common_recvmsg,
-        .mmap =         sock_no_mmap,
-        .sendpage =     tcp_sendpage
 };
 const struct proto_ops inet_dgram_ops = {
-        .family =       PF_INET,
+        .family            = PF_INET,
-        .owner =        THIS_MODULE,
+        .owner             = THIS_MODULE,
-        .release =      inet_release,
+        .release           = inet_release,
-        .bind =         inet_bind,
+        .bind              = inet_bind,
-        .connect =      inet_dgram_connect,
+        .connect           = inet_dgram_connect,
-        .socketpair =   sock_no_socketpair,
+        .socketpair        = sock_no_socketpair,
-        .accept =       sock_no_accept,
+        .accept            = sock_no_accept,
-        .getname =      inet_getname,
+        .getname           = inet_getname,
-        .poll =         udp_poll,
+        .poll              = udp_poll,
-        .ioctl =        inet_ioctl,
+        .ioctl             = inet_ioctl,
-        .listen =       sock_no_listen,
+        .listen            = sock_no_listen,
-        .shutdown =     inet_shutdown,
+        .shutdown          = inet_shutdown,
-        .setsockopt =   sock_common_setsockopt,
+        .setsockopt        = sock_common_setsockopt,
-        .getsockopt =   sock_common_getsockopt,
+        .getsockopt        = sock_common_getsockopt,
+        .sendmsg           = inet_sendmsg,
+        .recvmsg           = sock_common_recvmsg,
+        .mmap              = sock_no_mmap,
+        .sendpage          = inet_sendpage,
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_sock_common_setsockopt,
+        .compat_setsockopt = compat_sock_common_setsockopt,
-        .compat_getsockopt      = compat_sock_common_getsockopt,
+        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif
-        .sendmsg =      inet_sendmsg,
-        .recvmsg =      sock_common_recvmsg,
-        .mmap =         sock_no_mmap,
-        .sendpage =     inet_sendpage,
 };
 /*
@@ -842,28 +842,28 @@ const struct proto_ops inet_dgram_ops = {
 * udp_poll
 */
 static const struct proto_ops inet_sockraw_ops = {
-        .family =       PF_INET,
+        .family            = PF_INET,
-        .owner =        THIS_MODULE,
+        .owner             = THIS_MODULE,
-        .release =      inet_release,
+        .release           = inet_release,
-        .bind =         inet_bind,
+        .bind              = inet_bind,
-        .connect =      inet_dgram_connect,
+        .connect           = inet_dgram_connect,
-        .socketpair =   sock_no_socketpair,
+        .socketpair        = sock_no_socketpair,
-        .accept =       sock_no_accept,
+        .accept            = sock_no_accept,
-        .getname =      inet_getname,
+        .getname           = inet_getname,
-        .poll =         datagram_poll,
+        .poll              = datagram_poll,
-        .ioctl =        inet_ioctl,
+        .ioctl             = inet_ioctl,
-        .listen =       sock_no_listen,
+        .listen            = sock_no_listen,
-        .shutdown =     inet_shutdown,
+        .shutdown          = inet_shutdown,
-        .setsockopt =   sock_common_setsockopt,
+        .setsockopt        = sock_common_setsockopt,
-        .getsockopt =   sock_common_getsockopt,
+        .getsockopt        = sock_common_getsockopt,
+        .sendmsg           = inet_sendmsg,
+        .recvmsg           = sock_common_recvmsg,
+        .mmap              = sock_no_mmap,
+        .sendpage          = inet_sendpage,
 #ifdef CONFIG_COMPAT
-        .compat_setsockopt      = compat_sock_common_setsockopt,
+        .compat_setsockopt = compat_sock_common_setsockopt,
-        .compat_getsockopt      = compat_sock_common_getsockopt,
+        .compat_getsockopt = compat_sock_common_getsockopt,
 #endif
-        .sendmsg =      inet_sendmsg,
-        .recvmsg =      sock_common_recvmsg,
-        .mmap =         sock_no_mmap,
-        .sendpage =     inet_sendpage,
 };
 static struct net_proto_family inet_family_ops = {

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 454e523b506a..dc206f1f914f 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c
@@ -788,53 +788,53 @@ int inet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
788	}	788	}
789		789
790	const struct proto_ops inet_stream_ops = {	790	const struct proto_ops inet_stream_ops = {
791	.family = PF_INET,	791	.family = PF_INET,
792	.owner = THIS_MODULE,	792	.owner = THIS_MODULE,
793	.release = inet_release,	793	.release = inet_release,
794	.bind = inet_bind,	794	.bind = inet_bind,
795	.connect = inet_stream_connect,	795	.connect = inet_stream_connect,
796	.socketpair = sock_no_socketpair,	796	.socketpair = sock_no_socketpair,
797	.accept = inet_accept,	797	.accept = inet_accept,
798	.getname = inet_getname,	798	.getname = inet_getname,
799	.poll = tcp_poll,	799	.poll = tcp_poll,
800	.ioctl = inet_ioctl,	800	.ioctl = inet_ioctl,
801	.listen = inet_listen,	801	.listen = inet_listen,
802	.shutdown = inet_shutdown,	802	.shutdown = inet_shutdown,
803	.setsockopt = sock_common_setsockopt,	803	.setsockopt = sock_common_setsockopt,
804	.getsockopt = sock_common_getsockopt,	804	.getsockopt = sock_common_getsockopt,
		805	.sendmsg = inet_sendmsg,
		806	.recvmsg = sock_common_recvmsg,
		807	.mmap = sock_no_mmap,
		808	.sendpage = tcp_sendpage,
805	#ifdef CONFIG_COMPAT	809	#ifdef CONFIG_COMPAT
806	.compat_setsockopt = compat_sock_common_setsockopt,	810	.compat_setsockopt = compat_sock_common_setsockopt,
807	.compat_getsockopt = compat_sock_common_getsockopt,	811	.compat_getsockopt = compat_sock_common_getsockopt,
808	#endif	812	#endif
809	.sendmsg = inet_sendmsg,
810	.recvmsg = sock_common_recvmsg,
811	.mmap = sock_no_mmap,
812	.sendpage = tcp_sendpage
813	};	813	};
814		814
815	const struct proto_ops inet_dgram_ops = {	815	const struct proto_ops inet_dgram_ops = {
816	.family = PF_INET,	816	.family = PF_INET,
817	.owner = THIS_MODULE,	817	.owner = THIS_MODULE,
818	.release = inet_release,	818	.release = inet_release,
819	.bind = inet_bind,	819	.bind = inet_bind,
820	.connect = inet_dgram_connect,	820	.connect = inet_dgram_connect,
821	.socketpair = sock_no_socketpair,	821	.socketpair = sock_no_socketpair,
822	.accept = sock_no_accept,	822	.accept = sock_no_accept,
823	.getname = inet_getname,	823	.getname = inet_getname,
824	.poll = udp_poll,	824	.poll = udp_poll,
825	.ioctl = inet_ioctl,	825	.ioctl = inet_ioctl,
826	.listen = sock_no_listen,	826	.listen = sock_no_listen,
827	.shutdown = inet_shutdown,	827	.shutdown = inet_shutdown,
828	.setsockopt = sock_common_setsockopt,	828	.setsockopt = sock_common_setsockopt,
829	.getsockopt = sock_common_getsockopt,	829	.getsockopt = sock_common_getsockopt,
		830	.sendmsg = inet_sendmsg,
		831	.recvmsg = sock_common_recvmsg,
		832	.mmap = sock_no_mmap,
		833	.sendpage = inet_sendpage,
830	#ifdef CONFIG_COMPAT	834	#ifdef CONFIG_COMPAT
831	.compat_setsockopt = compat_sock_common_setsockopt,	835	.compat_setsockopt = compat_sock_common_setsockopt,
832	.compat_getsockopt = compat_sock_common_getsockopt,	836	.compat_getsockopt = compat_sock_common_getsockopt,
833	#endif	837	#endif
834	.sendmsg = inet_sendmsg,
835	.recvmsg = sock_common_recvmsg,
836	.mmap = sock_no_mmap,
837	.sendpage = inet_sendpage,
838	};	838	};
839		839
840	/*	840	/*
@@ -842,28 +842,28 @@ const struct proto_ops inet_dgram_ops = {
842	* udp_poll	842	* udp_poll
843	*/	843	*/
844	static const struct proto_ops inet_sockraw_ops = {	844	static const struct proto_ops inet_sockraw_ops = {
845	.family = PF_INET,	845	.family = PF_INET,
846	.owner = THIS_MODULE,	846	.owner = THIS_MODULE,
847	.release = inet_release,	847	.release = inet_release,
848	.bind = inet_bind,	848	.bind = inet_bind,
849	.connect = inet_dgram_connect,	849	.connect = inet_dgram_connect,
850	.socketpair = sock_no_socketpair,	850	.socketpair = sock_no_socketpair,
851	.accept = sock_no_accept,	851	.accept = sock_no_accept,
852	.getname = inet_getname,	852	.getname = inet_getname,
853	.poll = datagram_poll,	853	.poll = datagram_poll,
854	.ioctl = inet_ioctl,	854	.ioctl = inet_ioctl,
855	.listen = sock_no_listen,	855	.listen = sock_no_listen,
856	.shutdown = inet_shutdown,	856	.shutdown = inet_shutdown,
857	.setsockopt = sock_common_setsockopt,	857	.setsockopt = sock_common_setsockopt,
858	.getsockopt = sock_common_getsockopt,	858	.getsockopt = sock_common_getsockopt,
		859	.sendmsg = inet_sendmsg,
		860	.recvmsg = sock_common_recvmsg,
		861	.mmap = sock_no_mmap,
		862	.sendpage = inet_sendpage,
859	#ifdef CONFIG_COMPAT	863	#ifdef CONFIG_COMPAT
860	.compat_setsockopt = compat_sock_common_setsockopt,	864	.compat_setsockopt = compat_sock_common_setsockopt,
861	.compat_getsockopt = compat_sock_common_getsockopt,	865	.compat_getsockopt = compat_sock_common_getsockopt,
862	#endif	866	#endif
863	.sendmsg = inet_sendmsg,
864	.recvmsg = sock_common_recvmsg,
865	.mmap = sock_no_mmap,
866	.sendpage = inet_sendpage,
867	};	867	};
868		868
869	static struct net_proto_family inet_family_ops = {	869	static struct net_proto_family inet_family_ops = {