A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 16:16:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Ensure two NDI mac address are only 1 bit apart

Browse source 
As per customer requirement in case 2nd NDI is coming up with mac
randomized, make sure its mac address is just 1 bit apart from first
NDI's mac address.

Change-Id: Ifd3d480e4bd3bd74019bd19f23fa8a04b5f8bec5
CRs-Fixed: 2187677
This commit is contained in:
Naveen Rawat 2018-02-09 14:22:52 -08:00 • committed by nshrivas
commit ea1ece81ab
1 changed files with 30 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

41
core/hdd/src/wlan_hdd_nan_datapath.c
View file

@ -238,22 +238,39 @@ static int hdd_get_random_nan_mac_addr(struct hdd_context *hdd_ctx,
struct qdf_mac_addr *mac_addr)
{
struct hdd_adapter *adapter;
uint8_t pos, bit_pos, byte_pos, mask;
uint8_t i, attempts, max_attempt = 16;
for (attempts = 0; attempts < max_attempt; attempts++) {
cds_rand_get_bytes(0, (uint8_t *)mac_addr, sizeof(*mac_addr));
/*
* Reset multicast bit (bit-0) and set locally-administered bit
*/
mac_addr->bytes[0] = 0x2;
/*
* to avoid potential conflict with FW's generated NMI mac addr,
* host sets LSB if 6th byte to 0
*/
mac_addr->bytes[5] &= 0xFE;
/* if NDI is present next addr is required to be 1 bit apart */
adapter = hdd_get_adapter(hdd_ctx, QDF_NDI_MODE);
if (adapter) {
hdd_debug("NDI already exists, deriving next mac");
qdf_mem_copy(mac_addr, &adapter->mac_addr,
sizeof(*mac_addr));
cds_rand_get_bytes(0, &pos, sizeof(pos));
/* skipping byte 0, 5 leaves 8*4=32 positions */
pos = pos % 32;
bit_pos = pos % 8;
byte_pos = pos / 8;
mask = 1 << bit_pos;
/* flip the required bit */
mac_addr->bytes[byte_pos + 1] ^= mask;
} else {
cds_rand_get_bytes(0, (uint8_t *)mac_addr,
sizeof(*mac_addr));
/*
* Reset multicast bit (bit-0) and set
* locally-administered bit
*/
mac_addr->bytes[0] = 0x2;
/*
* to avoid potential conflict with FW's generated NMI
* mac addr, host sets LSB if 6th byte to 0
*/
mac_addr->bytes[5] &= 0xFE;
}
for (i = 0; i < QDF_MAX_CONCURRENCY_PERSONA; i++) {
if (!qdf_mem_cmp(hdd_ctx->config->intfMacAddr[i].bytes,
mac_addr, sizeof(*mac_addr)))