From: Marcelo Ricardo Leitner Date: Thu, 26 Apr 2018 19:58:56 +0000 (-0300) Subject: sctp: remove sctp_assoc_pending_pmtu X-Git-Tag: v4.18-rc1~114^2~362^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2521680e1830c21033efe48322829044c6e6b32b;p=thirdparty%2Fkernel%2Flinux.git sctp: remove sctp_assoc_pending_pmtu No need for this helper. Signed-off-by: Marcelo Ricardo Leitner Signed-off-by: David S. Miller --- diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 350c65620a4eb..e327acad8e7d0 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -428,12 +428,6 @@ static inline int sctp_list_single_entry(struct list_head *head) return (head->next != head) && (head->next == head->prev); } -static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc) -{ - sctp_assoc_sync_pmtu(asoc); - asoc->pmtu_pending = 0; -} - static inline bool sctp_chunk_pending(const struct sctp_chunk *chunk) { return !list_empty(&chunk->list); diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 21bf457be3ea3..a93b60a28cc5f 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -1918,8 +1918,10 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc, goto err; } - if (asoc->pmtu_pending) - sctp_assoc_pending_pmtu(asoc); + if (asoc->pmtu_pending) { + sctp_assoc_sync_pmtu(asoc); + asoc->pmtu_pending = 0; + } if (sctp_wspace(asoc) < msg_len) sctp_prsctp_prune(asoc, sinfo, msg_len - sctp_wspace(asoc));