net: drop if expression that is always true
Both is_netdev and !is_netdev paths already check that net_client_init_func[opts->kind] is non-NULL so there is no need for the if statement. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-id: 1432743412-15943-5-git-send-email-stefanha@redhat.com
This commit is contained in:
		
							parent
							
								
									d139e9a6cf
								
							
						
					
					
						commit
						4ef0defbad
					
				| 
						 | 
				
			
			@ -919,6 +919,7 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
 | 
			
		|||
    } u;
 | 
			
		||||
    const NetClientOptions *opts;
 | 
			
		||||
    const char *name;
 | 
			
		||||
    NetClientState *peer = NULL;
 | 
			
		||||
 | 
			
		||||
    if (is_netdev) {
 | 
			
		||||
        u.netdev = object;
 | 
			
		||||
| 
						 | 
				
			
			@ -955,9 +956,6 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
 | 
			
		|||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (net_client_init_fun[opts->kind]) {
 | 
			
		||||
        NetClientState *peer = NULL;
 | 
			
		||||
 | 
			
		||||
    /* Do not add to a vlan if it's a -netdev or a nic with a netdev=
 | 
			
		||||
     * parameter. */
 | 
			
		||||
    if (!is_netdev &&
 | 
			
		||||
| 
						 | 
				
			
			@ -974,7 +972,6 @@ static int net_client_init1(const void *object, int is_netdev, Error **errp)
 | 
			
		|||
        }
 | 
			
		||||
        return -1;
 | 
			
		||||
    }
 | 
			
		||||
    }
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue