Commit e7dc00f3 authored by David S. Miller's avatar David S. Miller

Merge branch 'too-short'

Tong Zhang says:

====================
fix typos: "to short" -> "too short"

doing some code review and I found out there are a couple of places
where "too short" is misspelled as "to short".
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a62551c9 dc978706
...@@ -1062,7 +1062,7 @@ ipac_rme(struct hscx_hw *hx) ...@@ -1062,7 +1062,7 @@ ipac_rme(struct hscx_hw *hx)
if (!hx->bch.rx_skb) if (!hx->bch.rx_skb)
return; return;
if (hx->bch.rx_skb->len < 2) { if (hx->bch.rx_skb->len < 2) {
pr_debug("%s: B%1d frame to short %d\n", pr_debug("%s: B%1d frame too short %d\n",
hx->ip->name, hx->bch.nr, hx->bch.rx_skb->len); hx->ip->name, hx->bch.nr, hx->bch.rx_skb->len);
skb_trim(hx->bch.rx_skb, 0); skb_trim(hx->bch.rx_skb, 0);
} else { } else {
......
...@@ -466,7 +466,7 @@ isar_rcv_frame(struct isar_ch *ch) ...@@ -466,7 +466,7 @@ isar_rcv_frame(struct isar_ch *ch)
rcv_mbox(ch->is, ptr); rcv_mbox(ch->is, ptr);
if (ch->is->cmsb & HDLC_FED) { if (ch->is->cmsb & HDLC_FED) {
if (ch->bch.rx_skb->len < 3) { /* last 2 are the FCS */ if (ch->bch.rx_skb->len < 3) { /* last 2 are the FCS */
pr_debug("%s: ISAR frame to short %d\n", pr_debug("%s: ISAR frame too short %d\n",
ch->is->name, ch->bch.rx_skb->len); ch->is->name, ch->bch.rx_skb->len);
skb_trim(ch->bch.rx_skb, 0); skb_trim(ch->bch.rx_skb, 0);
break; break;
...@@ -542,7 +542,7 @@ isar_rcv_frame(struct isar_ch *ch) ...@@ -542,7 +542,7 @@ isar_rcv_frame(struct isar_ch *ch)
rcv_mbox(ch->is, ptr); rcv_mbox(ch->is, ptr);
if (ch->is->cmsb & HDLC_FED) { if (ch->is->cmsb & HDLC_FED) {
if (ch->bch.rx_skb->len < 3) { /* last 2 are the FCS */ if (ch->bch.rx_skb->len < 3) { /* last 2 are the FCS */
pr_info("%s: ISAR frame to short %d\n", pr_info("%s: ISAR frame too short %d\n",
ch->is->name, ch->bch.rx_skb->len); ch->is->name, ch->bch.rx_skb->len);
skb_trim(ch->bch.rx_skb, 0); skb_trim(ch->bch.rx_skb, 0);
break; break;
......
...@@ -150,7 +150,7 @@ struct rfd_struct ...@@ -150,7 +150,7 @@ struct rfd_struct
#define RFD_ERR_RNR 0x02 /* status: receiver out of resources */ #define RFD_ERR_RNR 0x02 /* status: receiver out of resources */
#define RFD_ERR_OVR 0x01 /* DMA Overrun! */ #define RFD_ERR_OVR 0x01 /* DMA Overrun! */
#define RFD_ERR_FTS 0x0080 /* Frame to short */ #define RFD_ERR_FTS 0x0080 /* Frame too short */
#define RFD_ERR_NEOP 0x0040 /* No EOP flag (for bitstuffing only) */ #define RFD_ERR_NEOP 0x0040 /* No EOP flag (for bitstuffing only) */
#define RFD_ERR_TRUN 0x0020 /* (82596 only/SF mode) indicates truncated frame */ #define RFD_ERR_TRUN 0x0020 /* (82596 only/SF mode) indicates truncated frame */
#define RFD_MATCHADD 0x0002 /* status: Destinationaddress !matches IA (only 82596) */ #define RFD_MATCHADD 0x0002 /* status: Destinationaddress !matches IA (only 82596) */
......
...@@ -104,7 +104,7 @@ static void ar5523_cmd_rx_cb(struct urb *urb) ...@@ -104,7 +104,7 @@ static void ar5523_cmd_rx_cb(struct urb *urb)
} }
if (urb->actual_length < sizeof(struct ar5523_cmd_hdr)) { if (urb->actual_length < sizeof(struct ar5523_cmd_hdr)) {
ar5523_err(ar, "RX USB to short.\n"); ar5523_err(ar, "RX USB too short.\n");
goto skip; goto skip;
} }
......
...@@ -1394,7 +1394,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg) ...@@ -1394,7 +1394,7 @@ static void ctcmpc_chx_rx(fsm_instance *fi, int event, void *arg)
if (len < TH_HEADER_LENGTH) { if (len < TH_HEADER_LENGTH) {
CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR, CTCM_DBF_TEXT_(MPC_ERROR, CTC_DBF_ERROR,
"%s(%s): packet length %d to short", "%s(%s): packet length %d too short",
CTCM_FUNTAIL, dev->name, len); CTCM_FUNTAIL, dev->name, len);
priv->stats.rx_dropped++; priv->stats.rx_dropped++;
priv->stats.rx_length_errors++; priv->stats.rx_length_errors++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment