From patchwork Wed Apr 7 00:23:07 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Elina Pasheva X-Patchwork-Id: 49557 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E9A82B7D40 for ; Wed, 7 Apr 2010 10:23:33 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932244Ab0DGAXP (ORCPT ); Tue, 6 Apr 2010 20:23:15 -0400 Received: from carmd-sa02.sierrawireless.com ([208.81.121.46]:49373 "EHLO carmd-sa02.sierrawireless.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932229Ab0DGAXN (ORCPT ); Tue, 6 Apr 2010 20:23:13 -0400 X-ASG-Debug-ID: 1270599792-7ea209650001-BZBGGp Received: from CARMD-EXCHHUB01.sierrawireless.local ([10.0.6.2]) by carmd-sa02.sierrawireless.com with ESMTP id CtA7B7NpD88uFLZA (version=TLSv1 cipher=AES128-SHA bits=128 verify=NO); Tue, 06 Apr 2010 17:23:12 -0700 (PDT) X-Barracuda-Envelope-From: epasheva@sierrawireless.com Received: from [10.1.32.116] (10.1.32.116) by CARMD-EXCHHUB01.sierrawireless.local (10.0.6.2) with Microsoft SMTP Server (TLS) id 8.1.358.0; Tue, 6 Apr 2010 17:23:12 -0700 X-ASG-Orig-Subj: [PATCH 1/1] NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c Subject: [PATCH 1/1] NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c From: Elina Pasheva To: CC: , , , Date: Tue, 6 Apr 2010 17:23:07 -0700 Message-ID: <1270599787.8900.8.camel@Linuxdev4-laptop> MIME-Version: 1.0 X-Mailer: Evolution 2.22.3.1 X-Barracuda-Connect: UNKNOWN[10.0.6.2] X-Barracuda-Start-Time: 1270599792 X-Barracuda-Encrypted: AES128-SHA X-Barracuda-URL: http://172.30.101.46:80/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at sierrawireless.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Subject: [PATCH 1/1] NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c From: Elina Pasheva This patch adds setting of the urb transfer flag URB_ZERO_PACKET before submitting an urb for drivers that have requested it (by advertising flag FLAG_SEND_ZLP). The modification is in usbnet.c function usbnet_start_xmit(). This patch only adds the zero length flag. A subsequent patch will address the buggy code we found when devices do not advertise FLAG_SEND_ZLP in which case there is a possibility of transferring packets with non-deterministic length. This patch has been tested on kernel-2.6.34-rc3. This patch has been checked against net-2.6 tree. Signed-off-by: Elina Pasheva Signed-off-by: Rory Filer --- drivers/net/usb/usbnet.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/net/usb/usbnet.c 2010-04-06 10:52:54.000000000 -0700 +++ b/drivers/net/usb/usbnet.c 2010-04-06 16:54:44.000000000 -0700 @@ -1068,12 +1068,15 @@ netdev_tx_t usbnet_start_xmit (struct sk * NOTE: strictly conforming cdc-ether devices should expect * the ZLP here, but ignore the one-byte packet. */ - if (!(info->flags & FLAG_SEND_ZLP) && (length % dev->maxpacket) == 0) { - urb->transfer_buffer_length++; - if (skb_tailroom(skb)) { - skb->data[skb->len] = 0; - __skb_put(skb, 1); - } + if (length % dev->maxpacket == 0) { + if (!(info->flags & FLAG_SEND_ZLP)) { + urb->transfer_buffer_length++; + if (skb_tailroom(skb)) { + skb->data[skb->len] = 0; + __skb_put(skb, 1); + } + } else + urb->transfer_flags |= URB_ZERO_PACKET; } spin_lock_irqsave(&dev->txq.lock, flags);