aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/irlap_frame.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/irlap_frame.c')
-rw-r--r--net/irda/irlap_frame.c14
1 files changed, 7 insertions, 7 deletions
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 }