]> git.baikalelectronics.ru Git - kernel.git/commit
tcp: cdg: rename struct minmax in tcp_cdg.c to avoid a naming conflict
authorSoheil Hassas Yeganeh <soheil@google.com>
Tue, 20 Sep 2016 03:39:08 +0000 (23:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 21 Sep 2016 04:22:59 +0000 (00:22 -0400)
commit8ad01db679ec93e8124ee3cf9f1c8c83d71c0644
tree5f8ae6dedbe91b039cb6330db7ada0af22140f24
parent5d1c850debea56be4137d54d65aa1406c7645cbd
tcp: cdg: rename struct minmax in tcp_cdg.c to avoid a naming conflict

The upcoming change "lib/win_minmax: windowed min or max estimator"
introduces a struct called minmax, which is then included in
include/linux/tcp.h in the upcoming change "tcp: use windowed min
filter library for TCP min_rtt estimation". This would create a
compilation error for tcp_cdg.c, which defines its own minmax
struct. To avoid this naming conflict (and potentially others in the
future), this commit renames the version used in tcp_cdg.c to
cdg_minmax.

Signed-off-by: Soheil Hassas Yeganeh <soheil@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Kenneth Klette Jonassen <kennetkl@ifi.uio.no>
Acked-by: Kenneth Klette Jonassen <kennetkl@ifi.uio.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_cdg.c