diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2016-03-15 11:17:04 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2016-03-15 11:17:04 +0100 |
| commit | bebcaf3b934ed3503a3d3875c99523c00d4b0d13 (patch) | |
| tree | c6e31c1e7230083957b33a1753e3a855db0d14bf /sys | |
| parent | 0eaf69835ae00204a0dfef7a7f65d7616579dc04 (diff) | |
| parent | a420b770deb51d4dec9f5cc0f30a3a16f14b24ac (diff) | |
Merge pull request #36 from lorenzo-stoakes/fix-gen-linux-next
sys: add removed defines to fix generate in linux-next
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netlink.txt | 4 | ||||
| -rw-r--r-- | sys/socket.txt | 3 |
2 files changed, 7 insertions, 0 deletions
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 |