diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
| commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
| tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /include/net | |
| parent | f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff) | |
| parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) | |
| download | linux-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.gz linux-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.bz2 linux-5dd8816aeb1f068ade0349a22009ff7a66f25413.zip | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/neighbour.h | 1 | ||||
| -rw-r--r-- | include/net/sctp/structs.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index b0666d66293f..4901ee446879 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h @@ -211,6 +211,7 @@ struct neigh_table #define NEIGH_UPDATE_F_ADMIN 0x80000000 extern void neigh_table_init(struct neigh_table *tbl); +extern void neigh_table_init_no_netlink(struct neigh_table *tbl); extern int neigh_table_clear(struct neigh_table *tbl); extern struct neighbour * neigh_lookup(struct neigh_table *tbl, const void *pkey, diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index eba99f375517..7f4fea173fb1 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -712,6 +712,7 @@ struct sctp_chunk { __u8 tsn_gap_acked; /* Is this chunk acked by a GAP ACK? */ __s8 fast_retransmit; /* Is this chunk fast retransmitted? */ __u8 tsn_missing_report; /* Data chunk missing counter. */ + __u8 data_accepted; /* At least 1 chunk in this packet accepted */ }; void sctp_chunk_hold(struct sctp_chunk *); |