diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2019-03-14 13:40:11 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-03-14 13:40:11 +0100 |
| commit | 1e8208402d9c84d5f3ee6e33b63db8befbf61032 (patch) | |
| tree | 0ba7960b0df43587ff36adde61a41359802acf8e /sys/linux/socket_arm.const | |
| parent | d34313cd5d5c25ea3a914140f25168738dc96aef (diff) | |
sys/linux: regenerate and fix const files
1. Move fsverity descriptions to a separate file which
is not regenerated automatically. It was dropped from linux-next.
2. Fix tlk_device.txt name in syz-extract.
3. Update some socket consts e.g. s/SO_TIMESTAMPING/SO_TIMESTAMPING_OLD/.
4. Regenerate const files on current upstream head.
Diffstat (limited to 'sys/linux/socket_arm.const')
| -rw-r--r-- | sys/linux/socket_arm.const | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/linux/socket_arm.const b/sys/linux/socket_arm.const index 88c3991fd..02c27cb12 100644 --- a/sys/linux/socket_arm.const +++ b/sys/linux/socket_arm.const @@ -311,7 +311,7 @@ SO_PROTOCOL = 38 SO_RCVBUF = 8 SO_RCVBUFFORCE = 33 SO_RCVLOWAT = 18 -SO_RCVTIMEO = 20 +SO_RCVTIMEO_OLD = 20 SO_REUSEADDR = 2 SO_REUSEPORT = 15 SO_RXQ_OVFL = 40 @@ -319,10 +319,10 @@ SO_SELECT_ERR_QUEUE = 45 SO_SNDBUF = 7 SO_SNDBUFFORCE = 32 SO_SNDLOWAT = 19 -SO_SNDTIMEO = 21 -SO_TIMESTAMP = 29 -SO_TIMESTAMPING = 37 -SO_TIMESTAMPNS = 35 +SO_SNDTIMEO_OLD = 21 +SO_TIMESTAMPING_OLD = 37 +SO_TIMESTAMPNS_OLD = 35 +SO_TIMESTAMP_OLD = 29 SO_TXTIME = 61 SO_TYPE = 3 SO_WIFI_STATUS = 41 |