DPDK patches and discussions
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 3/5] virtio: don't set mac table unless negotiated
Date: Wed, 15 Apr 2015 08:20:17 -0700	[thread overview]
Message-ID: <1429111219-8789-4-git-send-email-stephen@networkplumber.org> (raw)
In-Reply-To: <1429111219-8789-1-git-send-email-stephen@networkplumber.org>

Don't attempt to set the MAC address table unless the host allows it.
Also, don't return a value from mac_table_set since all callers
ignore the return value.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 lib/librte_pmd_virtio/virtio_ethdev.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c
index f0859d8..3cb9c6a 100644
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -668,7 +668,7 @@ virtio_get_hwaddr(struct virtio_hw *hw)
 	}
 }
 
-static int
+static void
 virtio_mac_table_set(struct virtio_hw *hw,
 		     const struct virtio_net_ctrl_mac *uc,
 		     const struct virtio_net_ctrl_mac *mc)
@@ -676,6 +676,11 @@ virtio_mac_table_set(struct virtio_hw *hw,
 	struct virtio_pmd_ctrl ctrl;
 	int err, len[2];
 
+	if (!vtpci_with_feature(hw, VIRTIO_NET_F_CTRL_MAC_ADDR)) {
+		PMD_DRV_LOG(INFO, "host does not support mac table\n");
+		return;
+	}
+
 	ctrl.hdr.class = VIRTIO_NET_CTRL_MAC;
 	ctrl.hdr.cmd = VIRTIO_NET_CTRL_MAC_TABLE_SET;
 
@@ -688,8 +693,6 @@ virtio_mac_table_set(struct virtio_hw *hw,
 	err = virtio_send_command(hw->cvq, &ctrl, len, 2);
 	if (err != 0)
 		PMD_DRV_LOG(NOTICE, "mac table set failed: %d", err);
-
-	return err;
 }
 
 static void
-- 
2.1.4

  parent reply	other threads:[~2015-04-15 15:20 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-15 15:20 [dpdk-dev] [PATCH 0/5] virtio driver fixes and cleanup Stephen Hemminger
2015-04-15 15:20 ` [dpdk-dev] [PATCH 1/5] virtio: remove useless new lines Stephen Hemminger
2015-04-16  3:41   ` Ouyang, Changchun
2015-04-15 15:20 ` [dpdk-dev] [PATCH 2/5] virtio: don't enable/disable rx modes unless supported Stephen Hemminger
2015-04-16  3:41   ` Ouyang, Changchun
2015-04-15 15:20 ` Stephen Hemminger [this message]
2015-04-16  3:45   ` [dpdk-dev] [PATCH 3/5] virtio: don't set mac table unless negotiated Ouyang, Changchun
2015-04-15 15:20 ` [dpdk-dev] [PATCH 4/5] virtio: fix ring size negotiation Stephen Hemminger
2015-04-16  3:39   ` Ouyang, Changchun
2015-04-16  5:47     ` Stephen Hemminger
2015-04-16  6:26       ` Ouyang, Changchun
2015-04-16  7:38         ` Thomas Monjalon
2015-04-16 17:30           ` Stephen Hemminger
2015-04-16 17:33         ` Stephen Hemminger
2015-04-15 15:20 ` [dpdk-dev] [PATCH 5/5] virtio: clarify feature bit handling Stephen Hemminger
2015-06-10  0:48   ` Stephen Hemminger
2015-06-11  5:56     ` Ouyang, Changchun
2015-06-11 15:53 [dpdk-dev] [PATCH 0/5 v3] virtio: patches Stephen Hemminger
2015-06-11 15:53 ` [dpdk-dev] [PATCH 3/5] virtio: don't set mac table unless negotiated Stephen Hemminger
2015-06-12  1:30   ` Ouyang, Changchun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1429111219-8789-4-git-send-email-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=dev@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).