llsec: Removed superseded NETSTACK_ENCRYPT, NETSTACK_DECRYPT, and
NETSTACK_ENCRYPTION_INIT macros
This commit is contained in:
parent
c032b67969
commit
515287ef17
@ -633,10 +633,6 @@ send_packet(mac_callback_t mac_callback, void *mac_callback_ptr,
|
||||
transmit_len = SHORTEST_PACKET_SIZE;
|
||||
}
|
||||
|
||||
#ifdef NETSTACK_ENCRYPT
|
||||
NETSTACK_ENCRYPT();
|
||||
#endif /* NETSTACK_ENCRYPT */
|
||||
|
||||
transmit_len = packetbuf_totlen();
|
||||
|
||||
NETSTACK_RADIO.prepare(packetbuf_hdrptr(), transmit_len);
|
||||
@ -933,10 +929,6 @@ input_packet(void)
|
||||
|
||||
/* printf("cycle_start 0x%02x 0x%02x\n", cycle_start, cycle_start % CYCLE_TIME);*/
|
||||
|
||||
#ifdef NETSTACK_DECRYPT
|
||||
NETSTACK_DECRYPT();
|
||||
#endif /* NETSTACK_DECRYPT */
|
||||
|
||||
if(packetbuf_totlen() > 0 && NETSTACK_FRAMER.parse() >= 0) {
|
||||
|
||||
#if WITH_CONTIKIMAC_HEADER
|
||||
|
@ -125,11 +125,6 @@ send_one_packet(mac_callback_t sent, void *ptr)
|
||||
PRINTF("nullrdc: send failed, too large header\n");
|
||||
ret = MAC_TX_ERR_FATAL;
|
||||
} else {
|
||||
|
||||
#ifdef NETSTACK_ENCRYPT
|
||||
NETSTACK_ENCRYPT();
|
||||
#endif /* NETSTACK_ENCRYPT */
|
||||
|
||||
#if NULLRDC_802154_AUTOACK
|
||||
int is_broadcast;
|
||||
uint8_t dsn;
|
||||
@ -275,9 +270,6 @@ packet_input(void)
|
||||
|
||||
original_datalen = packetbuf_datalen();
|
||||
original_dataptr = packetbuf_dataptr();
|
||||
#ifdef NETSTACK_DECRYPT
|
||||
NETSTACK_DECRYPT();
|
||||
#endif /* NETSTACK_DECRYPT */
|
||||
|
||||
#if NULLRDC_802154_AUTOACK
|
||||
if(packetbuf_datalen() == ACK_LEN) {
|
||||
|
@ -46,9 +46,5 @@ netstack_init(void)
|
||||
NETSTACK_RDC.init();
|
||||
NETSTACK_MAC.init();
|
||||
NETSTACK_NETWORK.init();
|
||||
|
||||
#ifdef NETSTACK_ENCRYPTION_INIT
|
||||
NETSTACK_ENCRYPTION_INIT();
|
||||
#endif /* NETSTACK_ENCRYPTION_INIT */
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
Loading…
Reference in New Issue
Block a user