diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-07-14 08:47:01 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-07-14 08:47:01 +0200 |
commit | 9415b93b35944bd01b80e7ab5ce64987e64c4666 (patch) | |
tree | c20b491b569090aa7ed4785dd2ce71cd2db75ebe /include | |
parent | 4a73219ca2462546ab0dac4681f88bc5ba64561c (diff) | |
parent | 5cf9896dc5c72a6c68c36140568b755f697f7760 (diff) |
Merge tag 'v4.1.2' into toradex_vf_4.1-next
This is the 4.1.2 stable release
Diffstat (limited to 'include')
-rw-r--r-- | include/net/netns/sctp.h | 1 | ||||
-rw-r--r-- | include/net/sctp/structs.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/net/netns/sctp.h b/include/net/netns/sctp.h index 3573a81815ad..8ba379f9e467 100644 --- a/include/net/netns/sctp.h +++ b/include/net/netns/sctp.h @@ -31,6 +31,7 @@ struct netns_sctp { struct list_head addr_waitq; struct timer_list addr_wq_timer; struct list_head auto_asconf_splist; + /* Lock that protects both addr_waitq and auto_asconf_splist */ spinlock_t addr_wq_lock; /* Lock that protects the local_addr_list writers */ diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 2bb2fcf5b11f..495c87e367b3 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h @@ -223,6 +223,10 @@ struct sctp_sock { atomic_t pd_mode; /* Receive to here while partial delivery is in effect. */ struct sk_buff_head pd_lobby; + + /* These must be the last fields, as they will skipped on copies, + * like on accept and peeloff operations + */ struct list_head auto_asconf_list; int do_auto_asconf; }; |