summaryrefslogtreecommitdiff
path: root/sys/netinet/udp_usrreq.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2014-03-27 13:27:29 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2014-03-27 13:27:29 +0000
commit620d3a061aa343f5fabbfdc369d74e87189fef92 (patch)
tree769e8293df5c249233664d81a8ffaa24cab97e38 /sys/netinet/udp_usrreq.c
parenta60d23cf894b723792016c5977d047e4c0f1674a (diff)
Retire kernel support for SO_DONTROUTE, since the plan is to always
use the routing table there's no future for an option that wants to bypass it. This option has never been implemented for IPv6 anyway, so let's just remove the IPv4 bits that you weren't aware of. Tested by florian@, man pages inputs from jmc@, ok benno@
Diffstat (limited to 'sys/netinet/udp_usrreq.c')
-rw-r--r--sys/netinet/udp_usrreq.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 7779fdaae3e..b85330eeec0 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_usrreq.c,v 1.174 2014/01/24 18:54:58 henning Exp $ */
+/* $OpenBSD: udp_usrreq.c,v 1.175 2014/03/27 13:27:28 mpi Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@@ -1090,8 +1090,8 @@ udp_output(struct mbuf *m, ...)
m->m_pkthdr.rdomain = inp->inp_rtableid;
error = ip_output(m, inp->inp_options, &inp->inp_route,
- (inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST))
- |IP_IPSECFLOW, inp->inp_moptions, inp, ipsecflowinfo);
+ (inp->inp_socket->so_options & SO_BROADCAST) | IP_IPSECFLOW,
+ inp->inp_moptions, inp, ipsecflowinfo);
if (error == EACCES) /* translate pf(4) error for userland */
error = EHOSTUNREACH;