Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

wireless: airo: re-use mac_pton()

mac_pton() converts 6-byte MAC / BSSID to binary format. Change an open coded
variant by the generic one.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

authored by

Andy Shevchenko and committed by
Kalle Valo
b31fa550 7941c212

+3 -15
+3 -15
drivers/net/wireless/cisco/airo.c
··· 5137 5137 memset(APList_rid, 0, sizeof(*APList_rid)); 5138 5138 APList_rid->len = cpu_to_le16(sizeof(*APList_rid)); 5139 5139 5140 - for( i = 0; i < 4 && data->writelen >= (i+1)*6*3; i++ ) { 5141 - int j; 5142 - for( j = 0; j < 6*3 && data->wbuffer[j+i*6*3]; j++ ) { 5143 - switch(j%3) { 5144 - case 0: 5145 - APList_rid->ap[i][j/3]= 5146 - hex_to_bin(data->wbuffer[j+i*6*3])<<4; 5147 - break; 5148 - case 1: 5149 - APList_rid->ap[i][j/3]|= 5150 - hex_to_bin(data->wbuffer[j+i*6*3]); 5151 - break; 5152 - } 5153 - } 5154 - } 5140 + for (i = 0; i < 4 && data->writelen >= (i + 1) * 6 * 3; i++) 5141 + mac_pton(data->wbuffer + i * 6 * 3, APList_rid->ap[i]); 5142 + 5155 5143 disable_MAC(ai, 1); 5156 5144 writeAPListRid(ai, APList_rid, 1); 5157 5145 enable_MAC(ai, 1);