diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:25:03 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-17 22:25:03 +0200 |
commit | 45bcc91aca328ba33f39cd711cf70b46ddd41ba0 (patch) | |
tree | e2cf2730ea8181e61b04f57760c49f0c13772669 /include/net/sctp/structs.h | |
parent | f923c8e887d6eed9f14937b8e09a8f5a7d5941d5 (diff) | |
parent | 0da47184eafe0eb3ddb1340a70f8a150b477b6a0 (diff) |
Merge branch 'clps711x/cleanup' into next/cleanup
Patches from Alexander Shiyan <shc_work@mail.ru>:
* clps711x/cleanup:
ARM: clps711x: Remove the setting of the time
ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
ARM: clps711x/p720t: Replace __initcall by .init_early call
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/net/sctp/structs.h')
-rw-r--r-- | include/net/sctp/structs.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index e4652fe5895..fecdf31816f 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -912,6 +912,9 @@ struct sctp_transport { /* Is this structure kfree()able? */ malloced:1; + /* Has this transport moved the ctsn since we last sacked */ + __u32 sack_generation; + struct flowi fl; /* This is the peer's IP address and port. */ @@ -1584,6 +1587,7 @@ struct sctp_association { */ __u8 sack_needed; /* Do we need to sack the peer? */ __u32 sack_cnt; + __u32 sack_generation; /* These are capabilities which our peer advertised. */ __u8 ecn_capable:1, /* Can peer do ECN? */ |