diff options
Diffstat (limited to 'sys/dev/firewire')
| -rw-r--r-- | sys/dev/firewire/if_fwe.c | 4 | ||||
| -rw-r--r-- | sys/dev/firewire/sbp.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c index 49722fe..5c77705 100644 --- a/sys/dev/firewire/if_fwe.c +++ b/sys/dev/firewire/if_fwe.c @@ -466,7 +466,7 @@ fwe_as_output(struct fwe_softc *fwe, struct ifnet *ifp) xfer->act.hand = fwe_output_callback; /* keep ip packet alignment for alpha */ - M_PREPEND(m, ALIGN_PAD, M_DONTWAIT); + M_PREPEND(m, ALIGN_PAD, M_NOWAIT); fp = (struct fw_pkt *)&xfer->dst; /* XXX */ xfer->dst = *((int32_t *)&fwe->pkt_hdr); fp->mode.stream.len = htons(m->m_pkthdr.len); @@ -544,7 +544,7 @@ fwe_as_input(struct fw_xferq *xferq) while ((xfer = STAILQ_FIRST(&xferq->q)) != NULL) { STAILQ_REMOVE_HEAD(&xferq->q, link); xferq->queued --; - MGETHDR(m, M_DONTWAIT, MT_DATA); + MGETHDR(m, M_NOWAIT, MT_DATA); if (m == NULL) { printf("MGETHDR failed\n"); fw_xfer_free(xfer); diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c index a8ed494..43da1cd 100644 --- a/sys/dev/firewire/sbp.c +++ b/sys/dev/firewire/sbp.c @@ -763,7 +763,7 @@ END_DEBUG static void sbp_cam_scan_lun(struct sbp_dev *sdev) { - union ccb *ccb = malloc(sizeof(union ccb), M_SBP, M_WAITOK | M_ZERO); + union ccb *ccb = malloc(sizeof(union ccb), M_SBP, M_ZERO); SBP_DEBUG(0) sbp_show_sdev_info(sdev, 2); @@ -822,9 +822,9 @@ sbp_ping_unit(struct sbp_dev *sdev) union ccb *ccb; struct scsi_inquiry_data *inq_buf; - ccb = malloc(sizeof(union ccb), M_SBP, M_WAITOK | M_ZERO); + ccb = malloc(sizeof(union ccb), M_SBP, M_ZERO); inq_buf = (struct scsi_inquiry_data *) - malloc(sizeof(*inq_buf), M_SBP, M_WAITOK); + malloc(sizeof(*inq_buf), M_SBP, 0); SBP_DEBUG(1) sbp_show_sdev_info(sdev, 2); |
