diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 12:26:13 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-05 12:26:13 -0500 |
| commit | 2a1292b36ba106b9b7f030d3fa130f5f634fd8f0 (patch) | |
| tree | 12547c03b949e9cfa64c9760be9a73f18bb7a81a /include/linux | |
| parent | 2cfae2739bda8fc5d934977c0ab19f6df1dd6d6c (diff) | |
| parent | 621544eb8c3beaa859c75850f816dd9b056a00a3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
[LRO]: fix lro_gen_skb() alignment
[TCP]: NAGLE_PUSH seems to be a wrong way around
[TCP]: Move prior_in_flight collect to more robust place
[TCP] FRTO: Use of existing funcs make code more obvious & robust
[IRDA]: Move ircomm_tty_line_info() under #ifdef CONFIG_PROC_FS
[ROSE]: Trivial compilation CONFIG_INET=n case
[IPVS]: Fix sched registration race when checking for name collision.
[IPVS]: Don't leak sysctl tables if the scheduler registration fails.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/inet_lro.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h index 1246d46abbc0..80335b7d77c5 100644 --- a/include/linux/inet_lro.h +++ b/include/linux/inet_lro.h | |||
| @@ -91,6 +91,9 @@ struct net_lro_mgr { | |||
| 91 | int max_desc; /* Max number of LRO descriptors */ | 91 | int max_desc; /* Max number of LRO descriptors */ |
| 92 | int max_aggr; /* Max number of LRO packets to be aggregated */ | 92 | int max_aggr; /* Max number of LRO packets to be aggregated */ |
| 93 | 93 | ||
| 94 | int frag_align_pad; /* Padding required to properly align layer 3 | ||
| 95 | * headers in generated skb when using frags */ | ||
| 96 | |||
| 94 | struct net_lro_desc *lro_arr; /* Array of LRO descriptors */ | 97 | struct net_lro_desc *lro_arr; /* Array of LRO descriptors */ |
| 95 | 98 | ||
| 96 | /* | 99 | /* |