From: Ondrej Zary <linux@rainbow-software.org>
To: David Brownell <dbrownell@users.sourceforge.net>
Cc: netdev@vger.kernel.org,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH] usbnet: allow rx_process() to ignore packets
Date: Sat, 4 Sep 2010 23:52:22 +0200 [thread overview]
Message-ID: <201009042352.24197.linux@rainbow-software.org> (raw)
Allow rx_process() to ignore a packet without incrementing error counters if
rx_fixup() returns value other than 0 or 1 (e.g. 2).
This allows to simplify rx_fixup() functions of drivers who do complex
processing there. Currently, drivers must process the last packet in a
special way - leave it for usbnet to process. This is not easily possible
when a driver (like the new cx82310_eth) needs to process packets that cross
URB (and thus skb) boundaries. With this patch, the driver can process all
packets in the skb and just return 2 at the end.
Also fix asix driver that was returning 2 at one place before this change
(probably by mistake).
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
--- linux-2.6.36-rc3-orig/drivers/net/usb/usbnet.c 2010-08-29 17:36:04.000000000 +0200
+++ linux-2.6.36-rc3/drivers/net/usb/usbnet.c 2010-09-04 23:47:14.000000000 +0200
@@ -385,18 +385,24 @@ static int rx_submit (struct usbnet *dev
static inline void rx_process (struct usbnet *dev, struct sk_buff *skb)
{
- if (dev->driver_info->rx_fixup &&
- !dev->driver_info->rx_fixup (dev, skb))
- goto error;
- // else network stack removes extra byte if we forced a short packet
+ int fixup = 1;
- if (skb->len)
- usbnet_skb_return (dev, skb);
- else {
- netif_dbg(dev, rx_err, dev->net, "drop\n");
-error:
+ if (dev->driver_info->rx_fixup)
+ fixup = dev->driver_info->rx_fixup(dev, skb);
+
+ switch (fixup) {
+ case 1: /* skb is correct */
+ if (skb->len) {
+ usbnet_skb_return(dev, skb);
+ break;
+ } else
+ netif_dbg(dev, rx_err, dev->net, "drop\n");
+ /* fall through */
+ case 0: /* skb is incorrect */
dev->net->stats.rx_errors++;
- skb_queue_tail (&dev->done, skb);
+ /* fall through */
+ default: /* skb does not need processing */
+ skb_queue_tail(&dev->done, skb);
}
}
--- linux-2.6.36-rc3-orig/drivers/net/usb/asix.c 2010-08-29 17:36:04.000000000 +0200
+++ linux-2.6.36-rc3/drivers/net/usb/asix.c 2010-09-04 23:48:42.000000000 +0200
@@ -341,7 +341,7 @@ static int asix_rx_fixup(struct usbnet *
skb->data -= realignment;
skb_set_tail_pointer(skb, size);
}
- return 2;
+ return 1;
}
if (size > dev->net->mtu + ETH_HLEN) {
--
Ondrej Zary
next reply other threads:[~2010-09-04 21:52 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-04 21:52 Ondrej Zary [this message]
2010-09-04 23:24 ` [PATCH] usbnet: allow rx_process() to ignore packets David Brownell
2010-09-05 16:16 ` Ondrej Zary
2010-09-05 21:35 ` David Brownell
2010-09-07 20:02 ` Ondrej Zary
2010-09-10 21:35 ` [PATCH v2] usbnet: do not count empty skbs as errors in rx_process() Ondrej Zary
2010-09-11 19:07 ` David Brownell
2010-09-11 20:22 ` Ondrej Zary
2010-09-11 21:15 ` David Brownell
2010-09-11 21:21 ` Ondrej Zary
-- strict thread matches above, loose matches on Subject: below --
2010-09-08 0:46 [PATCH] usbnet: allow rx_process() to ignore packets David Brownell
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=201009042352.24197.linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=dbrownell@users.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.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).