Sfoglia il codice sorgente

totemknet: macaddr_str is always set

Check for NULL was invalid, because macaddr_str is ether defined in cmap
or set to "54:54:01:00:00:00".

Signed-off-by: Jan Friesse <jfriesse@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
Jan Friesse 6 anni fa
parent
commit
0d82e23517
1 ha cambiato i file con 1 aggiunte e 1 eliminazioni
  1. 1 1
      exec/totemknet.c

+ 1 - 1
exec/totemknet.c

@@ -1838,7 +1838,7 @@ static int setup_nozzle(void *knet_context)
 	    (strcmp(name_str, instance->nozzle_name) == 0) &&
 	    (strcmp(name_str, instance->nozzle_name) == 0) &&
 	    (strcmp(ipaddr_str, instance->nozzle_ipaddr) == 0) &&
 	    (strcmp(ipaddr_str, instance->nozzle_ipaddr) == 0) &&
 	    (strcmp(prefix_str, instance->nozzle_prefix) == 0) &&
 	    (strcmp(prefix_str, instance->nozzle_prefix) == 0) &&
-	    ((macaddr_str == NULL && instance->nozzle_macaddr == NULL) ||
+	    (instance->nozzle_macaddr == NULL ||
 	     strcmp(macaddr_str, instance->nozzle_macaddr) == 0)) {
 	     strcmp(macaddr_str, instance->nozzle_macaddr) == 0)) {
 		/* Nothing has changed */
 		/* Nothing has changed */
 		knet_log_printf (LOGSYS_LEVEL_DEBUG, "Nozzle device info not changed");
 		knet_log_printf (LOGSYS_LEVEL_DEBUG, "Nozzle device info not changed");