diff options
-rw-r--r-- | net/irda/irlap_event.c | 2 | ||||
-rw-r--r-- | net/irda/irlap_frame.c | 14 | ||||
-rw-r--r-- | net/irda/irttp.c | 4 | ||||
-rw-r--r-- | net/irda/parameters.c | 8 |
4 files changed, 14 insertions, 14 deletions
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c index 7b6433fe1dc2..0b02073ffdf3 100644 --- a/net/irda/irlap_event.c +++ b/net/irda/irlap_event.c | |||
@@ -590,7 +590,7 @@ static int irlap_state_query(struct irlap_cb *self, IRLAP_EVENT event, | |||
590 | if (!self->discovery_log) { | 590 | if (!self->discovery_log) { |
591 | IRDA_WARNING("%s: discovery log is gone! " | 591 | IRDA_WARNING("%s: discovery log is gone! " |
592 | "maybe the discovery timeout has been set" | 592 | "maybe the discovery timeout has been set" |
593 | " to short?\n", __FUNCTION__); | 593 | " too short?\n", __FUNCTION__); |
594 | break; | 594 | break; |
595 | } | 595 | } |
596 | hashbin_insert(self->discovery_log, | 596 | hashbin_insert(self->discovery_log, |
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c index 803ac4187485..3c5a68e36414 100644 --- a/net/irda/irlap_frame.c +++ b/net/irda/irlap_frame.c | |||
@@ -413,7 +413,7 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self, | |||
413 | IRDA_ASSERT(self->magic == LAP_MAGIC, return;); | 413 | IRDA_ASSERT(self->magic == LAP_MAGIC, return;); |
414 | 414 | ||
415 | if (!pskb_may_pull(skb, sizeof(struct xid_frame))) { | 415 | if (!pskb_may_pull(skb, sizeof(struct xid_frame))) { |
416 | IRDA_ERROR("%s: frame to short!\n", __FUNCTION__); | 416 | IRDA_ERROR("%s: frame too short!\n", __FUNCTION__); |
417 | return; | 417 | return; |
418 | } | 418 | } |
419 | 419 | ||
@@ -484,7 +484,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self, | |||
484 | char *text; | 484 | char *text; |
485 | 485 | ||
486 | if (!pskb_may_pull(skb, sizeof(struct xid_frame))) { | 486 | if (!pskb_may_pull(skb, sizeof(struct xid_frame))) { |
487 | IRDA_ERROR("%s: frame to short!\n", __FUNCTION__); | 487 | IRDA_ERROR("%s: frame too short!\n", __FUNCTION__); |
488 | return; | 488 | return; |
489 | } | 489 | } |
490 | 490 | ||
@@ -528,7 +528,7 @@ static void irlap_recv_discovery_xid_cmd(struct irlap_cb *self, | |||
528 | /* Check if things are sane at this point... */ | 528 | /* Check if things are sane at this point... */ |
529 | if((discovery_info == NULL) || | 529 | if((discovery_info == NULL) || |
530 | !pskb_may_pull(skb, 3)) { | 530 | !pskb_may_pull(skb, 3)) { |
531 | IRDA_ERROR("%s: discovery frame to short!\n", | 531 | IRDA_ERROR("%s: discovery frame too short!\n", |
532 | __FUNCTION__); | 532 | __FUNCTION__); |
533 | return; | 533 | return; |
534 | } | 534 | } |
@@ -1173,7 +1173,7 @@ static void irlap_recv_frmr_frame(struct irlap_cb *self, struct sk_buff *skb, | |||
1173 | IRDA_ASSERT(info != NULL, return;); | 1173 | IRDA_ASSERT(info != NULL, return;); |
1174 | 1174 | ||
1175 | if (!pskb_may_pull(skb, 4)) { | 1175 | if (!pskb_may_pull(skb, 4)) { |
1176 | IRDA_ERROR("%s: frame to short!\n", __FUNCTION__); | 1176 | IRDA_ERROR("%s: frame too short!\n", __FUNCTION__); |
1177 | return; | 1177 | return; |
1178 | } | 1178 | } |
1179 | 1179 | ||
@@ -1262,7 +1262,7 @@ static void irlap_recv_test_frame(struct irlap_cb *self, struct sk_buff *skb, | |||
1262 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); | 1262 | IRDA_DEBUG(2, "%s()\n", __FUNCTION__); |
1263 | 1263 | ||
1264 | if (!pskb_may_pull(skb, sizeof(*frame))) { | 1264 | if (!pskb_may_pull(skb, sizeof(*frame))) { |
1265 | IRDA_ERROR("%s: frame to short!\n", __FUNCTION__); | 1265 | IRDA_ERROR("%s: frame too short!\n", __FUNCTION__); |
1266 | return; | 1266 | return; |
1267 | } | 1267 | } |
1268 | frame = (struct test_frame *) skb->data; | 1268 | frame = (struct test_frame *) skb->data; |
@@ -1270,7 +1270,7 @@ static void irlap_recv_test_frame(struct irlap_cb *self, struct sk_buff *skb, | |||
1270 | /* Broadcast frames must carry saddr and daddr fields */ | 1270 | /* Broadcast frames must carry saddr and daddr fields */ |
1271 | if (info->caddr == CBROADCAST) { | 1271 | if (info->caddr == CBROADCAST) { |
1272 | if (skb->len < sizeof(struct test_frame)) { | 1272 | if (skb->len < sizeof(struct test_frame)) { |
1273 | IRDA_DEBUG(0, "%s() test frame to short!\n", | 1273 | IRDA_DEBUG(0, "%s() test frame too short!\n", |
1274 | __FUNCTION__); | 1274 | __FUNCTION__); |
1275 | return; | 1275 | return; |
1276 | } | 1276 | } |
@@ -1336,7 +1336,7 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev, | |||
1336 | 1336 | ||
1337 | /* Check if frame is large enough for parsing */ | 1337 | /* Check if frame is large enough for parsing */ |
1338 | if (!pskb_may_pull(skb, 2)) { | 1338 | if (!pskb_may_pull(skb, 2)) { |
1339 | IRDA_ERROR("%s: frame to short!\n", __FUNCTION__); | 1339 | IRDA_ERROR("%s: frame too short!\n", __FUNCTION__); |
1340 | dev_kfree_skb(skb); | 1340 | dev_kfree_skb(skb); |
1341 | return -1; | 1341 | return -1; |
1342 | } | 1342 | } |
diff --git a/net/irda/irttp.c b/net/irda/irttp.c index 3279897a01b0..7069e4a58257 100644 --- a/net/irda/irttp.c +++ b/net/irda/irttp.c | |||
@@ -551,7 +551,7 @@ int irttp_udata_request(struct tsap_cb *self, struct sk_buff *skb) | |||
551 | } | 551 | } |
552 | 552 | ||
553 | if (skb->len > self->max_seg_size) { | 553 | if (skb->len > self->max_seg_size) { |
554 | IRDA_DEBUG(1, "%s(), UData is to large for IrLAP!\n", | 554 | IRDA_DEBUG(1, "%s(), UData is too large for IrLAP!\n", |
555 | __FUNCTION__); | 555 | __FUNCTION__); |
556 | goto err; | 556 | goto err; |
557 | } | 557 | } |
@@ -598,7 +598,7 @@ int irttp_data_request(struct tsap_cb *self, struct sk_buff *skb) | |||
598 | * inside an IrLAP frame | 598 | * inside an IrLAP frame |
599 | */ | 599 | */ |
600 | if ((self->tx_max_sdu_size == 0) && (skb->len > self->max_seg_size)) { | 600 | if ((self->tx_max_sdu_size == 0) && (skb->len > self->max_seg_size)) { |
601 | IRDA_ERROR("%s: SAR disabled, and data is to large for IrLAP!\n", | 601 | IRDA_ERROR("%s: SAR disabled, and data is too large for IrLAP!\n", |
602 | __FUNCTION__); | 602 | __FUNCTION__); |
603 | ret = -EMSGSIZE; | 603 | ret = -EMSGSIZE; |
604 | goto err; | 604 | goto err; |
diff --git a/net/irda/parameters.c b/net/irda/parameters.c index 75a72d203b01..2627dad7cd87 100644 --- a/net/irda/parameters.c +++ b/net/irda/parameters.c | |||
@@ -160,7 +160,7 @@ static int irda_insert_integer(void *self, __u8 *buf, int len, __u8 pi, | |||
160 | } | 160 | } |
161 | /* Check if buffer is long enough for insertion */ | 161 | /* Check if buffer is long enough for insertion */ |
162 | if (len < (2+p.pl)) { | 162 | if (len < (2+p.pl)) { |
163 | IRDA_WARNING("%s: buffer to short for insertion!\n", | 163 | IRDA_WARNING("%s: buffer too short for insertion!\n", |
164 | __FUNCTION__); | 164 | __FUNCTION__); |
165 | return -1; | 165 | return -1; |
166 | } | 166 | } |
@@ -216,7 +216,7 @@ static int irda_extract_integer(void *self, __u8 *buf, int len, __u8 pi, | |||
216 | 216 | ||
217 | /* Check if buffer is long enough for parsing */ | 217 | /* Check if buffer is long enough for parsing */ |
218 | if (len < (2+p.pl)) { | 218 | if (len < (2+p.pl)) { |
219 | IRDA_WARNING("%s: buffer to short for parsing! " | 219 | IRDA_WARNING("%s: buffer too short for parsing! " |
220 | "Need %d bytes, but len is only %d\n", | 220 | "Need %d bytes, but len is only %d\n", |
221 | __FUNCTION__, p.pl, len); | 221 | __FUNCTION__, p.pl, len); |
222 | return -1; | 222 | return -1; |
@@ -304,7 +304,7 @@ static int irda_extract_string(void *self, __u8 *buf, int len, __u8 pi, | |||
304 | 304 | ||
305 | /* Check if buffer is long enough for parsing */ | 305 | /* Check if buffer is long enough for parsing */ |
306 | if (len < (2+p.pl)) { | 306 | if (len < (2+p.pl)) { |
307 | IRDA_WARNING("%s: buffer to short for parsing! " | 307 | IRDA_WARNING("%s: buffer too short for parsing! " |
308 | "Need %d bytes, but len is only %d\n", | 308 | "Need %d bytes, but len is only %d\n", |
309 | __FUNCTION__, p.pl, len); | 309 | __FUNCTION__, p.pl, len); |
310 | return -1; | 310 | return -1; |
@@ -343,7 +343,7 @@ static int irda_extract_octseq(void *self, __u8 *buf, int len, __u8 pi, | |||
343 | 343 | ||
344 | /* Check if buffer is long enough for parsing */ | 344 | /* Check if buffer is long enough for parsing */ |
345 | if (len < (2+p.pl)) { | 345 | if (len < (2+p.pl)) { |
346 | IRDA_WARNING("%s: buffer to short for parsing! " | 346 | IRDA_WARNING("%s: buffer too short for parsing! " |
347 | "Need %d bytes, but len is only %d\n", | 347 | "Need %d bytes, but len is only %d\n", |
348 | __FUNCTION__, p.pl, len); | 348 | __FUNCTION__, p.pl, len); |
349 | return -1; | 349 | return -1; |