ipvlan: fix assert

2015-10-25 09:31:14 +05:30
parent ae185f4857
commit 0695cb4572
1 changed files with 9 additions and 3 deletions
@@ -33,14 +33,17 @@ DEFINE_STRING_TABLE_LOOKUP(ipvlan_mode, IPVlanMode);
 DEFINE_CONFIG_PARSE_ENUM(config_parse_ipvlan_mode, ipvlan_mode, IPVlanMode, "Failed to parse ipvlan mode");

 static int netdev_ipvlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) {
-        IPVlan *m = IPVLAN(netdev);
+        IPVlan *m;
        int r;

        assert(netdev);
-        assert(m);
        assert(link);
        assert(netdev->ifname);

+        m = IPVLAN(netdev);
+
+        assert(m);
+
        if (m->mode != _NETDEV_IPVLAN_MODE_INVALID) {
                r = sd_netlink_message_append_u16(req, IFLA_IPVLAN_MODE, m->mode);
                if (r < 0)
@@ -51,9 +54,12 @@ static int netdev_ipvlan_fill_message_create(NetDev *netdev, Link *link, sd_netl
 }

 static void ipvlan_init(NetDev *n) {
-        IPVlan *m = IPVLAN(n);
+        IPVlan *m;

        assert(n);
+
+        m = IPVLAN(n);
+
        assert(m);

        m->mode = _NETDEV_IPVLAN_MODE_INVALID;