Skip to contentSkip to conversation

wireless: airo: re-use mac_pton()

PATCH Applied Andy Shevchenko 2 participants 2 messages Nov 27, 2015 – Nov 30, 2015 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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.

---
 drivers/net/wireless/cisco/airo.c | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)
drivers/net/wireless/cisco/airo.c +3 -15
index 17c40f0..d2353f6 100644
@@ -5137,21 +5137,9 @@ static void proc_APList_on_close( struct inode *inode, struct file *file ) {
 	memset(APList_rid, 0, sizeof(*APList_rid));
 	APList_rid->len = cpu_to_le16(sizeof(*APList_rid));
 
-	for( i = 0; i < 4 && data->writelen >= (i+1)*6*3; i++ ) {
-		int j;
-		for( j = 0; j < 6*3 && data->wbuffer[j+i*6*3]; j++ ) {
-			switch(j%3) {
-			case 0:
-				APList_rid->ap[i][j/3]=
-					hex_to_bin(data->wbuffer[j+i*6*3])<<4;
-				break;
-			case 1:
-				APList_rid->ap[i][j/3]|=
-					hex_to_bin(data->wbuffer[j+i*6*3]);
-				break;
-			}
-		}
-	}
+	for (i = 0; i < 4 && data->writelen >= (i + 1) * 6 * 3; i++)
+		mac_pton(data->wbuffer + i * 6 * 3, APList_rid->ap[i]);
+
 	disable_MAC(ai, 1);
 	writeAPListRid(ai, APList_rid, 1);
 	enable_MAC(ai, 1);
Signature · 1 line
2.6.2
Applied
#1 lore raw
Quoted 5 lines

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

Thanks, applied to wireless-drivers-next.git.

Kalle Valo