Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Several cases of overlapping changes which were for the most part trivially resolvable. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -610,4 +610,9 @@ static inline __u32 sctp_min_frag_point(struct sctp_sock *sp, __u16 datasize)
|
||||
return sctp_mtu_payload(sp, SCTP_DEFAULT_MINSEGMENT, datasize);
|
||||
}
|
||||
|
||||
static inline bool sctp_newsk_ready(const struct sock *sk)
|
||||
{
|
||||
return sock_flag(sk, SOCK_DEAD) || sk->sk_socket;
|
||||
}
|
||||
|
||||
#endif /* __net_sctp_h__ */
|
||||
|
Reference in New Issue
Block a user