[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <002801cad615$a352f2a0$808918ac@apr.dhcp.ti.com>
Date: Wed, 7 Apr 2010 11:16:12 +0530
From: "Maulik" <x0082077@...com>
To: "'Elina Pasheva'" <epasheva@...rrawireless.com>,
<dbrownell@...rs.sourceforge.net>
Cc: <rfiler@...rrawireless.com>, <netdev@...r.kernel.org>,
<linux-usb@...r.kernel.org>
Subject: RE: [PATCH 1/1] NET: usb: Adding URB_ZERO_PACKET flag to usbnet.c
> -----Original Message-----
> From: linux-usb-owner@...r.kernel.org [mailto:linux-usb-
> owner@...r.kernel.org] On Behalf Of Elina Pasheva
> Sent: Wednesday, April 07, 2010 5:53 AM
> To: dbrownell@...rs.sourceforge.net
> Cc: epasheva@...rrawireless.com; rfiler@...rrawireless.com;
> netdev@...r.kernel.org; linux-usb@...r.kernel.org
> Subject: [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 <epasheva@...rrawireless.com>
> 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 <epasheva@...rrawireless.com>
> Signed-off-by: Rory Filer <rfiler@...rrawireless.com>
> ---
>
> drivers/net/usb/usbnet.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> --- 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;
You should place braces for the else case as well. See
Documentation/CodingStyle.
It states to use braces in both the branches since the if() case
contains multiple statements.
Maulik
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists