Merge commit 'v2.6.30-rc5' into core/iommu

Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index 9eed126a82f0..f2c4a665e93f 100644
--- 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;