Skip to contentSkip to conversation

net: bonding: Replace mac address parsing

PATCH Applied Andy Shevchenko 3 participants 3 messages Dec 19, 2017 – Dec 20, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: bonding: Replace mac address parsing

Replace sscanf() with mac_pton().

---
 drivers/net/bonding/bond_options.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/bonding/bond_options.c +1 -5
index 8a9b085c2a98..58c705f24f96 100644
@@ -1431,13 +1431,9 @@ static int bond_option_ad_actor_system_set(struct bonding *bond,
 {
 	u8 macaddr[ETH_ALEN];
 	u8 *mac;
-	int i;
 
 	if (newval->string) {
-		i = sscanf(newval->string, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-			   &macaddr[0], &macaddr[1], &macaddr[2],
-			   &macaddr[3], &macaddr[4], &macaddr[5]);
-		if (i != ETH_ALEN)
+		if (!mac_pton(newval->string, macaddr))
 			goto err;
 		mac = macaddr;
 	} else {
Signature · 1 line
2.15.1
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Andy Shevchenko

Replace sscanf() with mac_pton().

Nice cleanup. Thanks!

Quoted 26 lines
---
 drivers/net/bonding/bond_options.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/net/bonding/bond_options.c +1 -5
index 8a9b085c2a98..58c705f24f96 100644
@@ -1431,13 +1431,9 @@ static int bond_option_ad_actor_system_set(struct bonding *bond,
 {
 	u8 macaddr[ETH_ALEN];
 	u8 *mac;
-	int i;
 
 	if (newval->string) {
-		i = sscanf(newval->string, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
-			   &macaddr[0], &macaddr[1], &macaddr[2],
-			   &macaddr[3], &macaddr[4], &macaddr[5]);
-		if (i != ETH_ALEN)
+		if (!mac_pton(newval->string, macaddr))
 			goto err;
 		mac = macaddr;
 	} else {
Signature · 1 line
2.15.1