diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-06 08:23:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-06 08:23:39 -0400 |
| commit | 68083e05d72d94f347293d8cc0067050ba904bfa (patch) | |
| tree | 842e71365bd90866be7add181661a4039d891564 /net/ipv4/inet_lro.c | |
| parent | 7baac8b91f9871ba8cb09af84de4ae1d86d07812 (diff) | |
| parent | b7279469d66b55119784b8b9529c99c1955fe747 (diff) | |
Merge commit 'v2.6.26-rc9' into cpus4096
Diffstat (limited to 'net/ipv4/inet_lro.c')
| -rw-r--r-- | net/ipv4/inet_lro.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/inet_lro.c b/net/ipv4/inet_lro.c index 4a4d49fca1f2..cfd034a2b96e 100644 --- a/net/ipv4/inet_lro.c +++ b/net/ipv4/inet_lro.c | |||
| @@ -383,8 +383,7 @@ static int __lro_proc_skb(struct net_lro_mgr *lro_mgr, struct sk_buff *skb, | |||
| 383 | out2: /* send aggregated SKBs to stack */ | 383 | out2: /* send aggregated SKBs to stack */ |
| 384 | lro_flush(lro_mgr, lro_desc); | 384 | lro_flush(lro_mgr, lro_desc); |
| 385 | 385 | ||
| 386 | out: /* Original SKB has to be posted to stack */ | 386 | out: |
| 387 | skb->ip_summed = lro_mgr->ip_summed; | ||
| 388 | return 1; | 387 | return 1; |
| 389 | } | 388 | } |
| 390 | 389 | ||