|  | @@ -313,8 +313,11 @@ static int intelxl_admin_command ( struct intelxl_nic *intelxl ) {
 | 
		
	
		
			
			| 313 | 313 |  	tail = ( admin->index % INTELXL_ADMIN_NUM_DESC );
 | 
		
	
		
			
			| 314 | 314 |  	cmd = &admin->desc[ index % INTELXL_ADMIN_NUM_DESC ];
 | 
		
	
		
			
			| 315 | 315 |  	buf = &admin->buf[ index % INTELXL_ADMIN_NUM_DESC ];
 | 
		
	
		
			
			| 316 |  | -	DBGC2 ( intelxl, "INTELXL %p admin command %#x opcode %#04x:\n",
 | 
		
	
		
			
			|  | 316 | +	DBGC2 ( intelxl, "INTELXL %p admin command %#x opcode %#04x",
 | 
		
	
		
			
			| 317 | 317 |  		intelxl, index, le16_to_cpu ( cmd->opcode ) );
 | 
		
	
		
			
			|  | 318 | +	if ( cmd->vopcode )
 | 
		
	
		
			
			|  | 319 | +		DBGC2 ( intelxl, "/%#08x", le32_to_cpu ( cmd->vopcode ) );
 | 
		
	
		
			
			|  | 320 | +	DBGC2 ( intelxl, ":\n" );
 | 
		
	
		
			
			| 318 | 321 |  
 | 
		
	
		
			
			| 319 | 322 |  	/* Sanity checks */
 | 
		
	
		
			
			| 320 | 323 |  	assert ( ! ( cmd->flags & cpu_to_le16 ( INTELXL_ADMIN_FL_DD ) ) );
 | 
		
	
	
		
			
			|  | @@ -329,8 +332,9 @@ static int intelxl_admin_command ( struct intelxl_nic *intelxl ) {
 | 
		
	
		
			
			| 329 | 332 |  		cmd->params.buffer.low = cpu_to_le32 ( address & 0xffffffffUL );
 | 
		
	
		
			
			| 330 | 333 |  	}
 | 
		
	
		
			
			| 331 | 334 |  
 | 
		
	
		
			
			| 332 |  | -	/* Populate cookie */
 | 
		
	
		
			
			| 333 |  | -	cmd->cookie = cpu_to_le32 ( index );
 | 
		
	
		
			
			|  | 335 | +	/* Populate cookie, if not being (ab)used for VF opcode */
 | 
		
	
		
			
			|  | 336 | +	if ( ! cmd->vopcode )
 | 
		
	
		
			
			|  | 337 | +		cmd->cookie = cpu_to_le32 ( index );
 | 
		
	
		
			
			| 334 | 338 |  
 | 
		
	
		
			
			| 335 | 339 |  	/* Record cookie */
 | 
		
	
		
			
			| 336 | 340 |  	cookie = cmd->cookie;
 |