git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
708f2c8
)
myr10ge: again fix lro_gen_skb() alignment
author
Stanislaw Gruszka
<sgruszka@redhat.com>
Wed, 15 Apr 2009 09:26:49 +0000
(
02:26
-0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 12 Jun 2009 03:01:16 +0000
(20:01 -0700)
[ Upstream commit
636d2f68a0814d84de26c021b2c15e3b4ffa29de
]
Add LRO alignment initially committed in
621544eb8c3beaa859c75850f816dd9b056a00a3
("[LRO]: fix lro_gen_skb()
alignment") and removed in
0dcffac1a329be69bab0ac604bf7283737108e68
("myri10ge: add multislices support") during conversion to
multi-slice.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/myri10ge/myri10ge.c
patch
|
blob
|
history
diff --git
a/drivers/net/myri10ge/myri10ge.c
b/drivers/net/myri10ge/myri10ge.c
index
d6524db
..
7d41ec8
100644
(file)
--- a/
drivers/net/myri10ge/myri10ge.c
+++ b/
drivers/net/myri10ge/myri10ge.c
@@
-2379,6
+2379,7
@@
static int myri10ge_open(struct net_device *dev)
lro_mgr->lro_arr = ss->rx_done.lro_desc;
lro_mgr->get_frag_header = myri10ge_get_frag_header;
lro_mgr->max_aggr = myri10ge_lro_max_pkts;
+ lro_mgr->frag_align_pad = 2;
if (lro_mgr->max_aggr > MAX_SKB_FRAGS)
lro_mgr->max_aggr = MAX_SKB_FRAGS;