X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=bridge.c;h=4ef0d7e20940587e324291c6a1df45ef926d2298;hp=01c9a2c2c0bb1cd49d9c40dc0af4d7c00b433bcb;hb=37769eb666aa614b76df9b537db35c2c70e3ac7a;hpb=814e09499e12edaea658f9f5594fe9917c0ecde4 diff --git a/bridge.c b/bridge.c index 01c9a2c..4ef0d7e 100644 --- a/bridge.c +++ b/bridge.c @@ -178,7 +178,7 @@ bridge_remove_member(struct bridge_member *bm) if (!bm->present) return; - if (bm == bst->primary_port); + if (bm == bst->primary_port) bridge_reset_primary(bst); if (bst->dev.active) @@ -318,6 +318,9 @@ bridge_create_member(struct bridge_state *bst, struct device *dev, bool hotplug) struct bridge_member *bm; bm = calloc(1, sizeof(*bm) + strlen(dev->ifname) + 1); + if (!bm) + return NULL; + bm->bst = bst; bm->dev.cb = bridge_member_cb; bm->dev.hotplug = hotplug;