david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[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>
This commit is contained in:
Michael Brown 2016-07-14 13:51:07 +01:00
parent db3443608f
commit 517d234031
1 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/drivers/net/intelvf.c
View File

@ -338,44 +338,3 @@ int intelvf_mbox_set_mtu ( struct intel_nic *intel, size_t mtu ) {
return 0;
}
/**
* Get queue configuration
*
* @v intel Intel device
* @v vlan_thing VLAN hand-waving thing to fill in
* @ret rc Return status code
*/
int intelvf_mbox_queues ( struct intel_nic *intel, int *vlan_thing ) {
union intelvf_msg msg;
int rc;
/* Send queue configuration message */
memset ( &msg, 0, sizeof ( msg ) );
msg.hdr = INTELVF_MSG_TYPE_GET_QUEUES;
if ( ( rc = intelvf_mbox_msg ( intel, &msg ) ) != 0 ) {
DBGC ( intel, "INTEL %p get queue configuration failed: %s\n",
intel, strerror ( rc ) );
return rc;
}
/* Check response */
if ( ( msg.hdr & INTELVF_MSG_TYPE_MASK ) !=INTELVF_MSG_TYPE_GET_QUEUES){
DBGC ( intel, "INTEL %p get queue configuration unexpected "
"response:\n", intel );
DBGC_HDA ( intel, 0, &msg, sizeof ( msg ) );
return -EPROTO;
}
/* Check that we were allowed to get the queue configuration */
if ( ! ( msg.hdr & INTELVF_MSG_ACK ) ) {
DBGC ( intel, "INTEL %p get queue configuration refused\n",
intel );
return -EPERM;
}
/* Extract VLAN hand-waving thing */
*vlan_thing = msg.queues.vlan_thing;
return 0;
}