Removed out-commentd code.
FossilOrigin-Name: f346810d62878c89a9b765c3569b0bdd7fac7fee9caecf28b619d2c1638e936c
This commit is contained in:
parent
c85a83e29f
commit
293d04d999
@ -20,10 +20,8 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "capwap.h"
|
#include "capwap.h"
|
||||||
|
|
||||||
#include "cwmsg.h"
|
#include "cwmsg.h"
|
||||||
|
|
||||||
|
|
||||||
void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, struct radioinfo * radioinfo)
|
void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, struct radioinfo * radioinfo)
|
||||||
{
|
{
|
||||||
int hlen=8;
|
int hlen=8;
|
||||||
@ -32,17 +30,10 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#ifdef WITH_RMAC_SUPPORT
|
|
||||||
int rmaclen;
|
int rmaclen;
|
||||||
if (radioinfo->rmac[0]){
|
if (radioinfo->rmac[0]){
|
||||||
/* we assume the radio mac is already aligned */
|
/* we assume the radio mac is already aligned */
|
||||||
|
|
||||||
rmaclen=(*radioinfo->rmac);
|
rmaclen=(*radioinfo->rmac);
|
||||||
|
|
||||||
// printf ("Adding rmac len %d\n",rmaclen);
|
|
||||||
// printf ("Real copy woul dbe %d\n",rmaclen/8+8);
|
|
||||||
|
|
||||||
|
|
||||||
memcpy(buffer+8,radioinfo->rmac,rmaclen/8+8);
|
memcpy(buffer+8,radioinfo->rmac,rmaclen/8+8);
|
||||||
cwmsg->flags=CWTH_FLAGS_M;
|
cwmsg->flags=CWTH_FLAGS_M;
|
||||||
}
|
}
|
||||||
@ -54,7 +45,6 @@ void cwmsg_init(struct cwmsg * cwmsg, uint8_t *buffer, int type, int seqnum, str
|
|||||||
hlen+=rmaclen;
|
hlen+=rmaclen;
|
||||||
if (hlen%4)
|
if (hlen%4)
|
||||||
hlen = (hlen>>2)*4+4;
|
hlen = (hlen>>2)*4+4;
|
||||||
//#endif
|
|
||||||
|
|
||||||
|
|
||||||
cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen;
|
cwmsg->ctrlhdr=cwmsg->trnsprthdr+hlen;
|
||||||
|
Loading…
Reference in New Issue
Block a user