summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-10-26 19:14:52 +0200
committerFelix Fietkau <nbd@openwrt.org>2011-10-26 19:14:52 +0200
commit76a6865acbed4df30d57bf57f62522c681081152 (patch)
treef91c0cfb4db03b17fe692782111012eee3662018
parente8f450ba2e67716cf3ed70060a309b80aa24cf00 (diff)
on reload, check for null ifname before comparing it
-rw-r--r--interface.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/interface.c b/interface.c
index d0eec4a..a8f7b8f 100644
--- a/interface.c
+++ b/interface.c
@@ -475,8 +475,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
if_old->ifname = if_new->ifname;
if_old->proto_handler = if_new->proto_handler;
- if (strcmp(old_ifname, if_new->ifname) != 0 ||
- proto != if_new->proto_handler) {
+ if ((!!old_ifname != !!if_new->ifname) ||
+ (old_ifname && strcmp(old_ifname, if_new->ifname) != 0) ||
+ proto != if_new->proto_handler) {
D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n",
if_old->name);
goto reload;