From: Francois Romieu <romieu@fr.zoreil.com>
To: jeff@garzik.org, netdev@vger.kernel.org
Cc: akpm@linux-foundation.org, Stephen Hemminger <shemminger@vyatta.com>
Subject: [PATCH 2/6] sis190: hard-code the alignment of tiny packets
Date: Sun, 27 Apr 2008 19:02:38 +0200 [thread overview]
Message-ID: <20080427170238.GC26953@electric-eye.fr.zoreil.com> (raw)
In-Reply-To: <20080427170023.GA26953@electric-eye.fr.zoreil.com>
There is no DMA involved here. Align the IP header without condition.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
---
drivers/net/sis190.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index 0d6aa1f..248c385 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -526,9 +526,9 @@ static inline int sis190_try_rx_copy(struct sk_buff **sk_buff, int pkt_size,
if (pkt_size < rx_copybreak) {
struct sk_buff *skb;
- skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN);
+ skb = dev_alloc_skb(pkt_size + 2);
if (skb) {
- skb_reserve(skb, NET_IP_ALIGN);
+ skb_reserve(skb, 2);
skb_copy_to_linear_data(skb, sk_buff[0]->data, pkt_size);
*sk_buff = skb;
sis190_give_to_asic(desc, rx_buf_sz);
--
1.5.3.3
next prev parent reply other threads:[~2008-04-27 17:21 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-27 17:00 [RFT 0/6] sis190 branch info Francois Romieu
2008-04-27 17:01 ` [PATCH 1/6] sis190: use the allocated buffer as a status code in sis190_alloc_rx_skb Francois Romieu
2008-04-27 17:02 ` Francois Romieu [this message]
2008-04-27 17:03 ` [PATCH 3/6] sis190: use netdev_alloc_skb Francois Romieu
2008-04-27 17:04 ` [PATCH 4/6] sis190: Rx path update Francois Romieu
2008-04-27 17:05 ` [PATCH 5/6] sis190: remove needless MII reset Francois Romieu
2008-04-27 17:06 ` [PATCH 6/6] sis190: account for Tx errors Francois Romieu
2008-05-01 23:16 ` Andrew Morton
2008-04-29 5:47 ` [RFT 0/6] sis190 branch info Jeff Garzik
2008-05-01 23:10 ` Andrew Morton
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=20080427170238.GC26953@electric-eye.fr.zoreil.com \
--to=romieu@fr.zoreil.com \
--cc=akpm@linux-foundation.org \
--cc=jeff@garzik.org \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/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).