diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:50:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:50:37 -0400 |
| commit | 236fa08168dd82af29a76c31c40b4148403774c0 (patch) | |
| tree | 73456604747ede3536a5b851ce4615aab96237f7 /include/net | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
| parent | dcab5e1eeccf5e226c771ecc013631cde157435f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6.15
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/dst.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index 4a056a682435..6c196a5baf24 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
| @@ -94,7 +94,6 @@ struct dst_ops | |||
| 94 | struct dst_entry * (*negative_advice)(struct dst_entry *); | 94 | struct dst_entry * (*negative_advice)(struct dst_entry *); |
| 95 | void (*link_failure)(struct sk_buff *); | 95 | void (*link_failure)(struct sk_buff *); |
| 96 | void (*update_pmtu)(struct dst_entry *dst, u32 mtu); | 96 | void (*update_pmtu)(struct dst_entry *dst, u32 mtu); |
| 97 | int (*get_mss)(struct dst_entry *dst, u32 mtu); | ||
| 98 | int entry_size; | 97 | int entry_size; |
| 99 | 98 | ||
| 100 | atomic_t entries; | 99 | atomic_t entries; |