]> git.proxmox.com Git - ovs.git/commitdiff
ofproto-dpif: fix bundle_move() call in rstp_run().
authorDaniele Venturino <daniele.venturino@m3s.it>
Wed, 19 Nov 2014 21:16:17 +0000 (22:16 +0100)
committerJarno Rajahalme <jrajahalme@nicira.com>
Wed, 19 Nov 2014 21:36:32 +0000 (13:36 -0800)
bundle_move() expects two struct ofbundle pointers as arguments, but
void pointers hide the error.

Signed-off-by: Daniele Venturino <daniele.venturino@m3s.it>
Acked-by: Jarno Rajahalme <jrajahalme@nicira.com>
ofproto/ofproto-dpif.c

index 8778ed2cd5795e0d65563478cf49c5febf858967..3f8768dbf932d7b1a79d0d3182993060e61a351c 100644 (file)
@@ -2190,8 +2190,8 @@ rstp_run(struct ofproto_dpif *ofproto)
         }
 
         if (rstp_shift_root_learned_address(ofproto->rstp)) {
-            bundle_move(rstp_get_old_root_aux(ofproto->rstp),
-                        rstp_get_new_root_aux(ofproto->rstp));
+            bundle_move(((struct ofport_dpif *)rstp_get_old_root_aux(ofproto->rstp))->bundle,
+                        ((struct ofport_dpif *)rstp_get_new_root_aux(ofproto->rstp))->bundle);
             rstp_reset_root_changed(ofproto->rstp);
         }
     }