From 517d2340317245d88d8261d9d28e38c32abab63b Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 14 Jul 2016 13:51:07 +0100 Subject: [PATCH] [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 --- src/drivers/net/intelvf.c | 41 --------------------------------------- 1 file changed, 41 deletions(-) diff --git a/src/drivers/net/intelvf.c b/src/drivers/net/intelvf.c index 537e0fbb1..ac6fea745 100644 --- a/src/drivers/net/intelvf.c +++ b/src/drivers/net/intelvf.c @@ -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; -}