Revert "net: add pf_family_names[] for protocol family"

This reverts commit 1f3c98eaddec857e16a7a1c6cd83317b3dc89438.

Does not build...

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/uapi/linux/net.h b/include/uapi/linux/net.h
index a28caaf620c7f02724ed1e4f5724377ad58b8222..4dabec6bd957d604dd3f18f7b9896c82a789eb87 100644 (file)
--- a/include/uapi/linux/net.h
+++ b/include/uapi/linux/net.h
@@ -55,52 +55,4 @@ typedef enum {
 
 #define __SO_ACCEPTCON (1 << 16)       /* performed a listen           */
 
-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",
-};
-
 #endif /* _UAPI_LINUX_NET_H */

diff --git a/net/socket.c b/net/socket.c
index ff544cf5032141a6b32e387674ed2a504d76af51..27e3e7d53f8e851ae992ef4a04512fcaff3cfcd2 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2988,7 +2988,7 @@ int sock_register(const struct net_proto_family *ops)
        }
        spin_unlock(&net_family_lock);
 
-       pr_info("NET: Registered %s protocol family\n", pf_family_names[ops->family]);
+       pr_info("NET: Registered protocol family %d\n", ops->family);
        return err;
 }
 EXPORT_SYMBOL(sock_register);