Merge tag 'v3.10.90' into update
This is the 3.10.90 stable release
This commit is contained in:
@@ -141,6 +141,7 @@ static inline struct sk_buff *ip_finish_skb(struct sock *sk, struct flowi4 *fl4)
|
||||
}
|
||||
|
||||
/* datagram.c */
|
||||
int __ip4_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len);
|
||||
extern int ip4_datagram_connect(struct sock *sk,
|
||||
struct sockaddr *uaddr, int addr_len);
|
||||
|
||||
|
||||
@@ -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 */
|
||||
|
||||
@@ -228,6 +228,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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user