Просмотр исходного кода

[intel] Remove duplicate intelvf_mbox_queues() function

Commit db34436 ("[intel] Strip spurious VLAN tags received by virtual
function NICs") accidentally introduced two copies of the
intel[x]vf_mbox_queues() function.  Remove the unintended copy.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 8 лет назад
Родитель
Сommit
517d234031
1 измененных файлов: 0 добавлений и 41 удалений
  1. 0
    41
      src/drivers/net/intelvf.c

+ 0
- 41
src/drivers/net/intelvf.c Просмотреть файл

@@ -338,44 +338,3 @@ int intelvf_mbox_set_mtu ( struct intel_nic *intel, size_t mtu ) {
338 338
 
339 339
 	return 0;
340 340
 }
341
-
342
-/**
343
- * Get queue configuration
344
- *
345
- * @v intel		Intel device
346
- * @v vlan_thing	VLAN hand-waving thing to fill in
347
- * @ret rc		Return status code
348
- */
349
-int intelvf_mbox_queues ( struct intel_nic *intel, int *vlan_thing ) {
350
-	union intelvf_msg msg;
351
-	int rc;
352
-
353
-	/* Send queue configuration message */
354
-	memset ( &msg, 0, sizeof ( msg ) );
355
-	msg.hdr = INTELVF_MSG_TYPE_GET_QUEUES;
356
-	if ( ( rc = intelvf_mbox_msg ( intel, &msg ) ) != 0 ) {
357
-		DBGC ( intel, "INTEL %p get queue configuration failed: %s\n",
358
-		       intel, strerror ( rc ) );
359
-		return rc;
360
-	}
361
-
362
-	/* Check response */
363
-	if ( ( msg.hdr & INTELVF_MSG_TYPE_MASK ) !=INTELVF_MSG_TYPE_GET_QUEUES){
364
-		DBGC ( intel, "INTEL %p get queue configuration unexpected "
365
-		       "response:\n", intel );
366
-		DBGC_HDA ( intel, 0, &msg, sizeof ( msg ) );
367
-		return -EPROTO;
368
-	}
369
-
370
-	/* Check that we were allowed to get the queue configuration */
371
-	if ( ! ( msg.hdr & INTELVF_MSG_ACK ) ) {
372
-		DBGC ( intel, "INTEL %p get queue configuration refused\n",
373
-		       intel );
374
-		return -EPERM;
375
-	}
376
-
377
-	/* Extract VLAN hand-waving thing */
378
-	*vlan_thing = msg.queues.vlan_thing;
379
-
380
-	return 0;
381
-}

Загрузка…
Отмена
Сохранить