From patchwork Mon Feb 8 14:19:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Brown X-Patchwork-Id: 8250091 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 62F919F6DA for ; Mon, 8 Feb 2016 14:22:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3445203B4 for ; Mon, 8 Feb 2016 14:22:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E60F820396 for ; Mon, 8 Feb 2016 14:22:02 +0000 (UTC) Received: from localhost ([::1]:45220 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmhW-0006XH-Al for patchwork-qemu-devel@patchwork.kernel.org; Mon, 08 Feb 2016 09:22:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmfQ-0002rq-IR for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:19:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aSmfM-00061j-MB for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:19:52 -0500 Received: from duck.fensystems.co.uk ([2001:ba8:0:1d4::6950:5845]:49675) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aSmfM-00061N-Fv for qemu-devel@nongnu.org; Mon, 08 Feb 2016 09:19:48 -0500 Received: from localhost.localdomain (genkt-056-205.t-mobile.co.uk [149.254.56.205]) by duck.fensystems.co.uk (Postfix) with ESMTPSA id 9574E107A0; Mon, 8 Feb 2016 14:19:46 +0000 (GMT) From: Michael Brown To: qemu-devel@nongnu.org Date: Mon, 8 Feb 2016 14:19:32 +0000 Message-Id: <1454941174-25050-3-git-send-email-mcb30@ipxe.org> X-Mailer: git-send-email 2.3.8 In-Reply-To: <1454941174-25050-1-git-send-email-mcb30@ipxe.org> References: <1454941174-25050-1-git-send-email-mcb30@ipxe.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:ba8:0:1d4::6950:5845 Cc: Michael Brown Subject: [Qemu-devel] [PATCH 2/4] usbnet: Accept mandatory USB_CDC_SET_ETHERNET_PACKET_FILTER request X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The USB_CDC_SET_ETHERNET_PACKET_FILTER request is mandatory for CDC-ECM devices. Accept this request, ignoring the actual filter value (to match the existing behaviour for RNDIS). Signed-off-by: Michael Brown --- hw/usb/dev-network.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index cf2c641..f4e7acb 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -1117,6 +1117,12 @@ static void usb_net_handle_control(USBDevice *dev, USBPacket *p, #endif break; + case ClassInterfaceOutRequest | USB_CDC_SET_ETHERNET_PACKET_FILTER: + if (is_rndis(s)) { + goto fail; + } + break; + default: fail: fprintf(stderr, "usbnet: failed control transaction: "