From a420b770deb51d4dec9f5cc0f30a3a16f14b24ac Mon Sep 17 00:00:00 2001 From: Lorenzo Stoakes Date: Fri, 11 Mar 2016 21:49:36 +0000 Subject: sys: add removed defines to fix generate in linux-next This patch redefines constants that were removed in patches between 4.4 and linux-next, so both linux-next and mainline work with make generate. --- sys/netlink.txt | 4 ++++ sys/socket.txt | 3 +++ 2 files changed, 7 insertions(+) (limited to 'sys') diff --git a/sys/netlink.txt b/sys/netlink.txt index 245c9f901..17ffbe0c4 100644 --- a/sys/netlink.txt +++ b/sys/netlink.txt @@ -62,3 +62,7 @@ nl_mmap_req { fsize int32 fnumber int32 } + +# Removed (if __KERNEL__ defined) in next-20160229 (commit d1b4c689) +define NETLINK_RX_RING 6 +define NETLINK_TX_RING 7 diff --git a/sys/socket.txt b/sys/socket.txt index e1d7fb80d..fecb3dccf 100644 --- a/sys/socket.txt +++ b/sys/socket.txt @@ -604,3 +604,6 @@ bt_ioctl = TIOCOUTQ, TIOCINQ, SIOCGSTAMP, SIOCGSTAMPNS bt_l2cap_type = SOCK_SEQPACKET, SOCK_STREAM, SOCK_DGRAM, SOCK_RAW bt_l2cap_lm = L2CAP_LM_MASTER, L2CAP_LM_AUTH, L2CAP_LM_ENCRYPT, L2CAP_LM_TRUSTED, L2CAP_LM_RELIABLE, L2CAP_LM_SECURE, L2CAP_LM_FIPS bt_rfcomm_type = SOCK_STREAM, SOCK_RAW + +# Removed in next-20160210 (commit 11049218) +define CRYPTO_ALG_TYPE_PCOMPRESS 0x0000000f -- cgit mrf-deployment