chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad6e5b3
)
udev: link-config - only set *name on success
author
Tom Gundersen
<teg@jklm.no>
Mon, 8 Sep 2014 12:17:46 +0000
(14:17 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 8 Sep 2014 13:09:07 +0000
(15:09 +0200)
src/udev/net/link-config.c
patch
|
blob
|
history
diff --git
a/src/udev/net/link-config.c
b/src/udev/net/link-config.c
index c2881d6b41d0f08c692263684f7946d787762b58..64ff00dc0df40bc291515dc051712ae2e182cf8f 100644
(file)
--- a/
src/udev/net/link-config.c
+++ b/
src/udev/net/link-config.c
@@
-424,8
+424,6
@@
int link_config_apply(link_config_ctx *ctx, link_config *config,
} else
new_name = NULL;
- *name = new_name;
-
switch (config->mac_policy) {
case MACPOLICY_PERSISTENT:
if (mac_is_random(device)) {
@@
-459,6
+457,8
@@
int link_config_apply(link_config_ctx *ctx, link_config *config,
return r;
}
+ *name = new_name;
+
return 0;
}