• Bug#264532: Compiler Problem

    From Helmut Toplitzer@1:229/2 to All on Fri Aug 13 12:20:11 2004
    From: [email protected]

    Fixes at least the annoying compiler error message
    with gcc 2.95.4 :-)

    --------------------------------------------------------------
    --- net/ipv4/udp.c.orig Fri Aug 13 11:29:50 2004
    +++ net/ipv4/udp.c Fri Aug 13 11:50:33 2004
    @@ -495,6 +495,7 @@
    struct udp_opt *up = udp_sk(sk);
    int ulen = len;
    struct ipcm_cookie ipc;
    + struct flowi fl;
    struct rtable *rt = NULL;
    int free = 0;
    int connected = 0;
    @@ -619,16 +620,14 @@
    saddr = ipv4root;
    }
    }
    - struct flowi fl = { .oif = ipc.oif,
    - .nl_u = { .ip4_u =
    - { .daddr = faddr,
    - .saddr = saddr,
    - .tos = tos } },
    - .proto = IPPROTO_UDP,
    - .uli_u = { .ports =
    - { .sport = sk->sport,
    - .dport = dport
  • From Ola Lundqvist@1:229/2 to Helmut Toplitzer on Fri Aug 13 13:30:15 2004
    From: [email protected]

    Thanks. Use that now. Will upload very soon.

    Regards,

    // Ola

    On Fri, Aug 13, 2004 at 11:53:50AM +0200, Helmut Toplitzer wrote:

    Fixes at least the annoying compiler error message
    with gcc 2.95.4 :-)

    --------------------------------------------------------------
    --- net/ipv4/udp.c.orig Fri Aug 13 11:29:50 2004
    +++ net/ipv4/udp.c Fri Aug 13 11:50:33 2004
    @@ -495,6 +495,7 @@
    struct udp_opt *up = udp_sk(sk);
    int ulen = len;
    struct ipcm_cookie ipc;
    + struct flowi fl;
    struct rtable *rt = NULL;
    int free = 0;
    int connected = 0;
    @@ -619,16 +620,14 @@
    saddr = ipv4root;
    }
    }
    - struct flowi fl = { .oif = ipc.oif,
    - .nl_u = { .ip4_u =
    - { .daddr = faddr,
    - .saddr = saddr,
    - .tos = tos } },
    - .proto = IPPROTO_UDP,
    - .uli_u = { .ports =
    - { .sport = sk->sport,
    - .dport = dport } } };
    - err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
    + fl.oif = ipc.oif;
    + fl.nl_u.ip4_u.daddr = faddr;
    + fl.nl_u.ip4_u.saddr = saddr;
    + fl.nl_u.ip4_u.tos = tos;
    + fl.proto = IPPROTO_UDP;
    + fl.uli_u.ports.sport = sk->sport;
    + fl.uli_u.ports.dport = dport;
    + err = ip_route_output_flow(&rt, &fl, sk, !(msg->msg_flags&MSG_DONTWAIT));
    if (err)
    goto out;

    -----------------------------------------------------

    --
    My GnuPG-Key-Fingerprint (http://gnupg.org)
    0CA7 1562 CEF0 56B4 09E6 1A6C AB4D 56AB 072D AC4A


    --
    --------------------- Ola Lundqvist ---------------------------
    / [email protected] Annebergsslingan 37 \
    | [email protected] 654 65 KARLSTAD |
    | +46 (0)54-10 14 30 +46 (0)70-332 1551 |
    | http://www.opal.dhs.org UIN/icq: 4912500 |
    \ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 /
    ---------------------------------------------------------------


    --
    To UNSUBSCRIBE, email to [email protected]
    with a subject of "unsubscribe". Trouble? Contact [email protected]

    --- SoupGate-Win32 v1.05
    * Origin: you cannot sedate... all the things you hate (1:229/2)