Deleted Added
full compact
toecore.c (288124) toecore.c (292309)
1/*-
2 * Copyright (c) 2012 Chelsio Communications, Inc.
3 * All rights reserved.
4 * Written by: Navdeep Parhar <np@FreeBSD.org>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2012 Chelsio Communications, Inc.
3 * All rights reserved.
4 * Written by: Navdeep Parhar <np@FreeBSD.org>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/netinet/toecore.c 288124 2015-09-22 19:05:44Z melifaro $");
29__FBSDID("$FreeBSD: head/sys/netinet/toecore.c 292309 2015-12-16 00:56:45Z rrs $");
30
31#include "opt_inet.h"
32#include "opt_inet6.h"
33
34#include <sys/param.h>
35#include <sys/kernel.h>
36#include <sys/systm.h>
37#include <sys/mbuf.h>

--- 466 unchanged lines hidden (view full) ---

504 * TCP's pru_connect would have done if the connection
505 * wasn't offloaded.
506 */
507
508 tod->tod_pcb_detach(tod, tp);
509 KASSERT(!(tp->t_flags & TF_TOE),
510 ("%s: tp %p still offloaded.", __func__, tp));
511 tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
30
31#include "opt_inet.h"
32#include "opt_inet6.h"
33
34#include <sys/param.h>
35#include <sys/kernel.h>
36#include <sys/systm.h>
37#include <sys/mbuf.h>

--- 466 unchanged lines hidden (view full) ---

504 * TCP's pru_connect would have done if the connection
505 * wasn't offloaded.
506 */
507
508 tod->tod_pcb_detach(tod, tp);
509 KASSERT(!(tp->t_flags & TF_TOE),
510 ("%s: tp %p still offloaded.", __func__, tp));
511 tcp_timer_activate(tp, TT_KEEP, TP_KEEPINIT(tp));
512 (void) tcp_output(tp);
512 (void) tp->t_fb->tfb_tcp_output(tp);
513 } else {
514
515 INP_INFO_RLOCK_ASSERT(&V_tcbinfo);
516 tp = tcp_drop(tp, err);
517 if (tp == NULL)
518 INP_WLOCK(inp); /* re-acquire */
519 }
520 }

--- 64 unchanged lines hidden ---
513 } else {
514
515 INP_INFO_RLOCK_ASSERT(&V_tcbinfo);
516 tp = tcp_drop(tp, err);
517 if (tp == NULL)
518 INP_WLOCK(inp); /* re-acquire */
519 }
520 }

--- 64 unchanged lines hidden ---