I was just looking at recent changes, and came across commit 4756b6317. I don't know anything specifically about the *_TIMESTAMPNS_OLD stuff, but I do know that the SO_* symbols are for the socket options and the SCM_* symbols are for the CMSG types, so I don't see how this could possibly be correct. Note the code immediately above it. Fred Wright