canoeboot
/
cbmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/nvmutil: reset errno if any MAC updated 

instead of setting errno in the for loop, set a variable
declaring that the mac was updated, and reset errno based
on that.

Signed-off-by: Leah Rowe <leah@libreboot.org>
20250107_branch
Leah Rowe 2025-01-27 05:07:27 +00:00
parent 4ea5484e02
commit 43e583d0b9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/nvmutil/nvmutil.c
View File

@ -246,18 +246,22 @@ readGbe(void)
void void
cmd_setmac(void) cmd_setmac(void)
{ {
int mac_updated = 0;
parseMacString(strMac, mac); parseMacString(strMac, mac);
for (int partnum = 0; partnum < 2; partnum++) { for (int partnum = 0; partnum < 2; partnum++) {
if (!goodChecksum(part = partnum)) if (!goodChecksum(part = partnum))
continue; continue;
errno = 0; mac_updated = 1;
for (int w = 0; w < 3; w++) /* write MAC to gbe part */ for (int w = 0; w < 3; w++) /* write MAC to gbe part */
setWord(w, partnum, mac[w]); setWord(w, partnum, mac[w]);
cmd_setchecksum(); /* MAC updated; need valid checksum */ cmd_setchecksum(); /* MAC updated; need valid checksum */
} }
if (mac_updated)
errno = 0; /* reset in case one of the checksums failed */
} }
/* parse MAC string, write to char buffer */ /* parse MAC string, write to char buffer */