diff options
Diffstat (limited to 'net/802/mrp.c')
-rw-r--r-- | net/802/mrp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/802/mrp.c b/net/802/mrp.c index 72db2785ef2c..be4dd3165347 100644 --- a/net/802/mrp.c +++ b/net/802/mrp.c | |||
@@ -311,7 +311,7 @@ static int mrp_pdu_init(struct mrp_applicant *app) | |||
311 | skb_reset_network_header(skb); | 311 | skb_reset_network_header(skb); |
312 | skb_reset_transport_header(skb); | 312 | skb_reset_transport_header(skb); |
313 | 313 | ||
314 | ph = (struct mrp_pdu_hdr *)__skb_put(skb, sizeof(*ph)); | 314 | ph = __skb_put(skb, sizeof(*ph)); |
315 | ph->version = app->app->version; | 315 | ph->version = app->app->version; |
316 | 316 | ||
317 | app->pdu = skb; | 317 | app->pdu = skb; |
@@ -324,7 +324,7 @@ static int mrp_pdu_append_end_mark(struct mrp_applicant *app) | |||
324 | 324 | ||
325 | if (skb_tailroom(app->pdu) < sizeof(*endmark)) | 325 | if (skb_tailroom(app->pdu) < sizeof(*endmark)) |
326 | return -1; | 326 | return -1; |
327 | endmark = (__be16 *)__skb_put(app->pdu, sizeof(*endmark)); | 327 | endmark = __skb_put(app->pdu, sizeof(*endmark)); |
328 | put_unaligned(MRP_END_MARK, endmark); | 328 | put_unaligned(MRP_END_MARK, endmark); |
329 | return 0; | 329 | return 0; |
330 | } | 330 | } |
@@ -368,7 +368,7 @@ static int mrp_pdu_append_msg_hdr(struct mrp_applicant *app, | |||
368 | 368 | ||
369 | if (skb_tailroom(app->pdu) < sizeof(*mh)) | 369 | if (skb_tailroom(app->pdu) < sizeof(*mh)) |
370 | return -1; | 370 | return -1; |
371 | mh = (struct mrp_msg_hdr *)__skb_put(app->pdu, sizeof(*mh)); | 371 | mh = __skb_put(app->pdu, sizeof(*mh)); |
372 | mh->attrtype = attrtype; | 372 | mh->attrtype = attrtype; |
373 | mh->attrlen = attrlen; | 373 | mh->attrlen = attrlen; |
374 | mrp_cb(app->pdu)->mh = mh; | 374 | mrp_cb(app->pdu)->mh = mh; |
@@ -382,8 +382,7 @@ static int mrp_pdu_append_vecattr_hdr(struct mrp_applicant *app, | |||
382 | 382 | ||
383 | if (skb_tailroom(app->pdu) < sizeof(*vah) + attrlen) | 383 | if (skb_tailroom(app->pdu) < sizeof(*vah) + attrlen) |
384 | return -1; | 384 | return -1; |
385 | vah = (struct mrp_vecattr_hdr *)__skb_put(app->pdu, | 385 | vah = __skb_put(app->pdu, sizeof(*vah) + attrlen); |
386 | sizeof(*vah) + attrlen); | ||
387 | put_unaligned(0, &vah->lenflags); | 386 | put_unaligned(0, &vah->lenflags); |
388 | memcpy(vah->firstattrvalue, firstattrvalue, attrlen); | 387 | memcpy(vah->firstattrvalue, firstattrvalue, attrlen); |
389 | mrp_cb(app->pdu)->vah = vah; | 388 | mrp_cb(app->pdu)->vah = vah; |
@@ -435,7 +434,7 @@ again: | |||
435 | if (!pos) { | 434 | if (!pos) { |
436 | if (skb_tailroom(app->pdu) < sizeof(u8)) | 435 | if (skb_tailroom(app->pdu) < sizeof(u8)) |
437 | goto queue; | 436 | goto queue; |
438 | vaevents = (u8 *)__skb_put(app->pdu, sizeof(u8)); | 437 | vaevents = __skb_put(app->pdu, sizeof(u8)); |
439 | } else { | 438 | } else { |
440 | vaevents = (u8 *)(skb_tail_pointer(app->pdu) - sizeof(u8)); | 439 | vaevents = (u8 *)(skb_tail_pointer(app->pdu) - sizeof(u8)); |
441 | } | 440 | } |