diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2015-11-11 18:55:25 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2015-11-11 18:55:25 +0000 |
| commit | 9cf310367f8c3c45363d33473ce0e5c3fbcf419c (patch) | |
| tree | 5d8a8d09074dbbc66d970d0a2a717368a452fce7 /sys/dev/ntb/if_ntb/if_ntb.c | |
| parent | e4a818a92221eb7eb899f7739501178514fdd43c (diff) | |
| download | src-9cf310367f8c3c45363d33473ce0e5c3fbcf419c.tar.gz src-9cf310367f8c3c45363d33473ce0e5c3fbcf419c.zip | |
NTB: Diff reduce with Linux
No functional change.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=290682
Diffstat (limited to 'sys/dev/ntb/if_ntb/if_ntb.c')
| -rw-r--r-- | sys/dev/ntb/if_ntb/if_ntb.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index 89160b29d7f5..234795309599 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -273,7 +273,7 @@ static void ntb_net_tx_handler(struct ntb_transport_qp *qp, void *qp_data, static void ntb_net_rx_handler(struct ntb_transport_qp *qp, void *qp_data, void *data, int len); static void ntb_net_event_handler(void *data, enum ntb_link_event status); -static int ntb_transport_init(struct ntb_softc *ntb); +static int ntb_transport_probe(struct ntb_softc *ntb); static void ntb_transport_free(struct ntb_transport_ctx *); static void ntb_transport_init_queue(struct ntb_transport_ctx *nt, unsigned int qp_num); @@ -368,7 +368,7 @@ ntb_setup_interface(void) return (ENXIO); } - rc = ntb_transport_init(net_softc.ntb); + rc = ntb_transport_probe(net_softc.ntb); if (rc != 0) { printf("ntb: Cannot init transport: %d\n", rc); return (rc); @@ -541,7 +541,7 @@ ntb_net_event_handler(void *data, enum ntb_link_event status) /* Transport Init and teardown */ static int -ntb_transport_init(struct ntb_softc *ntb) +ntb_transport_probe(struct ntb_softc *ntb) { struct ntb_transport_ctx *nt = &net_softc; struct ntb_transport_mw *mw; @@ -596,6 +596,8 @@ ntb_transport_init(struct ntb_softc *ntb) nt->link_is_up = false; ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO); ntb_link_event(ntb); + + callout_reset(&nt->link_work, 0, ntb_transport_link_work, nt); return (0); err: @@ -693,6 +695,8 @@ ntb_transport_init_queue(struct ntb_transport_ctx *nt, unsigned int qp_num) STAILQ_INIT(&qp->rx_pend_q); STAILQ_INIT(&qp->rx_free_q); STAILQ_INIT(&qp->tx_free_q); + + callout_reset(&qp->link_work, 0, ntb_qp_link_work, qp); } static void |