Commit fe0bdbde authored by Yejune Deng's avatar Yejune Deng Committed by David S. Miller
Browse files

net: add pf_family_names[] for protocol family 



Modify the pr_info content from int to char * in sock_register() and
sock_unregister(), this looks more readable.

Fixed build error in ARCH=sparc64.

Signed-off-by: default avatarYejune Deng <yejune.deng@gmail.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c829de39

net/socket.c

+50 −2
Original line number Diff line number Diff line
@@ -165,6 +165,54 @@ static const struct file_operations socket_file_ops = { 
	.show_fdinfo =	sock_show_fdinfo,

};



static const char * const pf_family_names[] = {

	[PF_UNSPEC]	= "PF_UNSPEC",

	[PF_UNIX]	= "PF_UNIX/PF_LOCAL",

	[PF_INET]	= "PF_INET",

	[PF_AX25]	= "PF_AX25",

	[PF_IPX]	= "PF_IPX",

	[PF_APPLETALK]	= "PF_APPLETALK",

	[PF_NETROM]	= "PF_NETROM",

	[PF_BRIDGE]	= "PF_BRIDGE",

	[PF_ATMPVC]	= "PF_ATMPVC",

	[PF_X25]	= "PF_X25",

	[PF_INET6]	= "PF_INET6",

	[PF_ROSE]	= "PF_ROSE",

	[PF_DECnet]	= "PF_DECnet",

	[PF_NETBEUI]	= "PF_NETBEUI",

	[PF_SECURITY]	= "PF_SECURITY",

	[PF_KEY]	= "PF_KEY",

	[PF_NETLINK]	= "PF_NETLINK/PF_ROUTE",

	[PF_PACKET]	= "PF_PACKET",

	[PF_ASH]	= "PF_ASH",

	[PF_ECONET]	= "PF_ECONET",

	[PF_ATMSVC]	= "PF_ATMSVC",

	[PF_RDS]	= "PF_RDS",

	[PF_SNA]	= "PF_SNA",

	[PF_IRDA]	= "PF_IRDA",

	[PF_PPPOX]	= "PF_PPPOX",

	[PF_WANPIPE]	= "PF_WANPIPE",

	[PF_LLC]	= "PF_LLC",

	[PF_IB]		= "PF_IB",

	[PF_MPLS]	= "PF_MPLS",

	[PF_CAN]	= "PF_CAN",

	[PF_TIPC]	= "PF_TIPC",

	[PF_BLUETOOTH]	= "PF_BLUETOOTH",

	[PF_IUCV]	= "PF_IUCV",

	[PF_RXRPC]	= "PF_RXRPC",

	[PF_ISDN]	= "PF_ISDN",

	[PF_PHONET]	= "PF_PHONET",

	[PF_IEEE802154]	= "PF_IEEE802154",

	[PF_CAIF]	= "PF_CAIF",

	[PF_ALG]	= "PF_ALG",

	[PF_NFC]	= "PF_NFC",

	[PF_VSOCK]	= "PF_VSOCK",

	[PF_KCM]	= "PF_KCM",

	[PF_QIPCRTR]	= "PF_QIPCRTR",

	[PF_SMC]	= "PF_SMC",

	[PF_XDP]	= "PF_XDP",

};



/*

 *	The protocol list. Each protocol is registered in here.

 */
@@ -2975,7 +3023,7 @@ int sock_register(const struct net_proto_family *ops) 
	}

	spin_unlock(&net_family_lock);



	pr_info("NET: Registered protocol family %d\n", ops->family);

	pr_info("NET: Registered %s protocol family\n", pf_family_names[ops->family]);

	return err;

}

EXPORT_SYMBOL(sock_register);
@@ -3003,7 +3051,7 @@ void sock_unregister(int family) 


	synchronize_rcu();



	pr_info("NET: Unregistered protocol family %d\n", family);

	pr_info("NET: Unregistered %s protocol family\n", pf_family_names[family]);

}

EXPORT_SYMBOL(sock_unregister);