diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-18 14:12:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-18 14:12:43 -0700 |
| commit | d134b78ee34823c607875c77426e18c762a911ea (patch) | |
| tree | 54761f93b0cf701eab97a35762c281b1f57d591b /net/tipc | |
| parent | 785a2b1036273f6b7f78740cc4b0f32ffc9846f5 (diff) | |
| parent | 4bbd026cb9037d8da0979e8725944336cf62d0c1 (diff) | |
Merge branch 'net-various-delete-duplicated-words'
Randy Dunlap says:
====================
net: various: delete duplicated words
[PATCH 1/7 net-next] net: core: delete duplicated words
[PATCH 2/7 net-next] net: rds: delete duplicated words
[PATCH 3/7 net-next] net: ipv6: delete duplicated words
[PATCH 4/7 net-next] net: bluetooth: delete duplicated words
[PATCH 5/7 net-next] net: tipc: delete duplicated words
[PATCH 6/7 net-next] net: atm: delete duplicated words
[PATCH 7/7 net-next] net: bridge: delete duplicated words
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/msg.c | 2 | ||||
| -rw-r--r-- | net/tipc/socket.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/msg.c b/net/tipc/msg.c index 848fae674532..2d9a383b8192 100644 --- a/net/tipc/msg.c +++ b/net/tipc/msg.c @@ -581,7 +581,7 @@ bundle: * @pos: position in outer message of msg to be extracted. * Returns position of next msg * Consumes outer buffer when last packet extracted - * Returns true when when there is an extracted buffer, otherwise false + * Returns true when there is an extracted buffer, otherwise false */ bool tipc_msg_extract(struct sk_buff *skb, struct sk_buff **iskb, int *pos) { diff --git a/net/tipc/socket.c b/net/tipc/socket.c index dd93e8ecb2f4..0f894aca98ed 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c @@ -54,7 +54,7 @@ #define CONN_PROBING_INTV msecs_to_jiffies(3600000) /* [ms] => 1 h */ #define TIPC_MAX_PORT 0xffffffff #define TIPC_MIN_PORT 1 -#define TIPC_ACK_RATE 4 /* ACK at 1/4 of of rcv window size */ +#define TIPC_ACK_RATE 4 /* ACK at 1/4 of rcv window size */ enum { TIPC_LISTEN = TCP_LISTEN, |