summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2021-06-18 22:02:45 +0200
committerDavid S. Miller <davem@davemloft.net>2021-06-18 22:02:45 +0200
commit103ebe658a262ef5b5db7f01d83857cf82a087d0 (patch)
tree6cb49e7b655cc363f24a5d479349c6d2a6dba712
parentnet: add pf_family_names[] for protocol family (diff)
downloadlinux-103ebe658a262ef5b5db7f01d83857cf82a087d0.tar.xz
linux-103ebe658a262ef5b5db7f01d83857cf82a087d0.zip
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>
-rw-r--r--include/uapi/linux/net.h48
-rw-r--r--net/socket.c2
2 files changed, 1 insertions, 49 deletions
diff --git a/include/uapi/linux/net.h b/include/uapi/linux/net.h
index a28caaf620c7..4dabec6bd957 100644
--- 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 ff544cf50321..27e3e7d53f8e 100644
--- 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);