]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
myr10ge: again fix lro_gen_skb() alignment
authorStanislaw Gruszka <sgruszka@redhat.com>
Wed, 15 Apr 2009 09:26:49 +0000 (02:26 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 15 Jun 2009 16:39:53 +0000 (09:39 -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

index e9c1296b267eccecb1eba8d7e9c53ffe7dcceeea..53ff2385da08b96af460d46115a8428c5acffddc 100644 (file)
@@ -2446,6 +2446,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;