aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/mount_fusefs/mount_fusefs.82
-rw-r--r--share/man/man4/proto.42
-rw-r--r--sys/dev/aic7xxx/aic79xx.h2
-rw-r--r--sys/dev/aic7xxx/aic7xxx.h2
-rw-r--r--sys/dev/isci/scil/sci_memory_descriptor_list.h2
-rw-r--r--sys/dev/isci/scil/scif_sas_controller.h2
-rw-r--r--sys/dev/mge/if_mge.c2
-rw-r--r--sys/dev/nge/if_nge.c2
-rw-r--r--sys/dev/sk/if_sk.c2
-rw-r--r--sys/dev/ti/if_ti.c2
-rw-r--r--sys/dev/usb/input/uhid_snes.c2
-rw-r--r--sys/dev/vr/if_vr.c2
12 files changed, 12 insertions, 12 deletions
diff --git a/sbin/mount_fusefs/mount_fusefs.8 b/sbin/mount_fusefs/mount_fusefs.8
index b4ab86c57ae2..051a5c273ef7 100644
--- a/sbin/mount_fusefs/mount_fusefs.8
+++ b/sbin/mount_fusefs/mount_fusefs.8
@@ -309,7 +309,7 @@ If not set, the multiplexer path
.Ar /dev/fuse
is used.
.It Ev FUSE_DEV_FD
-File desciptor of an opened Fuse device to use.
+File descriptor of an opened Fuse device to use.
Overrides
.Ev FUSE_DEV_NAME .
.It Ev FUSE_NO_MOUNT
diff --git a/share/man/man4/proto.4 b/share/man/man4/proto.4
index 39f585dad65c..bd861697c10d 100644
--- a/share/man/man4/proto.4
+++ b/share/man/man4/proto.4
@@ -267,7 +267,7 @@ single contigous region of physical memory.
In practice this also tends to give a single contigous region in bus space.
This may change over time.
.It PROTO_IOC_BUSDMA_MEM_FREE
-Free previously allocated memory and destroy the memory desciptor.
+Free previously allocated memory and destroy the memory descriptor.
The
.Nm
driver is not in a position to track whether the memory has been mapped in
diff --git a/sys/dev/aic7xxx/aic79xx.h b/sys/dev/aic7xxx/aic79xx.h
index 38b152ef4051..bb3949c5f749 100644
--- a/sys/dev/aic7xxx/aic79xx.h
+++ b/sys/dev/aic7xxx/aic79xx.h
@@ -696,7 +696,7 @@ struct scb_data {
/************************ Target Mode Definitions *****************************/
/*
- * Connection desciptor for select-in requests in target mode.
+ * Connection descriptor for select-in requests in target mode.
*/
struct target_cmd {
uint8_t scsiid; /* Our ID and the initiator's ID */
diff --git a/sys/dev/aic7xxx/aic7xxx.h b/sys/dev/aic7xxx/aic7xxx.h
index a3abc456f8c5..f48e793fea6a 100644
--- a/sys/dev/aic7xxx/aic7xxx.h
+++ b/sys/dev/aic7xxx/aic7xxx.h
@@ -644,7 +644,7 @@ struct scb_data {
/************************ Target Mode Definitions *****************************/
/*
- * Connection desciptor for select-in requests in target mode.
+ * Connection descriptor for select-in requests in target mode.
*/
struct target_cmd {
uint8_t scsiid; /* Our ID and the initiator's ID */
diff --git a/sys/dev/isci/scil/sci_memory_descriptor_list.h b/sys/dev/isci/scil/sci_memory_descriptor_list.h
index 6b78fbc6055d..21516c13231c 100644
--- a/sys/dev/isci/scil/sci_memory_descriptor_list.h
+++ b/sys/dev/isci/scil/sci_memory_descriptor_list.h
@@ -96,7 +96,7 @@ typedef struct SCI_PHYSICAL_MEMORY_DESCRIPTOR
void * virtual_address;
/**
- * This field contains the physical address associated with this desciptor
+ * This field contains the physical address associated with this descriptor
* element. This field shall be zero when the descriptor is retrieved from
* the SCI implementation. The user shall set this field prior
* sci_controller_start()
diff --git a/sys/dev/isci/scil/scif_sas_controller.h b/sys/dev/isci/scil/scif_sas_controller.h
index fc7583e84367..3de39864811c 100644
--- a/sys/dev/isci/scil/scif_sas_controller.h
+++ b/sys/dev/isci/scil/scif_sas_controller.h
@@ -121,7 +121,7 @@ typedef struct SCIF_SAS_CONTROLLER
SCI_BASE_CONTROLLER_STATE_HANDLER_T * state_handlers;
/**
- * This field contains the memory desciptors defining the physical
+ * This field contains the memory descriptors defining the physical
* memory requirements for this controller.
*/
SCI_PHYSICAL_MEMORY_DESCRIPTOR_T mdes[SCIF_SAS_MAX_MEMORY_DESCRIPTORS];
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index dc044749ae72..16deb330c06c 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -697,7 +697,7 @@ static void
mge_free_dma(struct mge_softc *sc)
{
- /* Free desciptors and mbufs */
+ /* Free descriptors and mbufs */
mge_free_desc(sc, sc->mge_rx_desc, MGE_RX_DESC_NUM, sc->mge_rx_dtag, 1);
mge_free_desc(sc, sc->mge_tx_desc, MGE_TX_DESC_NUM, sc->mge_tx_dtag, 0);
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index c099896d7bc8..67e1f03ebdd2 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -1950,7 +1950,7 @@ nge_encap(struct nge_softc *sc, struct mbuf **m_head)
if ((m->m_flags & M_VLANTAG) != 0)
desc->nge_extsts |= htole32(NGE_TXEXTSTS_VLANPKT |
bswap16(m->m_pkthdr.ether_vtag));
- /* Set EOP on the last desciptor. */
+ /* Set EOP on the last descriptor. */
desc->nge_cmdsts &= htole32(~NGE_CMDSTS_MORE);
/* Set checksum offload in the first descriptor. */
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index a6431044e30f..809cfa6f9e14 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -2445,7 +2445,7 @@ sk_encap(sc_if, m_head)
}
sc_if->sk_cdata.sk_tx_prod = frag;
- /* set EOF on the last desciptor */
+ /* set EOF on the last descriptor */
frag = (frag + SK_TX_RING_CNT - 1) % SK_TX_RING_CNT;
f = &sc_if->sk_rdata.sk_tx_ring[frag];
f->sk_ctl |= htole32(SK_TXCTL_LASTFRAG | SK_TXCTL_EOF_INTR);
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 06769bc97c9f..9871212d6379 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -53,7 +53,7 @@
*
* The Tigon 2 contains 2 R4000 CPUs and requires a newer firmware
* revision, which supports new features such as extended commands,
- * extended jumbo receive ring desciptors and a mini receive ring.
+ * extended jumbo receive ring descriptors and a mini receive ring.
*
* Alteon Networks is to be commended for releasing such a vast amount
* of development material for the Tigon NIC without requiring an NDA
diff --git a/sys/dev/usb/input/uhid_snes.c b/sys/dev/usb/input/uhid_snes.c
index 5b68560a47e9..181e38eba7b1 100644
--- a/sys/dev/usb/input/uhid_snes.c
+++ b/sys/dev/usb/input/uhid_snes.c
@@ -296,7 +296,7 @@ uhid_snes_ioctl(struct usb_fifo *fifo, u_long cmd, void *data, int fflags)
ugd->ugd_actlen = size;
if (ugd->ugd_data == NULL)
- break; /*desciptor length only*/
+ break; /* descriptor length only*/
error = copyout(sc->sc_repdesc_ptr, ugd->ugd_data, size);
break;
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index e81c027cf2cd..3a3490b7095c 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -1934,7 +1934,7 @@ vr_encap(struct vr_softc *sc, struct mbuf **m_head)
desc = &sc->vr_rdata.vr_tx_ring[prod];
/*
- * Set EOP on the last desciptor and reuqest Tx completion
+ * Set EOP on the last descriptor and reuqest Tx completion
* interrupt for every VR_TX_INTR_THRESH-th frames.
*/
VR_INC(sc->vr_cdata.vr_tx_pkts, VR_TX_INTR_THRESH);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 06:18:00 +0000