From 3340ebea4c50cdc3874e5352b10def05f04bef06 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Thu, 29 Nov 2018 20:58:30 +0100 Subject: [PATCH] emulex_oce: fix gcc2 build. --- src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c | 3 ++- .../kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c index 365b6c71be..bb5f12f2a7 100644 --- a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c +++ b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_if.c @@ -2256,8 +2256,9 @@ oce_check_ipv6_ext_hdr(struct mbuf *m) caddr_t m_datatemp = m->m_data; if (eh->ether_type == htons(ETHERTYPE_IPV6)) { + struct ip6_hdr *ip6; m->m_data += sizeof(struct ether_header); - struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); + ip6 = mtod(m, struct ip6_hdr *); if((ip6->ip6_nxt != IPPROTO_TCP) && \ (ip6->ip6_nxt != IPPROTO_UDP)){ diff --git a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c index cb2ae81a01..73bd702988 100644 --- a/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c +++ b/src/add-ons/kernel/drivers/network/emulex_oce/dev/oce/oce_mbox.c @@ -119,8 +119,8 @@ oce_fw_clean(POCE_SOFTC sc) static int oce_mbox_wait(POCE_SOFTC sc, uint32_t tmo_sec) { - tmo_sec *= 10000; pd_mpu_mbox_db_t mbox_db; + tmo_sec *= 10000; for (;;) { if (tmo_sec != 0) {