Merge branch 'develop' into more-gitignore

This commit is contained in:
George Oikonomou 2018-05-17 20:54:59 +01:00 committed by GitHub
commit db323bf37a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 2 deletions

View File

@ -512,7 +512,6 @@ const struct mac_driver ble_l2cap_driver = {
input,
on,
off,
NULL,
};
/*---------------------------------------------------------------------------*/
PROCESS_THREAD(ble_l2cap_tx_process, ev, data)

View File

@ -94,7 +94,6 @@ struct arp_entry {
static const struct ip64_eth_addr broadcast_ethaddr =
{{0xff,0xff,0xff,0xff,0xff,0xff}};
static const uint16_t broadcast_ipaddr[2] = {0xffff,0xffff};
static struct arp_entry arp_table[UIP_ARPTAB_SIZE];