git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
myri10ge
/
myri10ge.c
diff --git
a/drivers/net/myri10ge/myri10ge.c
b/drivers/net/myri10ge/myri10ge.c
index 9eed126a82f0009e30464d432eb5e43670e02b99..f2c4a665e93f3d89cf1e0dcaf679f92f3aac681a 100644
(file)
--- a/
drivers/net/myri10ge/myri10ge.c
+++ b/
drivers/net/myri10ge/myri10ge.c
@@
-2447,6
+2447,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;