deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

framer-802154: Renamed variable for the sake of consistency

Browse source
This commit is contained in:
kkrentz 2013-06-19 04:48:48 -07:00
parent 1d324e50d2
commit 11495a011c
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/net/mac/framer-802154.c
View file

@ -90,7 +90,7 @@ static int
create_frame(int type, int do_create)
{
frame802154_t params;
int len;
int hdr_len;
/* init to zeros */
memset(&params, 0, sizeof(params));
@ -183,21 +183,21 @@ create_frame(int type, int do_create)
params.payload = packetbuf_dataptr();
params.payload_len = packetbuf_datalen();
len = frame802154_hdrlen(&params);
hdr_len = frame802154_hdrlen(&params);
if(!do_create) {
/* Only calculate header length */
return len;
return hdr_len;
} else if(packetbuf_hdralloc(len)) {
frame802154_create(&params, packetbuf_hdrptr(), len);
} else if(packetbuf_hdralloc(hdr_len)) {
frame802154_create(&params, packetbuf_hdrptr(), hdr_len);
PRINTF("15.4-OUT: %2X", params.fcf.frame_type);
PRINTADDR(params.dest_addr);
PRINTF("%d %u (%u)\n", len, packetbuf_datalen(), packetbuf_totlen());
PRINTF("%d %u (%u)\n", hdr_len, packetbuf_datalen(), packetbuf_totlen());
return len;
return hdr_len;
} else {
PRINTF("15.4-OUT: too large header: %u\n", len);
PRINTF("15.4-OUT: too large header: %u\n", hdr_len);
return FRAMER_FAILED;
}
}