From owner-svn-src-user@FreeBSD.ORG  Sun May 19 03:02:42 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 20FD7507;
 Sun, 19 May 2013 03:02:42 +0000 (UTC)
 (envelope-from bryanv@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 1310337E;
 Sun, 19 May 2013 03:02:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4J32fVD056227;
 Sun, 19 May 2013 03:02:41 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4J32fZO056226;
 Sun, 19 May 2013 03:02:41 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201305190302.r4J32fZO056226@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Sun, 19 May 2013 03:02:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r250802 - user/bryanv/vtnetmq/sys/dev/virtio/network
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 May 2013 03:02:42 -0000

Author: bryanv
Date: Sun May 19 03:02:41 2013
New Revision: 250802
URL: http://svnweb.freebsd.org/changeset/base/250802

Log:
  Fix setting of the Rx filters
  
  QEMU 1.4 made the descriptor requirement stricter - the size of
  buffer descriptor must exactly match the number of MAC addresses
  provided.

Modified:
  user/bryanv/vtnetmq/sys/dev/virtio/network/if_vtnet.c

Modified: user/bryanv/vtnetmq/sys/dev/virtio/network/if_vtnet.c
==============================================================================
--- user/bryanv/vtnetmq/sys/dev/virtio/network/if_vtnet.c	Sun May 19 03:01:33 2013	(r250801)
+++ user/bryanv/vtnetmq/sys/dev/virtio/network/if_vtnet.c	Sun May 19 03:02:41 2013	(r250802)
@@ -3218,9 +3218,9 @@ vtnet_rx_filter_mac(struct vtnet_softc *
 	error = 0;
 	error |= sglist_append(&sg, &hdr, sizeof(struct virtio_net_ctrl_hdr));
 	error |= sglist_append(&sg, &filter->vmf_unicast,
-	    sizeof(struct vtnet_mac_table));
+	    sizeof(uint32_t) + filter->vmf_unicast.nentries * ETHER_ADDR_LEN);
 	error |= sglist_append(&sg, &filter->vmf_multicast,
-	    sizeof(struct vtnet_mac_table));
+	    sizeof(uint32_t) + filter->vmf_multicast.nentries * ETHER_ADDR_LEN);
 	error |= sglist_append(&sg, &ack, sizeof(uint8_t));
 	KASSERT(error == 0 && sg.sg_nseg == 4,
 	    ("%s: error %d adding MAC filter msg to sglist", __func__, error));