33c33
< __FBSDID("$FreeBSD: head/sys/kern/sys_socket.c 130398 2004-06-13 02:50:07Z rwatson $");
---
> __FBSDID("$FreeBSD: head/sys/kern/sys_socket.c 130480 2004-06-14 18:16:22Z rwatson $");
171c171
< *(int *)data = (so->so_state&SS_RCVATMARK) != 0;
---
> *(int *)data = (so->so_rcv.sb_state & SBS_RCVATMARK) != 0;
210c210
< * If SS_CANTRCVMORE is set, but there's still data left in the
---
> * If SBS_CANTRCVMORE is set, but there's still data left in the
213c213
< if ((so->so_state & SS_CANTRCVMORE) == 0 ||
---
> if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) == 0 ||
216c216
< if ((so->so_state & SS_CANTSENDMORE) == 0)
---
> if ((so->so_snd.sb_state & SBS_CANTSENDMORE) == 0)