This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Net - fix compile error
- From: Gary Thomas <gary at chez-thomas dot org>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 31 Jul 2002 06:26:59 -0600
- Subject: Net - fix compile error
Index: io/eth/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/io/eth/current/ChangeLog,v
retrieving revision 1.35
diff -u -5 -p -r1.35 ChangeLog
--- io/eth/current/ChangeLog 26 Jul 2002 15:00:51 -0000 1.35
+++ io/eth/current/ChangeLog 31 Jul 2002 12:25:14 -0000
@@ -1,5 +1,10 @@
+2002-07-31 Gary Thomas <gary@chez-thomas.org>
+
+ * src/net/eth_drv.c (eth_drv_start): Fix compile error when
+ built with old stack (no multicast) - introduced below.
+
2002-07-26 Gary Thomas <gary@chez-thomas.org>
2002-07-26 Ken Cox <jkc@redhat.com>
* src/net/eth_drv.c (eth_drv_start): Force multicast address
setup any time chip is reset/reconfigured.
Index: io/eth/current/src/net/eth_drv.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/io/eth/current/src/net/eth_drv.c,v
retrieving revision 1.23
diff -u -5 -p -r1.23 eth_drv.c
--- io/eth/current/src/net/eth_drv.c 26 Jul 2002 15:00:52 -0000 1.23
+++ io/eth/current/src/net/eth_drv.c 31 Jul 2002 12:24:36 -0000
@@ -7,10 +7,11 @@
//==========================================================================
//####ECOSGPLCOPYRIGHTBEGIN####
// -------------------------------------------
// This file is part of eCos, the Embedded Configurable Operating System.
// Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
+// Copyright (C) 2002 Gary Thomas
//
// eCos is free software; you can redistribute it and/or modify it under
// the terms of the GNU General Public License as published by the Free
// Software Foundation; either version 2 or (at your option) any later version.
//
@@ -408,19 +409,21 @@ eth_drv_stop(struct eth_drv_sc *sc)
//
static void
eth_drv_start(struct eth_drv_sc *sc)
{
struct ifnet *ifp = &sc->sc_arpcom.ac_if;
- int s;
+
// Perform any hardware initialization
(sc->funs->start)(sc, (unsigned char *)&sc->sc_arpcom.ac_enaddr, 0);
+#ifdef CYGPKG_NET_FREEBSD_STACK
// resend multicast addresses if present
if(ifp->if_multiaddrs.lh_first && ifp->if_ioctl) {
- s = splimp();
+ int s = splimp();
ifp->if_ioctl(ifp, SIOCADDMULTI, 0);
splx(s);
}
+#endif
// Set 'running' flag, and clear output active flag.
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
sc->state |= ETH_DRV_STATE_ACTIVE;
eth_drv_send(ifp); // Try and start up transmit