aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander V. Chernikov <melifaro@FreeBSD.org>2023-01-14 17:35:43 +0000
committerAlexander V. Chernikov <melifaro@FreeBSD.org>2023-01-23 22:09:04 +0000
commita16f805f820e00b6b2ef1f8b9a6c7408bd2aec6d (patch)
tree2fedac7371e71f3a8f041f529faef98c17b164fa
parent982fe580347015eff723b751535fe31c2055ff20 (diff)
downloadsrc-a16f805f820e00b6b2ef1f8b9a6c7408bd2aec6d.tar.gz
src-a16f805f820e00b6b2ef1f8b9a6c7408bd2aec6d.zip
man: add Netlink reference to socket(2)
Reviewed by: lwhsu, pauamma, gbe Differential Revision: https://reviews.freebsd.org/D38054 (cherry picked from commit b0286ee504c605027c747e061591535c67032cf5)
-rw-r--r--lib/libc/sys/socket.24
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/libc/sys/socket.2 b/lib/libc/sys/socket.2
index b23d207c9730..7cff244345e9 100644
--- a/lib/libc/sys/socket.2
+++ b/lib/libc/sys/socket.2
@@ -65,7 +65,11 @@ PF_LINK Link layer interface,
PF_KEY Internal key-management function,
PF_NATM Asynchronous transfer mode protocols,
PF_NETGRAPH Netgraph sockets,
+<<<<<<< HEAD
PF_IEEE80211 IEEE 802.11 wireless link-layer protocols (WiFi),
+=======
+PF_NETLINK Netlink protocols,
+>>>>>>> b0286ee504c6 (man: add Netlink reference to socket(2))
PF_BLUETOOTH Bluetooth protocols,
PF_INET_SDP OFED socket direct protocol (IPv4),
PF_INET6_SDP OFED socket direct protocol (IPv6)