svn commit: r206725 - stable/8/sys/netinet

[Randall Stewart]

Author: rrs
Date: Sat Apr 17 03:43:02 2010
New Revision: 206725
URL: http://svn.freebsd.org/changeset/base/206725

Log:
  MFC of 202517
  
  Again gets rid of some rather strange ifdef's for
  APPLE/USERSPACE that drifted in through our scrubber
  programs.

Modified:
  stable/8/sys/netinet/sctp_output.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/netinet/sctp_output.c
==============================================================================
--- stable/8/sys/netinet/sctp_output.c	Sat Apr 17 03:40:48 2010	(r206724)
+++ stable/8/sys/netinet/sctp_output.c	Sat Apr 17 03:43:02 2010	(r206725)
@@ -3490,11 +3490,7 @@ sctp_lowlevel_chunk_output(struct sctp_i
 			tos_value = inp->ip_inp.inp.inp_ip_tos;
 		}
 		if ((nofragment_flag) && (port == 0)) {
-#if defined(WITH_CONVERT_IP_OFF) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__Userspace__)
 			ip->ip_off = IP_DF;
-#else
-			ip->ip_off = htons(IP_DF);
-#endif
 		} else
 			ip->ip_off = 0;