Date: Sun, 30 Oct 2011 08:10:13 GMT From: Hooman Fazaeli <hoomanfazaeli@gmail.com> To: freebsd-net@FreeBSD.org Subject: Re: kern/162028: [ixgbe] [patch] misplaced #endif in ixgbe.c Message-ID: <201110300810.p9U8ADgu010761@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR kern/162028; it has been noted by GNATS.
From: Hooman Fazaeli <hoomanfazaeli@gmail.com>
To: Sergey Kandaurov <pluknet@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: kern/162028: [ixgbe] [patch] misplaced #endif in ixgbe.c
Date: Sun, 30 Oct 2011 11:03:44 +0330
On 10/29/2011 4:28 PM, Sergey Kandaurov wrote:
> I have a more complete patch. Can you test it please?
>
> Index: sys/dev/ixgbe/ixgbe.c
> ===================================================================
> --- sys/dev/ixgbe/ixgbe.c (revision 226068)
> +++ sys/dev/ixgbe/ixgbe.c (working copy)
> @@ -867,16 +867,15 @@ static int
> ixgbe_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
> {
> struct adapter *adapter = ifp->if_softc;
> - struct ifreq *ifr = (struct ifreq *) data;
> + struct ifreq *ifr = (struct ifreq *)data;
> #if defined(INET) || defined(INET6)
> - struct ifaddr *ifa = (struct ifaddr *)data;
> - bool avoid_reset = FALSE;
> + struct ifaddr *ifa = (struct ifaddr *)data;
> #endif
> - int error = 0;
> + bool avoid_reset = FALSE;
> + int error = 0;
>
> switch (command) {
> -
> - case SIOCSIFADDR:
> + case SIOCSIFADDR:
> #ifdef INET
> if (ifa->ifa_addr->sa_family == AF_INET)
> avoid_reset = TRUE;
> @@ -885,7 +884,6 @@ ixgbe_ioctl(struct ifnet * ifp, u_long command, ca
> if (ifa->ifa_addr->sa_family == AF_INET6)
> avoid_reset = TRUE;
> #endif
> -#if defined(INET) || defined(INET6)
> /*
> ** Calling init results in link renegotiation,
> ** so we avoid doing it when possible.
> @@ -894,12 +892,13 @@ ixgbe_ioctl(struct ifnet * ifp, u_long command, ca
> ifp->if_flags |= IFF_UP;
> if (!(ifp->if_drv_flags& IFF_DRV_RUNNING))
> ixgbe_init(adapter);
> +#ifdef INET
> if (!(ifp->if_flags& IFF_NOARP))
> arp_ifinit(ifp, ifa);
> +#endif
> } else
> error = ether_ioctl(ifp, command, data);
> break;
> -#endif
> case SIOCSIFMTU:
> IOCTL_DEBUGOUT("ioctl: SIOCSIFMTU (Set Interface MTU)");
> if (ifr->ifr_mtu> IXGBE_MAX_FRAME_SIZE - ETHER_HDR_LEN) {
>
>
sure.
I am very busy right now.
Will test as soon as I can.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110300810.p9U8ADgu010761>