mirror of https://gitee.com/openkylin/linux.git
Merge branch 'net-sctp-delete-duplicated-words-plus-other-fixes'
Randy Dunlap says: ==================== net: sctp: delete duplicated words + other fixes Drop or fix repeated words in net/sctp/. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
ce876d8f3d
|
@ -1351,7 +1351,7 @@ static void sctp_select_active_and_retran_path(struct sctp_association *asoc)
|
|||
}
|
||||
|
||||
/* We did not find anything useful for a possible retransmission
|
||||
* path; either primary path that we found is the the same as
|
||||
* path; either primary path that we found is the same as
|
||||
* the current one, or we didn't generally find an active one.
|
||||
*/
|
||||
if (trans_sec == NULL)
|
||||
|
@ -1537,7 +1537,7 @@ void sctp_assoc_rwnd_decrease(struct sctp_association *asoc, unsigned int len)
|
|||
|
||||
/* If we've reached or overflowed our receive buffer, announce
|
||||
* a 0 rwnd if rwnd would still be positive. Store the
|
||||
* the potential pressure overflow so that the window can be restored
|
||||
* potential pressure overflow so that the window can be restored
|
||||
* back to original value.
|
||||
*/
|
||||
if (rx_count >= asoc->base.sk->sk_rcvbuf)
|
||||
|
|
|
@ -445,7 +445,7 @@ struct sctp_shared_key *sctp_auth_get_shkey(
|
|||
}
|
||||
|
||||
/*
|
||||
* Initialize all the possible digest transforms that we can use. Right now
|
||||
* Initialize all the possible digest transforms that we can use. Right
|
||||
* now, the supported digests are SHA1 and SHA256. We do this here once
|
||||
* because of the restrictiong that transforms may only be allocated in
|
||||
* user context. This forces us to pre-allocated all possible transforms
|
||||
|
@ -810,7 +810,7 @@ int sctp_auth_ep_set_hmacs(struct sctp_endpoint *ep,
|
|||
}
|
||||
|
||||
/* Set a new shared key on either endpoint or association. If the
|
||||
* the key with a same ID already exists, replace the key (remove the
|
||||
* key with a same ID already exists, replace the key (remove the
|
||||
* old key and add a new one).
|
||||
*/
|
||||
int sctp_auth_set_key(struct sctp_endpoint *ep,
|
||||
|
|
|
@ -505,7 +505,7 @@ int sctp_in_scope(struct net *net, const union sctp_addr *addr,
|
|||
return 0;
|
||||
/*
|
||||
* For INIT and INIT-ACK address list, let L be the level of
|
||||
* of requested destination address, sender and receiver
|
||||
* requested destination address, sender and receiver
|
||||
* SHOULD include all of its addresses with level greater
|
||||
* than or equal to L.
|
||||
*
|
||||
|
|
|
@ -179,7 +179,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc,
|
|||
__func__, asoc, max_data);
|
||||
}
|
||||
|
||||
/* If the the peer requested that we authenticate DATA chunks
|
||||
/* If the peer requested that we authenticate DATA chunks
|
||||
* we need to account for bundling of the AUTH chunks along with
|
||||
* DATA.
|
||||
*/
|
||||
|
|
|
@ -372,7 +372,7 @@ static int sctp_v4_available(union sctp_addr *addr, struct sctp_sock *sp)
|
|||
* Level 3 - private addresses.
|
||||
* Level 4 - global addresses
|
||||
* For INIT and INIT-ACK address list, let L be the level of
|
||||
* of requested destination address, sender and receiver
|
||||
* requested destination address, sender and receiver
|
||||
* SHOULD include all of its addresses with level greater
|
||||
* than or equal to L.
|
||||
*
|
||||
|
@ -1483,10 +1483,10 @@ static __init int sctp_init(void)
|
|||
num_entries = (1UL << order) * PAGE_SIZE /
|
||||
sizeof(struct sctp_bind_hashbucket);
|
||||
|
||||
/* And finish by rounding it down to the nearest power of two
|
||||
* this wastes some memory of course, but its needed because
|
||||
/* And finish by rounding it down to the nearest power of two.
|
||||
* This wastes some memory of course, but it's needed because
|
||||
* the hash function operates based on the assumption that
|
||||
* that the number of entries is a power of two
|
||||
* the number of entries is a power of two.
|
||||
*/
|
||||
sctp_port_hashsize = rounddown_pow_of_two(num_entries);
|
||||
|
||||
|
|
|
@ -1235,7 +1235,7 @@ static struct sctp_chunk *sctp_make_op_error_space(
|
|||
|
||||
/* Create an Operation Error chunk of a fixed size, specifically,
|
||||
* min(asoc->pathmtu, SCTP_DEFAULT_MAXSEGMENT) - overheads.
|
||||
* This is a helper function to allocate an error chunk for for those
|
||||
* This is a helper function to allocate an error chunk for those
|
||||
* invalid parameter codes in which we may not want to report all the
|
||||
* errors, if the incoming chunk is large. If it can't fit in a single
|
||||
* packet, we ignore it.
|
||||
|
@ -1780,7 +1780,7 @@ struct sctp_association *sctp_unpack_cookie(
|
|||
* for init collision case of lost COOKIE ACK.
|
||||
* If skb has been timestamped, then use the stamp, otherwise
|
||||
* use current time. This introduces a small possibility that
|
||||
* that a cookie may be considered expired, but his would only slow
|
||||
* a cookie may be considered expired, but this would only slow
|
||||
* down the new association establishment instead of every packet.
|
||||
*/
|
||||
if (sock_flag(ep->base.sk, SOCK_TIMESTAMP))
|
||||
|
@ -2319,7 +2319,7 @@ int sctp_process_init(struct sctp_association *asoc, struct sctp_chunk *chunk,
|
|||
|
||||
/* This implementation defaults to making the first transport
|
||||
* added as the primary transport. The source address seems to
|
||||
* be a a better choice than any of the embedded addresses.
|
||||
* be a better choice than any of the embedded addresses.
|
||||
*/
|
||||
if (!sctp_assoc_add_peer(asoc, peer_addr, gfp, SCTP_ACTIVE))
|
||||
goto nomem;
|
||||
|
|
|
@ -740,7 +740,7 @@ static void sctp_ulpq_reasm_drain(struct sctp_ulpq *ulpq)
|
|||
|
||||
|
||||
/* Helper function to gather skbs that have possibly become
|
||||
* ordered by an an incoming chunk.
|
||||
* ordered by an incoming chunk.
|
||||
*/
|
||||
static void sctp_ulpq_retrieve_ordered(struct sctp_ulpq *ulpq,
|
||||
struct sctp_ulpevent *event)
|
||||
|
|
Loading…
Reference in New Issue