[src/trunk]: src/sys/netinet pr_generic() for req = PRU_RCVOOB is always call...

[rtr <rtr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/61b254ca1b84
branches:  trunk
changeset: 330578:61b254ca1b84
user:      rtr <rtr%NetBSD.org@localhost>
date:      Mon Jul 14 13:20:41 2014 +0000

description:
pr_generic() for req = PRU_RCVOOB is always called with control == NULL
so don't bother with a conditional block that handles non-NULL, it
doesn't happen.

diffstat:

 sys/netinet/tcp_usrreq.c |  10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diffs (31 lines):

diff -r 9a7186571fe6 -r 61b254ca1b84 sys/netinet/tcp_usrreq.c
--- a/sys/netinet/tcp_usrreq.c  Mon Jul 14 12:40:38 2014 +0000
+++ b/sys/netinet/tcp_usrreq.c  Mon Jul 14 13:20:41 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tcp_usrreq.c,v 1.187 2014/07/10 14:05:19 rmind Exp $   */
+/*     $NetBSD: tcp_usrreq.c,v 1.188 2014/07/14 13:20:41 rtr Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.187 2014/07/10 14:05:19 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_usrreq.c,v 1.188 2014/07/14 13:20:41 rtr Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -473,12 +473,6 @@
                break;
 
        case PRU_RCVOOB:
-               if (control && control->m_len) {
-                       m_freem(control);
-                       m_freem(m);
-                       error = EINVAL;
-                       break;
-               }
                if ((so->so_oobmark == 0 &&
                    (so->so_state & SS_RCVATMARK) == 0) ||
                    so->so_options & SO_OOBINLINE ||