Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc...

[karo-tx-linux.git] / net / ipv4 / tcp_cdg.c

diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c
index 03725b2942866e2e9f91d9f9e01ab12ae9ff36dd..35b280361cb20f23727c5c7a3df081163597af65 100644 (file)
--- a/net/ipv4/tcp_cdg.c
+++ b/net/ipv4/tcp_cdg.c
@@ -56,7 +56,7 @@ MODULE_PARM_DESC(use_shadow, "use shadow window heuristic");
 module_param(use_tolerance, bool, 0644);
 MODULE_PARM_DESC(use_tolerance, "use loss tolerance heuristic");
 
-struct minmax {
+struct cdg_minmax {
        union {
                struct {
                        s32 min;
@@ -74,10 +74,10 @@ enum cdg_state {
 };
 
 struct cdg {
-       struct minmax rtt;
-       struct minmax rtt_prev;
-       struct minmax *gradients;
-       struct minmax gsum;
+       struct cdg_minmax rtt;
+       struct cdg_minmax rtt_prev;
+       struct cdg_minmax *gradients;
+       struct cdg_minmax gsum;
        bool gfilled;
        u8  tail;
        u8  state;
@@ -353,7 +353,7 @@ static void tcp_cdg_cwnd_event(struct sock *sk, const enum tcp_ca_event ev)
 {
        struct cdg *ca = inet_csk_ca(sk);
        struct tcp_sock *tp = tcp_sk(sk);
-       struct minmax *gradients;
+       struct cdg_minmax *gradients;
 
        switch (ev) {
        case CA_EVENT_CWND_RESTART: