net: net subsystem ops cleanup

index c45c94b..6463a08 100644
@@ -284,7 +284,7 @@ int board_eth_init(bd_t *bis)
 
 	/* provide the resulting addr to the driver */
 	memcpy(dev->enetaddr, mac_addr, 6);
-	dev->write_hwaddr(dev);
+	dev->eo->write_hwaddr(dev);
 
 	return 0;
 }

index 7c6e362..27b66dd 100644
@@ -2023,10 +2023,10 @@ int ppc_4xx_eth_initialize (bd_t * bis)
 
 		sprintf (dev->name, "ppc_4xx_eth%d", eth_num - CONFIG_EMAC_NR_START);
 		dev->priv = (void *) hw;
-		dev->init = ppc_4xx_eth_init;
-		dev->halt = ppc_4xx_eth_halt;
-		dev->send = ppc_4xx_eth_send;
-		dev->recv = ppc_4xx_eth_rx;
+		dev->eo->init = ppc_4xx_eth_init;
+		dev->eo->halt = ppc_4xx_eth_halt;
+		dev->eo->send = ppc_4xx_eth_send;
+		dev->eo->recv = ppc_4xx_eth_rx;
 
 		eth_register(dev);
 

index de517f8..ee1a1f6 100644
@@ -951,11 +951,11 @@ int altera_tse_initialize(u8 dev_num, int mac_base,
 
 	/* init eth structure */
 	dev->priv = priv;
-	dev->init = tse_eth_init;
-	dev->halt = tse_eth_halt;
-	dev->send = tse_eth_send;
-	dev->recv = tse_eth_rx;
-	dev->write_hwaddr = tse_set_mac_address;
+	dev->eo->init = tse_eth_init;
+	dev->eo->halt = tse_eth_halt;
+	dev->eo->send = tse_eth_send;
+	dev->eo->recv = tse_eth_rx;
+	dev->eo->write_hwaddr = tse_set_mac_address;
 	sprintf(dev->name, "%s-%hu", "ALTERA_TSE", dev_num);
 
 	eth_register(dev);

index ed7cf20..f256381 100644
@@ -718,10 +718,10 @@ int armada100_fec_register(unsigned long base_addr)
 	/* must be less than sizeof(dev->name) */
 	strcpy(dev->name, "armd-fec0");
 
-	dev->init = armdfec_init;
-	dev->halt = armdfec_halt;
-	dev->send = armdfec_send;
-	dev->recv = armdfec_recv;
+	dev->eo->init = armdfec_init;
+	dev->eo->halt = armdfec_halt;
+	dev->eo->send = armdfec_send;
+	dev->eo->recv = armdfec_recv;
 
 	eth_register(dev);
 

index 2fa6b68..3395dcc 100644
@@ -518,11 +518,11 @@ int at91emac_register(bd_t *bis, unsigned long iobase)
 	sprintf(dev->name, "emac");
 	dev->iobase = iobase;
 	dev->priv = emacfix;
-	dev->init = at91emac_init;
-	dev->halt = at91emac_halt;
-	dev->send = at91emac_send;
-	dev->recv = at91emac_recv;
-	dev->write_hwaddr = at91emac_write_hwaddr;
+	dev->eo->init = at91emac_init;
+	dev->eo->halt = at91emac_halt;
+	dev->eo->send = at91emac_send;
+	dev->eo->recv = at91emac_recv;
+	dev->eo->write_hwaddr = at91emac_write_hwaddr;
 
 	eth_register(dev);
 

index f501768..464f261 100644
@@ -725,10 +725,10 @@ int ax88180_initialize (bd_t * bis)
 	sprintf (dev->name, "ax88180");
 	dev->iobase = AX88180_BASE;
 	dev->priv = priv;
-	dev->init = ax88180_init;
-	dev->halt = ax88180_halt;
-	dev->send = ax88180_send;
-	dev->recv = ax88180_recv;
+	dev->eo->init = ax88180_init;
+	dev->eo->halt = ax88180_halt;
+	dev->eo->send = ax88180_send;
+	dev->eo->recv = ax88180_recv;
 
 	priv->BusWidth = BUS_WIDTH_32;
 	priv->PadSize = 3;

index c63398e..ef4736f 100644
@@ -103,11 +103,11 @@ int bfin_EMAC_initialize(bd_t *bis)
 
 	dev->iobase = 0;
 	dev->priv = 0;
-	dev->init = bfin_EMAC_init;
-	dev->halt = bfin_EMAC_halt;
-	dev->send = bfin_EMAC_send;
-	dev->recv = bfin_EMAC_recv;
-	dev->write_hwaddr = bfin_EMAC_setup_addr;
+	dev->eo->init = bfin_EMAC_init;
+	dev->eo->halt = bfin_EMAC_halt;
+	dev->eo->send = bfin_EMAC_send;
+	dev->eo->recv = bfin_EMAC_recv;
+	dev->eo->write_hwaddr = bfin_EMAC_setup_addr;
 
 	eth_register(dev);
 

index e3553d6..2346feb 100644
@@ -543,10 +543,10 @@ int calxedaxgmac_initialize(u32 id, ulong base_addr)
 	macaddr[0] = readl(&regs->macaddr[0].lo);
 	memcpy(dev->enetaddr, macaddr, 6);
 
-	dev->init = xgmac_init;
-	dev->send = xgmac_tx;
-	dev->recv = xgmac_rx;
-	dev->halt = xgmac_halt;
+	dev->eo->init = xgmac_init;
+	dev->eo->send = xgmac_tx;
+	dev->eo->recv = xgmac_rx;
+	dev->eo->halt = xgmac_halt;
 
 	eth_register(dev);
 

index af3d859..0a88bc0 100644
@@ -974,11 +974,11 @@ int cpsw_register(struct cpsw_platform_data *data)
 
 	strcpy(dev->name, "cpsw");
 	dev->iobase	= 0;
-	dev->init	= cpsw_init;
-	dev->halt	= cpsw_halt;
-	dev->send	= cpsw_send;
-	dev->recv	= cpsw_recv;
-	dev->priv	= priv;
+	dev->eo->init	= cpsw_init;
+	dev->eo->halt	= cpsw_halt;
+	dev->eo->send	= cpsw_send;
+	dev->eo->recv	= cpsw_recv;
+	dev->eo->priv	= priv;
 
 	eth_register(dev);
 

index 6aaa0cf..65a4254 100644
@@ -320,10 +320,10 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 
 	dev->iobase = base_addr;
 	dev->priv = priv;
-	dev->init = cs8900_init;
-	dev->halt = cs8900_halt;
-	dev->send = cs8900_send;
-	dev->recv = cs8900_recv;
+	dev->eo->init = cs8900_init;
+	dev->eo->halt = cs8900_halt;
+	dev->eo->send = cs8900_send;
+	dev->eo->recv = cs8900_recv;
 
 	/* Load MAC address from EEPROM */
 	cs8900_get_enetaddr(dev);

index 1db586d..a221092 100644
@@ -791,11 +791,11 @@ int davinci_emac_initialize(void)
 	sprintf(dev->name, "DaVinci-EMAC");
 
 	dev->iobase = 0;
-	dev->init = davinci_eth_open;
-	dev->halt = davinci_eth_close;
-	dev->send = davinci_eth_send_packet;
-	dev->recv = davinci_eth_rcv_packet;
-	dev->write_hwaddr = davinci_eth_set_mac_addr;
+	dev->eo->init = davinci_eth_open;
+	dev->eo->halt = davinci_eth_close;
+	dev->eo->send = davinci_eth_send_packet;
+	dev->eo->recv = davinci_eth_rcv_packet;
+	dev->eo->write_hwaddr = davinci_eth_set_mac_addr;
 
 	eth_register(dev);
 

index d9fcb5a..0361699 100644
@@ -300,10 +300,10 @@ int dc21x4x_initialize(bd_t *bis)
 		dev->iobase = pci_mem_to_phys(devbusfn, iobase);
 #endif
 		dev->priv   = (void*) devbusfn;
-		dev->init   = dc21x4x_init;
-		dev->halt   = dc21x4x_halt;
-		dev->send   = dc21x4x_send;
-		dev->recv   = dc21x4x_recv;
+		dev->eo->init   = dc21x4x_init;
+		dev->eo->halt   = dc21x4x_halt;
+		dev->eo->send   = dc21x4x_send;
+		dev->eo->recv   = dc21x4x_recv;
 
 		/* Ensure we're not sleeping. */
 		pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP);

index bf21a08..2d92591 100644
@@ -559,11 +559,11 @@ int designware_initialize(u32 id, ulong base_addr, u32 phy_addr, u32 interface)
 	priv->phy_configured = 0;
 	priv->interface = interface;
 
-	dev->init = dw_eth_init;
-	dev->send = dw_eth_send;
-	dev->recv = dw_eth_recv;
-	dev->halt = dw_eth_halt;
-	dev->write_hwaddr = dw_write_hwaddr;
+	dev->eo->init = dw_eth_init;
+	dev->eo->send = dw_eth_send;
+	dev->eo->recv = dw_eth_recv;
+	dev->eo->halt = dw_eth_halt;
+	dev->eo->write_hwaddr = dw_write_hwaddr;
 
 	eth_register(dev);
 

index f0c4499..bd96948 100644
@@ -630,10 +630,10 @@ int dm9000_initialize(bd_t *bis)
 	/* Load MAC address from EEPROM */
 	dm9000_get_enetaddr(dev);
 
-	dev->init = dm9000_init;
-	dev->halt = dm9000_halt;
-	dev->send = dm9000_send;
-	dev->recv = dm9000_rx;
+	dev->eo->init = dm9000_init;
+	dev->eo->halt = dm9000_halt;
+	dev->eo->send = dm9000_send;
+	dev->eo->recv = dm9000_rx;
 	sprintf(dev->name, "dm9000");
 
 	eth_register(dev);

index 944a0c0..be0891f 100644
@@ -374,13 +374,13 @@ int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr)
 	dnet->phy_addr = phy_addr;
 
 	sprintf(netdev->name, "dnet%d", id);
-	netdev->init = dnet_init;
-	netdev->halt = dnet_halt;
-	netdev->send = dnet_send;
-	netdev->recv = dnet_recv;
+	netdev->eo->init = dnet_init;
+	netdev->eo->halt = dnet_halt;
+	netdev->eo->send = dnet_send;
+	netdev->eo->recv = dnet_recv;
 
 	dev_capa = readl(&dnet->regs->VERCAPS) & 0xFFFF;
-	debug("%s: has %smdio, %sirq, %sgigabit, %sdma \n", netdev->name,
+	debug("%s: has %smdio, %sirq, %sgigabit, %sdma\n", netdev->name,
 		(dev_capa & DNET_HAS_MDIO) ? "" : "no ",
 		(dev_capa & DNET_HAS_IRQ) ? "" : "no ",
 		(dev_capa & DNET_HAS_GIGABIT) ? "" : "no ",

index 2d4da4b..c9f9fb3 100644
@@ -5218,10 +5218,10 @@ e1000_initialize(bd_t * bis)
 		       nic->enetaddr[3], nic->enetaddr[4], nic->enetaddr[5]);
 
 		/* Set up the function pointers and register the device */
-		nic->init = e1000_init;
-		nic->recv = e1000_poll;
-		nic->send = e1000_transmit;
-		nic->halt = e1000_disable;
+		nic->eo->init = e1000_init;
+		nic->eo->recv = e1000_poll;
+		nic->eo->send = e1000_transmit;
+		nic->eo->halt = e1000_disable;
 		eth_register(nic);
 	}
 

index d2c8277..e3aa720 100644
@@ -458,10 +458,10 @@ int eepro100_initialize (bd_t * bis)
 		sprintf (dev->name, "i82559#%d", card_number);
 		dev->priv = (void *) devno; /* this have to come before bus_to_phys() */
 		dev->iobase = bus_to_phys (iobase);
-		dev->init = eepro100_init;
-		dev->halt = eepro100_halt;
-		dev->send = eepro100_send;
-		dev->recv = eepro100_recv;
+		dev->eo->init = eepro100_init;
+		dev->eo->halt = eepro100_halt;
+		dev->eo->send = eepro100_send;
+		dev->eo->recv = eepro100_recv;
 
 		eth_register (dev);
 

index c55667c..95f0b93 100644
@@ -962,11 +962,11 @@ int enc28j60_initialize(unsigned int bus, unsigned int cs,
 	enc->dev = dev;
 	/* now fill the eth_device object */
 	dev->priv = enc;
-	dev->init = enc_init;
-	dev->halt = enc_halt;
-	dev->send = enc_send;
-	dev->recv = enc_recv;
-	dev->write_hwaddr = enc_write_hwaddr;
+	dev->eo->init = enc_init;
+	dev->eo->halt = enc_halt;
+	dev->eo->send = enc_send;
+	dev->eo->recv = enc_recv;
+	dev->eo->write_hwaddr = enc_write_hwaddr;
 	sprintf(dev->name, "enc%i.%i", bus, cs);
 	eth_register(dev);
 #if defined(CONFIG_CMD_MII)

index 245ad1c..0b5cb3c 100644
@@ -499,10 +499,10 @@ int ep93xx_eth_initialize(u8 dev_num, int base_addr)
 
 	dev->iobase = base_addr;
 	dev->priv = priv;
-	dev->init = ep93xx_eth_open;
-	dev->halt = ep93xx_eth_close;
-	dev->send = ep93xx_eth_send_packet;
-	dev->recv = ep93xx_eth_rcv_packet;
+	dev->eo->init = ep93xx_eth_open;
+	dev->eo->halt = ep93xx_eth_close;
+	dev->eo->send = ep93xx_eth_send_packet;
+	dev->eo->recv = ep93xx_eth_rcv_packet;
 
 	sprintf(dev->name, "ep93xx_eth-%hu", dev_num);
 

index af06d4f..946b8e2 100644
@@ -499,11 +499,11 @@ int ethoc_initialize(u8 dev_num, int base_addr)
 	memset(dev, 0, sizeof(*dev));
 	dev->priv = priv;
 	dev->iobase = base_addr;
-	dev->init = ethoc_init;
-	dev->halt = ethoc_halt;
-	dev->send = ethoc_send;
-	dev->recv = ethoc_recv;
-	dev->write_hwaddr = ethoc_set_mac_address;
+	dev->eo->init = ethoc_init;
+	dev->eo->halt = ethoc_halt;
+	dev->eo->send = ethoc_send;
+	dev->eo->recv = ethoc_recv;
+	dev->eo->write_hwaddr = ethoc_set_mac_address;
 	sprintf(dev->name, "%s-%hu", "ETHOC", dev_num);
 
 	eth_register(dev);

index 3e232c7..f8a5556 100644
@@ -943,11 +943,11 @@ static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
 	memset(fec, 0, sizeof(*fec));
 
 	edev->priv = fec;
-	edev->init = fec_init;
-	edev->send = fec_send;
-	edev->recv = fec_recv;
-	edev->halt = fec_halt;
-	edev->write_hwaddr = fec_set_hwaddr;
+	edev->eo->init = fec_init;
+	edev->eo->send = fec_send;
+	edev->eo->recv = fec_recv;
+	edev->eo->halt = fec_halt;
+	edev->eo->write_hwaddr = fec_set_hwaddr;
 
 	fec->eth = (struct ethernet_regs *)base_addr;
 	fec->bd = bd;

index 2b616ad..8d881d4 100644
@@ -653,10 +653,10 @@ int fm_eth_initialize(struct ccsr_fman *reg, struct fm_eth_info *info)
 	devlist[num_controllers++] = dev;
 	dev->iobase = 0;
 	dev->priv = (void *)fm_eth;
-	dev->init = fm_eth_open;
-	dev->halt = fm_eth_halt;
-	dev->send = fm_eth_send;
-	dev->recv = fm_eth_recv;
+	dev->eo->init = fm_eth_open;
+	dev->eo->halt = fm_eth_halt;
+	dev->eo->send = fm_eth_send;
+	dev->eo->recv = fm_eth_recv;
 	fm_eth->dev = dev;
 	fm_eth->bus = info->bus;
 	fm_eth->phyaddr = info->phy_addr;

index 63842cd..2e70d22 100644
@@ -533,10 +533,10 @@ int mcdmafec_initialize(bd_t * bis)
 		sprintf(dev->name, "FEC%d", fec_info[i].index);
 
 		dev->priv = &fec_info[i];
-		dev->init = fec_init;
-		dev->halt = fec_halt;
-		dev->send = fec_send;
-		dev->recv = fec_recv;
+		dev->eo->init = fec_init;
+		dev->eo->halt = fec_halt;
+		dev->eo->send = fec_send;
+		dev->eo->recv = fec_recv;
 
 		/* setup Receive and Transmit buffer descriptor */
 #ifdef CONFIG_SYS_DMA_USE_INTSRAM

index 69ba57d..76391c1 100644
@@ -548,10 +548,10 @@ int ftgmac100_initialize(bd_t *bd)
 
 	sprintf(dev->name, "FTGMAC100");
 	dev->iobase	= CONFIG_FTGMAC100_BASE;
-	dev->init	= ftgmac100_init;
-	dev->halt	= ftgmac100_halt;
-	dev->send	= ftgmac100_send;
-	dev->recv	= ftgmac100_recv;
+	dev->eo->init	= ftgmac100_init;
+	dev->eo->halt	= ftgmac100_halt;
+	dev->eo->send	= ftgmac100_send;
+	dev->eo->recv	= ftgmac100_recv;
 	dev->priv	= priv;
 
 	eth_register(dev);

index fdd3ec0..6fd2bde 100644
@@ -260,10 +260,10 @@ int ftmac100_initialize (bd_t *bd)
 
 	sprintf (dev->name, "FTMAC100");
 	dev->iobase	= CONFIG_FTMAC100_BASE;
-	dev->init	= ftmac100_init;
-	dev->halt	= ftmac100_halt;
-	dev->send	= ftmac100_send;
-	dev->recv	= ftmac100_recv;
+	dev->eo->init	= ftmac100_init;
+	dev->eo->halt	= ftmac100_halt;
+	dev->eo->send	= ftmac100_send;
+	dev->eo->recv	= ftmac100_recv;
 	dev->priv	= priv;
 
 	eth_register (dev);

index 3103a74..150dccf 100644
@@ -623,10 +623,10 @@ int greth_initialize(bd_t * bis)
 	debug("Found GRETH at %p, irq %d\n", greth->regs, greth->irq);
 	dev->priv = (void *)greth;
 	dev->iobase = (unsigned int)greth->regs;
-	dev->init = greth_init;
-	dev->halt = greth_halt;
-	dev->send = greth_send;
-	dev->recv = greth_recv;
+	dev->eo->init = greth_init;
+	dev->eo->halt = greth_halt;
+	dev->eo->send = greth_send;
+	dev->eo->recv = greth_recv;
 	greth->dev = dev;
 
 	/* Reset Core */

index f0f62de..216122d 100644
@@ -189,10 +189,10 @@ int inca_switch_initialize(bd_t * bis)
 #endif
 
 	sprintf(dev->name, "INCA-IP Switch");
-	dev->init = inca_switch_init;
-	dev->halt = inca_switch_halt;
-	dev->send = inca_switch_send;
-	dev->recv = inca_switch_recv;
+	dev->eo->init = inca_switch_init;
+	dev->eo->halt = inca_switch_halt;
+	dev->eo->send = inca_switch_send;
+	dev->eo->recv = inca_switch_recv;
 
 	eth_register(dev);
 

index b4904b6..b0703ef 100644
@@ -230,10 +230,10 @@ int ks8695_eth_initialize(void)
 	memset(dev, 0, sizeof(*dev));
 
 	dev->iobase = KS8695_IO_BASE + KS8695_LAN_DMA_TX;
-	dev->init = ks8695_eth_init;
-	dev->halt = ks8695_eth_halt;
-	dev->send = ks8695_eth_send;
-	dev->recv = ks8695_eth_recv;
+	dev->eo->init = ks8695_eth_init;
+	dev->eo->halt = ks8695_eth_halt;
+	dev->eo->send = ks8695_eth_send;
+	dev->eo->recv = ks8695_eth_recv;
 	strcpy(dev->name, "ks8695eth");
 
 	eth_register(dev);

index 11d350e..d87302b 100644
@@ -806,10 +806,10 @@ int lan91c96_initialize(u8 dev_num, int base_addr)
 	}
 	get_rom_mac(dev, dev->enetaddr);
 
-	dev->init = lan91c96_init;
-	dev->halt = lan91c96_halt;
-	dev->send = lan91c96_send;
-	dev->recv = lan91c96_recv;
+	dev->eo->init = lan91c96_init;
+	dev->eo->halt = lan91c96_halt;
+	dev->eo->send = lan91c96_send;
+	dev->eo->recv = lan91c96_recv;
 	sprintf(dev->name, "%s-%hu", supported_chips[r].name, dev_num);
 
 	eth_register(dev);

index 0e1ced7..2c53902 100644
@@ -558,11 +558,11 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)
 	macb->phy_addr = phy_addr;
 
 	sprintf(netdev->name, "macb%d", id);
-	netdev->init = macb_init;
-	netdev->halt = macb_halt;
-	netdev->send = macb_send;
-	netdev->recv = macb_recv;
-	netdev->write_hwaddr = macb_write_hwaddr;
+	netdev->eo->init = macb_init;
+	netdev->eo->halt = macb_halt;
+	netdev->eo->send = macb_send;
+	netdev->eo->recv = macb_recv;
+	netdev->eo->write_hwaddr = macb_write_hwaddr;
 
 	/*
 	 * Do some basic initialization so that we at least can talk

index ed7459c..0aeb24e 100644
@@ -572,10 +572,10 @@ int mcffec_initialize(bd_t * bis)
 		sprintf(dev->name, "FEC%d", fec_info[i].index);
 
 		dev->priv = &fec_info[i];
-		dev->init = fec_init;
-		dev->halt = fec_halt;
-		dev->send = fec_send;
-		dev->recv = fec_recv;
+		dev->eo->init = fec_init;
+		dev->eo->halt = fec_halt;
+		dev->eo->send = fec_send;
+		dev->eo->recv = fec_recv;
 
 		/* setup Receive and Transmit buffer descriptor */
 #ifdef CONFIG_SYS_FEC_BUF_USE_SRAM

index ad57d56..4aa3b28 100644
@@ -629,10 +629,10 @@ int mpc512x_fec_initialize (bd_t * bis)
 # endif
 	dev->priv = (void *)fec;
 	dev->iobase = (int)&im->fec;
-	dev->init = mpc512x_fec_init;
-	dev->halt = mpc512x_fec_halt;
-	dev->send = mpc512x_fec_send;
-	dev->recv = mpc512x_fec_recv;
+	dev->eo->init = mpc512x_fec_init;
+	dev->eo->halt = mpc512x_fec_halt;
+	dev->eo->send = mpc512x_fec_send;
+	dev->eo->recv = mpc512x_fec_recv;
 
 	sprintf (dev->name, "FEC");
 	eth_register (dev);

index 3d180db..73503da 100644
@@ -915,10 +915,10 @@ int mpc5xxx_fec_initialize(bd_t * bis)
 
 	dev->priv = (void *)fec;
 	dev->iobase = MPC5XXX_FEC;
-	dev->init = mpc5xxx_fec_init;
-	dev->halt = mpc5xxx_fec_halt;
-	dev->send = mpc5xxx_fec_send;
-	dev->recv = mpc5xxx_fec_recv;
+	dev->eo->init = mpc5xxx_fec_init;
+	dev->eo->halt = mpc5xxx_fec_halt;
+	dev->eo->send = mpc5xxx_fec_send;
+	dev->eo->recv = mpc5xxx_fec_recv;
 
 	sprintf(dev->name, "FEC");
 	eth_register(dev);

index 47bf27c..6ddb6d6 100644
@@ -721,11 +721,11 @@ error1:
 			return -1;
 		}
 
-		dev->init = (void *)mvgbe_init;
-		dev->halt = (void *)mvgbe_halt;
-		dev->send = (void *)mvgbe_send;
-		dev->recv = (void *)mvgbe_recv;
-		dev->write_hwaddr = (void *)mvgbe_write_hwaddr;
+		dev->eo->init = (void *)mvgbe_init;
+		dev->eo->halt = (void *)mvgbe_halt;
+		dev->eo->send = (void *)mvgbe_send;
+		dev->eo->recv = (void *)mvgbe_recv;
+		dev->eo->write_hwaddr = (void *)mvgbe_write_hwaddr;
 
 		eth_register(dev);
 

index 04743bd..4288d1f 100644
@@ -332,10 +332,10 @@ natsemi_initialize(bd_t * bis)
 		printf("natsemi: NatSemi ns8381[56] @ %#x\n", dev->iobase);
 #endif
 		dev->priv = (void *) devno;
-		dev->init = natsemi_init;
-		dev->halt = natsemi_disable;
-		dev->send = natsemi_send;
-		dev->recv = natsemi_poll;
+		dev->eo->init = natsemi_init;
+		dev->eo->halt = natsemi_disable;
+		dev->eo->send = natsemi_send;
+		dev->eo->recv = natsemi_poll;
 
 		eth_register(dev);
 

index ef35922..2cc9743 100644
@@ -789,10 +789,10 @@ int ne2k_register(void)
 	if (ne2k_setup_driver(dev))
 		return -1;
 
-	dev->init = ne2k_init;
-	dev->halt = ne2k_halt;
-	dev->send = ne2k_send;
-	dev->recv = ne2k_recv;
+	dev->eo->init = ne2k_init;
+	dev->eo->halt = ne2k_halt;
+	dev->eo->send = ne2k_send;
+	dev->eo->recv = ne2k_recv;
 
 	sprintf(dev->name, "NE2000");
 

index 1fe3a95..d376c21 100644
@@ -625,10 +625,10 @@ int npe_initialize(bd_t * bis)
 
 		sprintf(dev->name, "NPE%d", eth_num);
 		dev->priv = (void *)p_npe;
-		dev->init = npe_init;
-		dev->halt = npe_halt;
-		dev->send = npe_send;
-		dev->recv = npe_rx;
+		dev->eo->init = npe_init;
+		dev->eo->halt = npe_halt;
+		dev->eo->send = npe_send;
+		dev->eo->recv = npe_rx;
 
 		p_npe->print_speed = 1;
 

index cfe1f34..8b08e0b 100644
@@ -346,10 +346,10 @@ ns8382x_initialize(bd_t * bis)
 		sprintf(dev->name, "dp8382x#%d", card_number);
 		dev->iobase = bus_to_phys(iobase);
 		dev->priv = (void *) devno;
-		dev->init = ns8382x_init;
-		dev->halt = ns8382x_disable;
-		dev->send = ns8382x_send;
-		dev->recv = ns8382x_poll;
+		dev->eo->init = ns8382x_init;
+		dev->eo->halt = ns8382x_disable;
+		dev->eo->send = ns8382x_send;
+		dev->eo->recv = ns8382x_poll;
 
 		/* ns8382x has a non-standard PM control register
 		 * in PCI config space.  Some boards apparently need

index c028a44..35254c3 100644
@@ -218,10 +218,10 @@ int pcnet_initialize (bd_t * bis)
 		/*
 		 * Setup device structure and register the driver.
 		 */
-		dev->init = pcnet_init;
-		dev->halt = pcnet_halt;
-		dev->send = pcnet_send;
-		dev->recv = pcnet_recv;
+		dev->eo->init = pcnet_init;
+		dev->eo->halt = pcnet_halt;
+		dev->eo->send = pcnet_send;
+		dev->eo->recv = pcnet_recv;
 
 		eth_register (dev);
 	}

index 93782c2..d3eb692 100644
@@ -110,10 +110,10 @@ int plb2800_eth_initialize(bd_t * bis)
 	memset(dev, 0, sizeof(*dev));
 
 	sprintf(dev->name, "PLB2800 Switch");
-	dev->init = plb2800_eth_init;
-	dev->halt = plb2800_eth_halt;
-	dev->send = plb2800_eth_send;
-	dev->recv = plb2800_eth_recv;
+	dev->eo->init = plb2800_eth_init;
+	dev->eo->halt = plb2800_eth_halt;
+	dev->eo->send = plb2800_eth_send;
+	dev->eo->recv = plb2800_eth_recv;
 
 	eth_register(dev);
 

index 4186699..ed02cf6 100644
@@ -229,12 +229,12 @@ int rtl8139_initialize(bd_t *bis)
 
 		dev->priv = (void *) devno;
 		dev->iobase = (int)bus_to_phys(iobase);
-		dev->init = rtl8139_probe;
-		dev->halt = rtl_disable;
-		dev->send = rtl_transmit;
-		dev->recv = rtl_poll;
+		dev->eo->init = rtl8139_probe;
+		dev->eo->halt = rtl_disable;
+		dev->eo->send = rtl_transmit;
+		dev->eo->recv = rtl_poll;
 #ifdef CONFIG_MCAST_TFTP
-		dev->mcast = rtl_bcast_addr;
+		dev->eo->mcast = rtl_bcast_addr;
 #endif
 
 		eth_register (dev);

index 9864fd7..c75fd4f 100644
@@ -902,10 +902,10 @@ int rtl8169_initialize(bd_t *bis)
 		dev->priv = (void *) devno;
 		dev->iobase = (int)pci_mem_to_phys(devno, iobase);
 
-		dev->init = rtl_reset;
-		dev->halt = rtl_halt;
-		dev->send = rtl_send;
-		dev->recv = rtl_recv;
+		dev->eo->init = rtl_reset;
+		dev->eo->halt = rtl_halt;
+		dev->eo->send = rtl_send;
+		dev->eo->recv = rtl_recv;
 
 		eth_register (dev);
 

index 2d9cc32..1f8d0c1 100644
@@ -529,10 +529,10 @@ int sh_eth_initialize(bd_t *bd)
 
     dev->priv = (void *)eth;
     dev->iobase = 0;
-    dev->init = sh_eth_init;
-    dev->halt = sh_eth_halt;
-    dev->send = sh_eth_send;
-    dev->recv = sh_eth_recv;
+	dev->eo->init = sh_eth_init;
+	dev->eo->halt = sh_eth_halt;
+	dev->eo->send = sh_eth_send;
+	dev->eo->recv = sh_eth_recv;
     eth->port_info[eth->port].dev = dev;
 
 	sprintf(dev->name, SHETHER_NAME);

index 6dc7ad5..3ea7213 100644
@@ -1357,11 +1357,11 @@ int smc91111_initialize(u8 dev_num, int base_addr)
 		dev->enetaddr[i] = SMC_inb(dev, (ADDR0_REG + i));
 	swap_to(FLASH);
 
-	dev->init = smc_init;
-	dev->halt = smc_halt;
-	dev->send = smc_send;
-	dev->recv = smc_rcv;
-	dev->write_hwaddr = smc_write_hwaddr;
+	dev->eo->init = smc_init;
+	dev->eo->halt = smc_halt;
+	dev->eo->send = smc_send;
+	dev->eo->recv = smc_rcv;
+	dev->eo->write_hwaddr = smc_write_hwaddr;
 	sprintf(dev->name, "%s-%hu", SMC_DEV_NAME, dev_num);
 
 	eth_register(dev);

index b2aed7e..5ba1bdf 100644
@@ -282,10 +282,10 @@ int smc911x_initialize(u8 dev_num, int base_addr)
 		dev->enetaddr[5] = addrh >> 8;
 	}
 
-	dev->init = smc911x_init;
-	dev->halt = smc911x_halt;
-	dev->send = smc911x_send;
-	dev->recv = smc911x_rx;
+	dev->eo->init = smc911x_init;
+	dev->eo->halt = smc911x_halt;
+	dev->eo->send = smc911x_send;
+	dev->eo->recv = smc911x_rx;
 	sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
 
 	eth_register(dev);

index f5e314b..345d563 100644
@@ -638,12 +638,12 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info)
 	priv->bus = miiphy_get_dev_by_name(tsec_info->mii_devname);
 	dev->iobase = 0;
 	dev->priv = priv;
-	dev->init = tsec_init;
-	dev->halt = tsec_halt;
-	dev->send = tsec_send;
-	dev->recv = tsec_recv;
+	dev->eo->init = tsec_init;
+	dev->eo->halt = tsec_halt;
+	dev->eo->send = tsec_send;
+	dev->eo->recv = tsec_recv;
 #ifdef CONFIG_MCAST_TFTP
-	dev->mcast = tsec_mcast_addr;
+	dev->eo->mcast = tsec_mcast_addr;
 #endif
 
 	/* Tell u-boot to get the addr from the env */

index b2c1be5..bed09d5 100644
@@ -739,10 +739,10 @@ int tsi108_eth_initialize (bd_t * bis)
 
 		dev->iobase = ETH_BASE + (index * ETH_PORT_OFFSET);
 		dev->priv = (void *)(phy_address[index]);
-		dev->init = tsi108_eth_probe;
-		dev->halt = tsi108_eth_halt;
-		dev->send = tsi108_eth_send;
-		dev->recv = tsi108_eth_recv;
+		dev->eo->init = tsi108_eth_probe;
+		dev->eo->halt = tsi108_eth_halt;
+		dev->eo->send = tsi108_eth_send;
+		dev->eo->recv = tsi108_eth_recv;
 
 		eth_register(dev);
 	}

index 9648901..33d8b49 100644
@@ -237,10 +237,10 @@ int uli526x_initialize(bd_t *bis)
 		db->pdev = devno;
 		dev->iobase = iobase;
 
-		dev->init = uli526x_init_one;
-		dev->halt = uli526x_disable;
-		dev->send = uli526x_start_xmit;
-		dev->recv = uli526x_rx_packet;
+		dev->eo->init = uli526x_init_one;
+		dev->eo->halt = uli526x_disable;
+		dev->eo->send = uli526x_start_xmit;
+		dev->eo->recv = uli526x_rx_packet;
 
 		/* init db */
 		db->ioaddr = dev->iobase;

index d777144..54a871b 100644
@@ -645,11 +645,11 @@ int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
 	priv->dmatx = (struct axidma_reg *)dma_addr;
 	/* RX channel offset is 0x30 */
 	priv->dmarx = (struct axidma_reg *)(dma_addr + 0x30);
-	dev->init = axiemac_init;
-	dev->halt = axiemac_halt;
-	dev->send = axiemac_send;
-	dev->recv = axiemac_recv;
-	dev->write_hwaddr = axiemac_setup_mac;
+	dev->eo->init = axiemac_init;
+	dev->eo->halt = axiemac_halt;
+	dev->eo->send = axiemac_send;
+	dev->eo->recv = axiemac_recv;
+	dev->eo->write_hwaddr = axiemac_setup_mac;
 
 #ifdef CONFIG_PHY_ADDR
 	priv->phyaddr = CONFIG_PHY_ADDR;

index d890d60..c0fefa7 100644
@@ -369,10 +369,10 @@ int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
 	sprintf(dev->name, "Xelite.%lx", base_addr);
 
 	dev->iobase = base_addr;
-	dev->init = emaclite_init;
-	dev->halt = emaclite_halt;
-	dev->send = emaclite_send;
-	dev->recv = emaclite_recv;
+	dev->eo->init = emaclite_init;
+	dev->eo->halt = emaclite_halt;
+	dev->eo->send = emaclite_send;
+	dev->eo->recv = emaclite_recv;
 
 	eth_register(dev);
 

index b67153b..8f67417 100644
@@ -313,9 +313,9 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 	dev->iobase = devinf->base_addr;
 
 	dev->priv = ll_temac;
-	dev->init = ll_temac_init;
-	dev->halt = ll_temac_halt;
-	dev->write_hwaddr = ll_temac_setup_mac_addr;
+	dev->eo->init = ll_temac_init;
+	dev->eo->halt = ll_temac_halt;
+	dev->eo->write_hwaddr = ll_temac_setup_mac_addr;
 
 	ll_temac->ctrladdr = devinf->ctrl_addr;
 	if (devinf->flags & XILINX_LL_TEMAC_M_SDMA_PLB) {

@@ -334,16 +334,16 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 		ll_temac->ctrlinit = ll_temac_init_sdma;
 		ll_temac->ctrlhalt = ll_temac_halt_sdma;
 		ll_temac->ctrlreset = ll_temac_reset_sdma;
-		dev->recv = ll_temac_recv_sdma;
-		dev->send = ll_temac_send_sdma;
+		dev->eo->recv = ll_temac_recv_sdma;
+		dev->eo->send = ll_temac_send_sdma;
 	} else {
 		ll_temac->in32 = NULL;
 		ll_temac->out32 = NULL;
 		ll_temac->ctrlinit = NULL;
 		ll_temac->ctrlhalt = NULL;
 		ll_temac->ctrlreset = ll_temac_reset_fifo;
-		dev->recv = ll_temac_recv_fifo;
-		dev->send = ll_temac_send_fifo;
+		dev->eo->recv = ll_temac_recv_fifo;
+		dev->eo->send = ll_temac_send_fifo;
 	}
 
 	/* Link to specified MDIO bus */

index 3596065..3cba176 100644
@@ -425,11 +425,11 @@ int zynq_gem_initialize(bd_t *bis, int base_addr)
 
 	dev->iobase = base_addr;
 
-	dev->init = zynq_gem_init;
-	dev->halt = zynq_gem_halt;
-	dev->send = zynq_gem_send;
-	dev->recv = zynq_gem_recv;
-	dev->write_hwaddr = zynq_gem_setup_mac;
+	dev->eo->init = zynq_gem_init;
+	dev->eo->halt = zynq_gem_halt;
+	dev->eo->send = zynq_gem_send;
+	dev->eo->recv = zynq_gem_recv;
+	dev->eo->write_hwaddr = zynq_gem_setup_mac;
 
 	eth_register(dev);
 

index 75ec8f7..f2cea6b 100644
@@ -702,12 +702,12 @@ int asix_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
 		return 0;
 	}
 	sprintf(eth->name, "%s%d", ASIX_BASE_NAME, curr_eth_dev++);
-	eth->init = asix_init;
-	eth->send = asix_send;
-	eth->recv = asix_recv;
-	eth->halt = asix_halt;
+	eth->eo->init = asix_init;
+	eth->eo->send = asix_send;
+	eth->eo->recv = asix_recv;
+	eth->eo->halt = asix_halt;
 	if (!(priv->flags & FLAG_TYPE_AX88172))
-		eth->write_hwaddr = asix_write_hwaddr;
+		eth->eo->write_hwaddr = asix_write_hwaddr;
 	eth->priv = ss;
 
 	if (asix_basic_reset(ss))

index dc5ca65..b8c2f2e 100644
@@ -890,11 +890,11 @@ int smsc95xx_eth_get_info(struct usb_device *dev, struct ueth_data *ss,
 		return 0;
 	}
 	sprintf(eth->name, "%s%d", SMSC95XX_BASE_NAME, curr_eth_dev++);
-	eth->init = smsc95xx_init;
-	eth->send = smsc95xx_send;
-	eth->recv = smsc95xx_recv;
-	eth->halt = smsc95xx_halt;
-	eth->write_hwaddr = smsc95xx_write_hwaddr;
+	eth->eo->init = smsc95xx_init;
+	eth->eo->send = smsc95xx_send;
+	eth->eo->recv = smsc95xx_recv;
+	eth->eo->halt = smsc95xx_halt;
+	eth->eo->write_hwaddr = smsc95xx_write_hwaddr;
 	eth->priv = ss;
 	return 1;
 }

index 3539336..939ad7f 100644
@@ -78,12 +78,9 @@ enum eth_state_t {
 	ETH_STATE_ACTIVE
 };
 
-struct eth_device {
-	char name[16];
-	unsigned char enetaddr[6];
-	int iobase;
-	int state;
+struct eth_device;
 
+struct eth_ops {
 	int  (*init) (struct eth_device *, bd_t *);
 	int  (*send) (struct eth_device *, void *packet, int length);
 	int  (*recv) (struct eth_device *);

@@ -91,7 +88,15 @@ struct eth_device {
 #ifdef CONFIG_MCAST_TFTP
 	int (*mcast) (struct eth_device *, u32 ip, u8 set);
 #endif
-	int  (*write_hwaddr) (struct eth_device *);
+	int (*write_hwaddr) (struct eth_device *);
+};
+
+struct eth_device {
+	char name[16];
+	unsigned char enetaddr[6];
+	int iobase;
+	int state;
+	struct eth_ops *eo;
 	struct eth_device *next;
 	int index;
 	void *priv;

index 321d5b1..1bd1ce6 100644
@@ -217,12 +217,12 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
 			dev->name);
 	}
 
-	if (dev->write_hwaddr &&
+	if (dev->eo->write_hwaddr &&
 			!eth_mac_skip(eth_number)) {
 		if (!is_valid_ether_addr(dev->enetaddr))
 			return -1;
 
-		ret = dev->write_hwaddr(dev);
+		ret = dev->eo->write_hwaddr(dev);
 	}
 
 	return ret;

@@ -363,7 +363,7 @@ int eth_initialize(bd_t *bis)
 int eth_mcast_join(IPaddr_t mcast_ip, u8 join)
 {
 	u8 mcast_mac[6];
-	if (!eth_current || !eth_current->mcast)
+	if (!eth_current || !eth_current->eo->mcast)
 		return -1;
 	mcast_mac[5] = htonl(mcast_ip) & 0xff;
 	mcast_mac[4] = (htonl(mcast_ip)>>8) & 0xff;

@@ -371,7 +371,7 @@ int eth_mcast_join(IPaddr_t mcast_ip, u8 join)
 	mcast_mac[2] = 0x5e;
 	mcast_mac[1] = 0x0;
 	mcast_mac[0] = 0x1;
-	return eth_current->mcast(eth_current, mcast_mac, join);
+	return eth_current->eo->mcast(eth_current, mcast_mac, join);
 }
 
 /* the 'way' for ethernet-CRC-32. Spliced in from Linux lib/crc32.c

@@ -426,7 +426,7 @@ int eth_init(bd_t *bis)
 	do {
 		debug("Trying %s\n", eth_current->name);
 
-		if (eth_current->init(eth_current, bis) >= 0) {
+		if (eth_current->eo->init(eth_current, bis) >= 0) {
 			eth_current->state = ETH_STATE_ACTIVE;
 
 			return 0;

@@ -444,7 +444,7 @@ void eth_halt(void)
 	if (!eth_current)
 		return;
 
-	eth_current->halt(eth_current);
+	eth_current->eo->halt(eth_current);
 
 	eth_current->state = ETH_STATE_PASSIVE;
 }

@@ -454,7 +454,7 @@ int eth_send(void *packet, int length)
 	if (!eth_current)
 		return -1;
 
-	return eth_current->send(eth_current, packet, length);
+	return eth_current->eo->send(eth_current, packet, length);
 }
 
 int eth_rx(void)

@@ -462,7 +462,7 @@ int eth_rx(void)
 	if (!eth_current)
 		return -1;
 
-	return eth_current->recv(eth_current);
+	return eth_current->eo->recv(eth_current);
 }
 
 #ifdef CONFIG_API

index 27b66dd..309e616 100644
@@ -1905,6 +1905,13 @@ static int ppc_4xx_eth_rx (struct eth_device *dev)
 	return length;
 }
 
+static struct eth_ops ppc_4xx_eth_ops = {
+	.init = ppc_4xx_eth_init,
+	.send = ppc_4xx_eth_send,
+	.recv = ppc_4xx_eth_rx,
+	.halt = ppc_4xx_eth_halt
+};
+
 int ppc_4xx_eth_initialize (bd_t * bis)
 {
 	static int virgin = 0;

@@ -2023,10 +2030,7 @@ int ppc_4xx_eth_initialize (bd_t * bis)
 
 		sprintf (dev->name, "ppc_4xx_eth%d", eth_num - CONFIG_EMAC_NR_START);
 		dev->priv = (void *) hw;
-		dev->eo->init = ppc_4xx_eth_init;
-		dev->eo->halt = ppc_4xx_eth_halt;
-		dev->eo->send = ppc_4xx_eth_send;
-		dev->eo->recv = ppc_4xx_eth_rx;
+		dev->eo = &ppc_4xx_eth_ops;
 
 		eth_register(dev);
 

index ee1a1f6..89cd23e 100644
@@ -890,6 +890,14 @@ static int tse_eth_init(struct eth_device *dev, bd_t * bd)
 	return priv->link ? 0 : -1;
 }
 
+static struct eth_ops altera_tse_ops = {
+	.init = tse_eth_init,
+	.halt = tse_eth_halt,
+	.send = tse_eth_send,
+	.recv = tse_eth_rx,
+	.write_hwaddr = tse_set_mac_address
+};
+
 /* TSE init code */
 int altera_tse_initialize(u8 dev_num, int mac_base,
 			  int sgdma_rx_base, int sgdma_tx_base,

@@ -951,11 +959,7 @@ int altera_tse_initialize(u8 dev_num, int mac_base,
 
 	/* init eth structure */
 	dev->priv = priv;
-	dev->eo->init = tse_eth_init;
-	dev->eo->halt = tse_eth_halt;
-	dev->eo->send = tse_eth_send;
-	dev->eo->recv = tse_eth_rx;
-	dev->eo->write_hwaddr = tse_set_mac_address;
+	dev->eo = &altera_tse_ops;
 	sprintf(dev->name, "%s-%hu", "ALTERA_TSE", dev_num);
 
 	eth_register(dev);

index bd96948..f6b226c 100644
@@ -623,6 +623,13 @@ dm9000_phy_write(int reg, u16 value)
 	DM9000_DBG("dm9000_phy_write(reg:0x%x, value:0x%x)\n", reg, value);
 }
 
+static struct eth_ops dm9000_ops = {
+	.init = dm9000_init,
+	.send = dm9000_send,
+	.recv = dm9000_rx,
+	.halt = dm9000_halt
+};
+
 int dm9000_initialize(bd_t *bis)
 {
 	struct eth_device *dev = &(dm9000_info.netdev);

@@ -630,10 +637,7 @@ int dm9000_initialize(bd_t *bis)
 	/* Load MAC address from EEPROM */
 	dm9000_get_enetaddr(dev);
 
-	dev->eo->init = dm9000_init;
-	dev->eo->halt = dm9000_halt;
-	dev->eo->send = dm9000_send;
-	dev->eo->recv = dm9000_rx;
+	dev->eo = &dm9000_ops;
 	sprintf(dev->name, "dm9000");
 
 	eth_register(dev);

index f256381..d826e11 100644
@@ -678,6 +678,13 @@ static int armdfec_recv(struct eth_device *dev)
 	return 0;
 }
 
+static struct eth_ops armada100_fec_ops = {
+	.init = armdfec_init,
+	.halt = armdfec_halt,
+	.send = armdfec_send,
+	.recv = armdfec_recv
+};
+
 int armada100_fec_register(unsigned long base_addr)
 {
 	struct armdfec_device *darmdfec;

@@ -718,10 +725,7 @@ int armada100_fec_register(unsigned long base_addr)
 	/* must be less than sizeof(dev->name) */
 	strcpy(dev->name, "armd-fec0");
 
-	dev->eo->init = armdfec_init;
-	dev->eo->halt = armdfec_halt;
-	dev->eo->send = armdfec_send;
-	dev->eo->recv = armdfec_recv;
+	dev->eo = &armada100_fec_ops;
 
 	eth_register(dev);
 

index 3395dcc..464d539 100644
@@ -494,6 +494,14 @@ static int at91emac_write_hwaddr(struct eth_device *netdev)
 	return 0;
 }
 
+static struct eth_ops at91emac_ops = {
+	.init = at91emac_init,
+	.halt = at91emac_halt,
+	.send = at91emac_send,
+	.recv = at91emac_recv,
+	.write_hwaddr = at91emac_write_hwaddr
+};
+
 int at91emac_register(bd_t *bis, unsigned long iobase)
 {
 	emac_device *emac;

@@ -518,11 +526,7 @@ int at91emac_register(bd_t *bis, unsigned long iobase)
 	sprintf(dev->name, "emac");
 	dev->iobase = iobase;
 	dev->priv = emacfix;
-	dev->eo->init = at91emac_init;
-	dev->eo->halt = at91emac_halt;
-	dev->eo->send = at91emac_send;
-	dev->eo->recv = at91emac_recv;
-	dev->eo->write_hwaddr = at91emac_write_hwaddr;
+	dev->eo = &at91emac_ops;
 
 	eth_register(dev);
 

index 464f261..fc237ba 100644
@@ -698,6 +698,14 @@ static void ax88180_read_mac_addr (struct eth_device *dev)
 	}
 }
 
+static struct eth_ops ax88180_ops = {
+	.init = ax88180_init,
+	.halt = ax88180_halt,
+	.send = ax88180_send,
+	.recv = ax88180_recv
+};
+
+
 /*
 ===========================================================================
 <<<<<<			Exported SubProgram Bodies		>>>>>>

@@ -725,10 +733,7 @@ int ax88180_initialize (bd_t * bis)
 	sprintf (dev->name, "ax88180");
 	dev->iobase = AX88180_BASE;
 	dev->priv = priv;
-	dev->eo->init = ax88180_init;
-	dev->eo->halt = ax88180_halt;
-	dev->eo->send = ax88180_send;
-	dev->eo->recv = ax88180_recv;
+	dev->eo = &ax88180_ops;
 
 	priv->BusWidth = BUS_WIDTH_32;
 	priv->PadSize = 3;

index ef4736f..b2c4b0f 100644
@@ -91,6 +91,14 @@ static int bfin_miiphy_write(const char *devname, uchar addr, uchar reg, ushort
 	return 0;
 }
 
+static struct eth_ops bfin_emac_ops = {
+	.init = bfin_EMAC_init,
+	.halt = bfin_EMAC_halt,
+	.send = bfin_EMAC_send,
+	.recv = bfin_EMAC_recv,
+	.write_hwaddr = bfin_EMAC_setup_addr
+};
+
 int bfin_EMAC_initialize(bd_t *bis)
 {
 	struct eth_device *dev;

@@ -103,11 +111,7 @@ int bfin_EMAC_initialize(bd_t *bis)
 
 	dev->iobase = 0;
 	dev->priv = 0;
-	dev->eo->init = bfin_EMAC_init;
-	dev->eo->halt = bfin_EMAC_halt;
-	dev->eo->send = bfin_EMAC_send;
-	dev->eo->recv = bfin_EMAC_recv;
-	dev->eo->write_hwaddr = bfin_EMAC_setup_addr;
+	dev->eo = &bfin_emac_ops;
 
 	eth_register(dev);
 

index 2346feb..3550160 100644
@@ -508,6 +508,15 @@ static void xgmac_halt(struct eth_device *dev)
 	priv->rx_currdesc = 0;
 }
 
+static struct eth_ops xgmac_ops = {
+	.init = xgmac_init,
+	.send = xgmac_tx,
+	.recv = xgmac_rx,
+	.halt = xgmac_halt
+};
+
+
+
 int calxedaxgmac_initialize(u32 id, ulong base_addr)
 {
 	struct eth_device *dev;

@@ -543,10 +552,7 @@ int calxedaxgmac_initialize(u32 id, ulong base_addr)
 	macaddr[0] = readl(&regs->macaddr[0].lo);
 	memcpy(dev->enetaddr, macaddr, 6);
 
-	dev->eo->init = xgmac_init;
-	dev->eo->send = xgmac_tx;
-	dev->eo->recv = xgmac_rx;
-	dev->eo->halt = xgmac_halt;
+	dev->eo = &xgmac_ops;
 
 	eth_register(dev);
 

index 0a88bc0..8992b66 100644
@@ -931,6 +931,13 @@ static int cpsw_phy_init(struct eth_device *dev, struct cpsw_slave *slave)
 	return 1;
 }
 
+static struct eth_ops cpsw_ops = {
+	.init = cpsw_init,
+	.halt = cpsw_halt,
+	.send = cpsw_send,
+	.recv = cpsw_recv
+};
+
 int cpsw_register(struct cpsw_platform_data *data)
 {
 	struct cpsw_priv	*priv;

@@ -974,11 +981,8 @@ int cpsw_register(struct cpsw_platform_data *data)
 
 	strcpy(dev->name, "cpsw");
 	dev->iobase	= 0;
-	dev->eo->init	= cpsw_init;
-	dev->eo->halt	= cpsw_halt;
-	dev->eo->send	= cpsw_send;
-	dev->eo->recv	= cpsw_recv;
-	dev->eo->priv	= priv;
+	dev->eo		= &cpsw_ops;
+	dev->priv	= priv;
 
 	eth_register(dev);
 

index 65a4254..a78eada 100644
@@ -299,6 +299,13 @@ int cs8900_e2prom_write(struct eth_device *dev, u8 addr, u16 value)
 	return 0;
 }
 
+static struct eth_ops cs8900_ops = {
+	.init = cs8900_init,
+	.halt = cs8900_halt,
+	.send = cs8900_send,
+	.recv = cs8900_recv
+};
+
 int cs8900_initialize(u8 dev_num, int base_addr)
 {
 	struct eth_device *dev;

@@ -320,10 +327,7 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 
 	dev->iobase = base_addr;
 	dev->priv = priv;
-	dev->eo->init = cs8900_init;
-	dev->eo->halt = cs8900_halt;
-	dev->eo->send = cs8900_send;
-	dev->eo->recv = cs8900_recv;
+	dev->eo = &cs8900_ops;
 
 	/* Load MAC address from EEPROM */
 	cs8900_get_enetaddr(dev);

index a221092..5701f75 100644
@@ -769,6 +769,14 @@ static int davinci_eth_rcv_packet (struct eth_device *dev)
 	return (0);
 }
 
+static struct eth_ops davinci_emac_ops = {
+	.init = davinci_eth_open,
+	.halt = davinci_eth_close,
+	.send = davinci_eth_send_packet,
+	.recv = davinci_eth_rcv_packet,
+	.write_hwaddr = davinci_eth_set_mac_addr
+};
+
 /*
  * This function initializes the emac hardware. It does NOT initialize
  * EMAC modules power or pin multiplexors, that is done by board_init()

@@ -791,11 +799,7 @@ int davinci_emac_initialize(void)
 	sprintf(dev->name, "DaVinci-EMAC");
 
 	dev->iobase = 0;
-	dev->eo->init = davinci_eth_open;
-	dev->eo->halt = davinci_eth_close;
-	dev->eo->send = davinci_eth_send_packet;
-	dev->eo->recv = davinci_eth_rcv_packet;
-	dev->eo->write_hwaddr = davinci_eth_set_mac_addr;
+	dev->eo = &davinci_emac_ops;
 
 	eth_register(dev);
 

index 0361699..afdc088 100644
@@ -207,6 +207,13 @@ static struct pci_device_id supported[] = {
 	{ }
 };
 
+static struct eth_ops dc21x4x_ops = {
+	.init = dc21x4x_init,
+	.halt = dc21x4x_halt,
+	.send = dc21x4x_send,
+	.recv = dc21x4x_recv
+};
+
 int dc21x4x_initialize(bd_t *bis)
 {
 	int			idx=0;

@@ -299,11 +306,8 @@ int dc21x4x_initialize(bd_t *bis)
 #else
 		dev->iobase = pci_mem_to_phys(devbusfn, iobase);
 #endif
-		dev->priv   = (void*) devbusfn;
-		dev->eo->init   = dc21x4x_init;
-		dev->eo->halt   = dc21x4x_halt;
-		dev->eo->send   = dc21x4x_send;
-		dev->eo->recv   = dc21x4x_recv;
+		dev->priv = (void *) devbusfn;
+		dev->eo = &dc21x4x_ops;
 
 		/* Ensure we're not sleeping. */
 		pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP);

index 2d92591..255819e 100644
@@ -523,6 +523,14 @@ static int dw_mii_write(const char *devname, u8 addr, u8 reg, u16 val)
 }
 #endif
 
+static struct eth_ops dw_eth_ops = {
+	.init = dw_eth_init,
+	.send = dw_eth_send,
+	.recv = dw_eth_recv,
+	.halt = dw_eth_halt,
+	.write_hwaddr = dw_write_hwaddr
+};
+
 int designware_initialize(u32 id, ulong base_addr, u32 phy_addr, u32 interface)
 {
 	struct eth_device *dev;

@@ -559,11 +567,7 @@ int designware_initialize(u32 id, ulong base_addr, u32 phy_addr, u32 interface)
 	priv->phy_configured = 0;
 	priv->interface = interface;
 
-	dev->eo->init = dw_eth_init;
-	dev->eo->send = dw_eth_send;
-	dev->eo->recv = dw_eth_recv;
-	dev->eo->halt = dw_eth_halt;
-	dev->eo->write_hwaddr = dw_write_hwaddr;
+	dev->eo = &dw_eth_ops;
 
 	eth_register(dev);
 

index be0891f..126828e 100644
@@ -355,6 +355,13 @@ static void dnet_halt(struct eth_device *netdev)
 	dnet_writew_mac(dnet, DNET_INTERNAL_MODE_REG, 0);
 }
 
+static struct eth_ops dnet_ops = {
+	.init = dnet_init,
+	.halt = dnet_halt,
+	.send = dnet_send,
+	.recv = dnet_recv
+};
+
 int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr)
 {
 	struct dnet_device *dnet;

@@ -374,10 +381,7 @@ int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr)
 	dnet->phy_addr = phy_addr;
 
 	sprintf(netdev->name, "dnet%d", id);
-	netdev->eo->init = dnet_init;
-	netdev->eo->halt = dnet_halt;
-	netdev->eo->send = dnet_send;
-	netdev->eo->recv = dnet_recv;
+	netdev->eo = &dnet_ops;
 
 	dev_capa = readl(&dnet->regs->VERCAPS) & 0xFFFF;
 	debug("%s: has %smdio, %sirq, %sgigabit, %sdma\n", netdev->name,

index c9f9fb3..82e89d8 100644
@@ -5118,6 +5118,13 @@ void e1000_get_bus_type(struct e1000_hw *hw)
 /* A list of all registered e1000 devices */
 static LIST_HEAD(e1000_hw_list);
 
+static struct eth_ops e1000_ops = {
+	.init = e1000_init,
+	.recv = e1000_poll,
+	.send = e1000_transmit,
+	.halt = e1000_disable
+};
+
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
 You should omit the last argument struct pci_device * for a non-PCI NIC

@@ -5218,10 +5225,7 @@ e1000_initialize(bd_t * bis)
 		       nic->enetaddr[3], nic->enetaddr[4], nic->enetaddr[5]);
 
 		/* Set up the function pointers and register the device */
-		nic->eo->init = e1000_init;
-		nic->eo->recv = e1000_poll;
-		nic->eo->send = e1000_transmit;
-		nic->eo->halt = e1000_disable;
+		nic->eo = &e1000_ops;
 		eth_register(nic);
 	}
 

index e3aa720..91d7f0b 100644
@@ -408,6 +408,13 @@ static struct pci_device_id supported[] = {
 	{}
 };
 
+static struct eth_ops eepro100_ops = {
+	.init = eepro100_init,
+	.halt = eepro100_halt,
+	.send = eepro100_send,
+	.recv = eepro100_recv
+};
+
 int eepro100_initialize (bd_t * bis)
 {
 	pci_dev_t devno;

@@ -458,10 +465,7 @@ int eepro100_initialize (bd_t * bis)
 		sprintf (dev->name, "i82559#%d", card_number);
 		dev->priv = (void *) devno; /* this have to come before bus_to_phys() */
 		dev->iobase = bus_to_phys (iobase);
-		dev->eo->init = eepro100_init;
-		dev->eo->halt = eepro100_halt;
-		dev->eo->send = eepro100_send;
-		dev->eo->recv = eepro100_recv;
+		dev->eo = &eepro100_ops;
 
 		eth_register (dev);
 

index 95f0b93..e73fef8 100644
@@ -924,6 +924,14 @@ static void enc_halt(struct eth_device *dev)
 	enc_release_bus(enc);
 }
 
+static struct eth_ops enc28j60_ops = {
+	init = enc_init,
+	halt = enc_halt,
+	send = enc_send,
+	recv = enc_recv,
+	write_hwaddr = enc_write_hwaddr
+};
+
 /*
  * This is the only exported function.
  *

@@ -962,11 +970,7 @@ int enc28j60_initialize(unsigned int bus, unsigned int cs,
 	enc->dev = dev;
 	/* now fill the eth_device object */
 	dev->priv = enc;
-	dev->eo->init = enc_init;
-	dev->eo->halt = enc_halt;
-	dev->eo->send = enc_send;
-	dev->eo->recv = enc_recv;
-	dev->eo->write_hwaddr = enc_write_hwaddr;
+	dev->eo = &enc28j60_ops;
 	sprintf(dev->name, "enc%i.%i", bus, cs);
 	eth_register(dev);
 #if defined(CONFIG_CMD_MII)

index 0b5cb3c..a2a1502 100644
@@ -439,6 +439,13 @@ int ep93xx_miiphy_initialize(bd_t * const bd)
 }
 #endif
 
+static struct eth_dev ep93xx_eth_ops = {
+	.init = ep93xx_eth_open,
+	.halt = ep93xx_eth_close,
+	.send = ep93xx_eth_send_packet,
+	.recv = ep93xx_eth_rcv_packet
+};
+
 /**
  * Initialize the EP93xx MAC.  The MAC hardware is reset.  Buffers are
  * allocated, if necessary, for the TX and RX descriptor and status queues,

@@ -499,10 +506,7 @@ int ep93xx_eth_initialize(u8 dev_num, int base_addr)
 
 	dev->iobase = base_addr;
 	dev->priv = priv;
-	dev->eo->init = ep93xx_eth_open;
-	dev->eo->halt = ep93xx_eth_close;
-	dev->eo->send = ep93xx_eth_send_packet;
-	dev->eo->recv = ep93xx_eth_rcv_packet;
+	dev->eo = &ep93xx_eth_ops;
 
 	sprintf(dev->name, "ep93xx_eth-%hu", dev_num);
 

index 946b8e2..6a78605 100644
@@ -482,6 +482,14 @@ static int ethoc_recv(struct eth_device *dev)
 	return 0;
 }
 
+static struct eth_ops ethoc_ops = {
+	.init = ethoc_init,
+	.halt = ethoc_halt,
+	.send = ethoc_send,
+	.recv = ethoc_recv,
+	.write_hwaddr = ethoc_set_mac_address
+};
+
 int ethoc_initialize(u8 dev_num, int base_addr)
 {
 	struct ethoc *priv;

@@ -499,11 +507,7 @@ int ethoc_initialize(u8 dev_num, int base_addr)
 	memset(dev, 0, sizeof(*dev));
 	dev->priv = priv;
 	dev->iobase = base_addr;
-	dev->eo->init = ethoc_init;
-	dev->eo->halt = ethoc_halt;
-	dev->eo->send = ethoc_send;
-	dev->eo->recv = ethoc_recv;
-	dev->eo->write_hwaddr = ethoc_set_mac_address;
+	dev->eo = &ethoc_ops;
 	sprintf(dev->name, "%s-%hu", "ETHOC", dev_num);
 
 	eth_register(dev);

index f8a5556..3259f07 100644
@@ -915,6 +915,15 @@ static int fec_recv(struct eth_device *dev)
 	return len;
 }
 
+static struct eth_ops fec_ops = {
+	.init = fec_init,
+	.send = fec_send,
+	.recv = fec_recv,
+	.halt = fec_halt,
+	.write_hwaddr = fec_set_hwaddr
+};
+
+
 static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
 {
 	struct eth_device *edev;

@@ -943,11 +952,7 @@ static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
 	memset(fec, 0, sizeof(*fec));
 
 	edev->priv = fec;
-	edev->eo->init = fec_init;
-	edev->eo->send = fec_send;
-	edev->eo->recv = fec_recv;
-	edev->eo->halt = fec_halt;
-	edev->eo->write_hwaddr = fec_set_hwaddr;
+	edev->eo = &fec_ops;
 
 	fec->eth = (struct ethernet_regs *)base_addr;
 	fec->bd = bd;

index 76391c1..7046829 100644
@@ -525,6 +525,13 @@ static int ftgmac100_send(struct eth_device *dev, void *packet, int length)
 	return 0;
 }
 
+static struct eth_ops ftgmac100_ops = {
+	.init = ftgmac100_init,
+	.halt = ftgmac100_halt,
+	.send = ftgmac100_send,
+	.recv = ftgmac100_recv
+};
+
 int ftgmac100_initialize(bd_t *bd)
 {
 	struct eth_device *dev;

@@ -548,10 +555,7 @@ int ftgmac100_initialize(bd_t *bd)
 
 	sprintf(dev->name, "FTGMAC100");
 	dev->iobase	= CONFIG_FTGMAC100_BASE;
-	dev->eo->init	= ftgmac100_init;
-	dev->eo->halt	= ftgmac100_halt;
-	dev->eo->send	= ftgmac100_send;
-	dev->eo->recv	= ftgmac100_recv;
+	dev->eo		= &ftgmac100_ops;
 	dev->priv	= priv;
 
 	eth_register(dev);

index 150dccf..3794005 100644
@@ -597,6 +597,13 @@ void greth_set_hwaddr(greth_priv * greth, unsigned char *mac)
 	       mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 }
 
+static struct eth_ops greth_ops = {
+	.init = greth_init,
+	.halt = greth_halt,
+	.send = greth_send,
+	.recv = greth_recv
+};
+
 int greth_initialize(bd_t * bis)
 {
 	greth_priv *greth;

@@ -623,10 +630,7 @@ int greth_initialize(bd_t * bis)
 	debug("Found GRETH at %p, irq %d\n", greth->regs, greth->irq);
 	dev->priv = (void *)greth;
 	dev->iobase = (unsigned int)greth->regs;
-	dev->eo->init = greth_init;
-	dev->eo->halt = greth_halt;
-	dev->eo->send = greth_send;
-	dev->eo->recv = greth_recv;
+	dev->eo = &greth_ops;
 	greth->dev = dev;
 
 	/* Reset Core */

index 2e70d22..6a18809 100644
@@ -512,6 +512,13 @@ static void fec_halt(struct eth_device *dev)
 #endif
 }
 
+static struct eth_ops fec_ops = {
+	.init = fec_init,
+	.halt = fec_halt,
+	.send = fec_send,
+	.recv = fec_recv
+};
+
 int mcdmafec_initialize(bd_t * bis)
 {
 	struct eth_device *dev;

@@ -533,10 +540,7 @@ int mcdmafec_initialize(bd_t * bis)
 		sprintf(dev->name, "FEC%d", fec_info[i].index);
 
 		dev->priv = &fec_info[i];
-		dev->eo->init = fec_init;
-		dev->eo->halt = fec_halt;
-		dev->eo->send = fec_send;
-		dev->eo->recv = fec_recv;
+		dev->eo = &fec_ops;
 
 		/* setup Receive and Transmit buffer descriptor */
 #ifdef CONFIG_SYS_DMA_USE_INTSRAM

index 216122d..ab91553 100644
@@ -165,6 +165,12 @@ static void inca_init_switch_chip(void);
 static void inca_dma_init(void);
 static int inca_amdix(void);
 
+static struct eth_ops inca_switch_ops = {
+	.init = inca_switch_init,
+	.halt = inca_switch_halt,
+	.send = inca_switch_send,
+	.recv = inca_switch_recv
+};
 
 int inca_switch_initialize(bd_t * bis)
 {

@@ -189,10 +195,7 @@ int inca_switch_initialize(bd_t * bis)
 #endif
 
 	sprintf(dev->name, "INCA-IP Switch");
-	dev->eo->init = inca_switch_init;
-	dev->eo->halt = inca_switch_halt;
-	dev->eo->send = inca_switch_send;
-	dev->eo->recv = inca_switch_recv;
+	dev->eo = &inca_switch_ops;
 
 	eth_register(dev);
 

index b0703ef..4a5a27e 100644
@@ -220,6 +220,13 @@ static int ks8695_eth_send(struct eth_device *dev, void *packet, int len)
 
 /****************************************************************************/
 
+static struct eth_ops ks8695_eth_ops = {
+	.init = ks8695_eth_init,
+	.halt = ks8695_eth_halt,
+	.send = ks8695_eth_send,
+	.recv = ks8695_eth_recv
+};
+
 int ks8695_eth_initialize(void)
 {
 	struct eth_device *dev;

@@ -230,10 +237,7 @@ int ks8695_eth_initialize(void)
 	memset(dev, 0, sizeof(*dev));
 
 	dev->iobase = KS8695_IO_BASE + KS8695_LAN_DMA_TX;
-	dev->eo->init = ks8695_eth_init;
-	dev->eo->halt = ks8695_eth_halt;
-	dev->eo->send = ks8695_eth_send;
-	dev->eo->recv = ks8695_eth_recv;
+	dev->eo = &ks8695_eth_ops;
 	strcpy(dev->name, "ks8695eth");
 
 	eth_register(dev);

index d87302b..4e4e2e4 100644
@@ -785,6 +785,13 @@ static int lan91c96_detect_chip(struct eth_device *dev)
 	return 0;
 }
 
+static struct eth_ops lan91c96_ops = {
+	.init = lan91c96_init,
+	.halt = lan91c96_halt,
+	.send = lan91c96_send,
+	.recv = lan91c96_recv
+};
+
 int lan91c96_initialize(u8 dev_num, int base_addr)
 {
 	struct eth_device *dev;

@@ -806,10 +813,7 @@ int lan91c96_initialize(u8 dev_num, int base_addr)
 	}
 	get_rom_mac(dev, dev->enetaddr);
 
-	dev->eo->init = lan91c96_init;
-	dev->eo->halt = lan91c96_halt;
-	dev->eo->send = lan91c96_send;
-	dev->eo->recv = lan91c96_recv;
+	dev->eo = &lan91c96_ops;
 	sprintf(dev->name, "%s-%hu", supported_chips[r].name, dev_num);
 
 	eth_register(dev);

index 2c53902..c0f1202 100644
@@ -529,6 +529,14 @@ static int macb_write_hwaddr(struct eth_device *dev)
 	return 0;
 }
 
+static struct eth_ops macb_ops = {
+	.init = macb_init,
+	.halt = macb_halt,
+	.send = macb_send,
+	.recv = macb_recv,
+	.write_hwaddr = macb_write_hwaddr
+};
+
 int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)
 {
 	struct macb_device *macb;

@@ -558,11 +566,7 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)
 	macb->phy_addr = phy_addr;
 
 	sprintf(netdev->name, "macb%d", id);
-	netdev->eo->init = macb_init;
-	netdev->eo->halt = macb_halt;
-	netdev->eo->send = macb_send;
-	netdev->eo->recv = macb_recv;
-	netdev->eo->write_hwaddr = macb_write_hwaddr;
+	netdev->eo = &macb_ops;
 
 	/*
 	 * Do some basic initialization so that we at least can talk

index 0aeb24e..31c8dcd 100644
@@ -551,6 +551,13 @@ void fec_halt(struct eth_device *dev)
 	memset(info->txbuf, 0, DBUF_LENGTH);
 }
 
+static struct eth_ops fec_ops = {
+	.init = fec_init,
+	.halt = fec_halt,
+	.send = fec_send,
+	.recv = fec_recv
+};
+
 int mcffec_initialize(bd_t * bis)
 {
 	struct eth_device *dev;

@@ -572,10 +579,7 @@ int mcffec_initialize(bd_t * bis)
 		sprintf(dev->name, "FEC%d", fec_info[i].index);
 
 		dev->priv = &fec_info[i];
-		dev->eo->init = fec_init;
-		dev->eo->halt = fec_halt;
-		dev->eo->send = fec_send;
-		dev->eo->recv = fec_recv;
+		dev->eo = &fec_ops;
 
 		/* setup Receive and Transmit buffer descriptor */
 #ifdef CONFIG_SYS_FEC_BUF_USE_SRAM

index 73503da..50f8100 100644
@@ -879,6 +879,12 @@ static int mpc5xxx_fec_recv(struct eth_device *dev)
 	return len;
 }
 
+static struct eth_ops mpc5xxx_fec_ops = {
+	.init = mpc5xxx_fec_init,
+	.halt = mpc5xxx_fec_halt,
+	.send = mpc5xxx_fec_send,
+	.recv = mpc5xxx_fec_recv
+};
 
 /********************************************************************/
 int mpc5xxx_fec_initialize(bd_t * bis)

@@ -915,10 +921,7 @@ int mpc5xxx_fec_initialize(bd_t * bis)
 
 	dev->priv = (void *)fec;
 	dev->iobase = MPC5XXX_FEC;
-	dev->eo->init = mpc5xxx_fec_init;
-	dev->eo->halt = mpc5xxx_fec_halt;
-	dev->eo->send = mpc5xxx_fec_send;
-	dev->eo->recv = mpc5xxx_fec_recv;
+	dev->eo = &mpc5xxx_fec_ops;
 
 	sprintf(dev->name, "FEC");
 	eth_register(dev);

index 6ddb6d6..eeb0741 100644
@@ -647,6 +647,14 @@ static int mvgbe_recv(struct eth_device *dev)
 	return 0;
 }
 
+static struct eth_ops mvgbe_ops = {
+	.init = (int (*) (struct eth_device *, bd_t *))mvgbe_init,
+	.halt = (void (*) (struct eth_device *))mvgbe_halt,
+	.send = mvgbe_send,
+	.recv = mvgbe_recv,
+	.write_hwaddr = mvgbe_write_hwaddr
+};
+
 int mvgbe_initialize(bd_t *bis)
 {
 	struct mvgbe_device *dmvgbe;

@@ -721,11 +729,7 @@ error1:
 			return -1;
 		}
 
-		dev->eo->init = (void *)mvgbe_init;
-		dev->eo->halt = (void *)mvgbe_halt;
-		dev->eo->send = (void *)mvgbe_send;
-		dev->eo->recv = (void *)mvgbe_recv;
-		dev->eo->write_hwaddr = (void *)mvgbe_write_hwaddr;
+		dev->eo = &mvgbe_ops;
 
 		eth_register(dev);
 

index 4aa3b28..d10a70a 100644
@@ -608,6 +608,13 @@ static int mpc512x_fec_recv (struct eth_device *dev)
 	return frame_length;
 }
 
+static struct eth_ops mpc512x_fec_ops = {
+	.init = mpc512x_fec_init,
+	.halt = mpc512x_fec_halt,
+	.send = mpc512x_fec_send,
+	.recv = mpc512x_fec_recv
+};
+
 /********************************************************************/
 int mpc512x_fec_initialize (bd_t * bis)
 {

@@ -629,10 +636,7 @@ int mpc512x_fec_initialize (bd_t * bis)
 # endif
 	dev->priv = (void *)fec;
 	dev->iobase = (int)&im->fec;
-	dev->eo->init = mpc512x_fec_init;
-	dev->eo->halt = mpc512x_fec_halt;
-	dev->eo->send = mpc512x_fec_send;
-	dev->eo->recv = mpc512x_fec_recv;
+	dev->eo = &mpc512x_fec_ops;
 
 	sprintf (dev->name, "FEC");
 	eth_register (dev);

index 4288d1f..a3d78b9 100644
@@ -273,6 +273,13 @@ OUTL(struct eth_device *dev, int command, u_long addr)
 	*(vu_long *) ((addr + dev->iobase)) = cpu_to_le32(command);
 }
 
+static struct eth_ops natsemi_ops = {
+	.init = natsemi_init,
+	.halt = natsemi_disable,
+	.send = natsemi_send,
+	.recv = natsemi_poll
+};
+
 /*
  * Function: natsemi_initialize
  *

@@ -332,10 +339,7 @@ natsemi_initialize(bd_t * bis)
 		printf("natsemi: NatSemi ns8381[56] @ %#x\n", dev->iobase);
 #endif
 		dev->priv = (void *) devno;
-		dev->eo->init = natsemi_init;
-		dev->eo->halt = natsemi_disable;
-		dev->eo->send = natsemi_send;
-		dev->eo->recv = natsemi_poll;
+		dev->eo = &natsemi_ops;
 
 		eth_register(dev);
 

index 2cc9743..f1fed0e 100644
@@ -774,6 +774,13 @@ static int ne2k_send(struct eth_device *dev, void *packet, int length)
 	return 0;
 }
 
+static struct eth_ops ne2k_ops = {
+	.init = ne2k_init,
+	.halt = ne2k_halt,
+	.send = ne2k_send,
+	.recv = ne2k_recv
+};
+
 /**
  * Setup the driver for use and register it with the eth layer
  * @return 0 on success, -1 on error (causing caller to print error msg)

@@ -789,10 +796,7 @@ int ne2k_register(void)
 	if (ne2k_setup_driver(dev))
 		return -1;
 
-	dev->eo->init = ne2k_init;
-	dev->eo->halt = ne2k_halt;
-	dev->eo->send = ne2k_send;
-	dev->eo->recv = ne2k_recv;
+	dev->eo = &ne2k_ops;
 
 	sprintf(dev->name, "NE2000");
 

index d376c21..adff561 100644
@@ -576,6 +576,13 @@ static int npe_rx(struct eth_device *dev)
 	return 0;
 }
 
+static struct eth_ops npe_ops = {
+	.init = npe_init,
+	.halt = npe_halt,
+	.send = npe_send,
+	.recv = npe_rx
+};
+
 int npe_initialize(bd_t * bis)
 {
 	static int virgin = 0;

@@ -625,10 +632,7 @@ int npe_initialize(bd_t * bis)
 
 		sprintf(dev->name, "NPE%d", eth_num);
 		dev->priv = (void *)p_npe;
-		dev->eo->init = npe_init;
-		dev->eo->halt = npe_halt;
-		dev->eo->send = npe_send;
-		dev->eo->recv = npe_rx;
+		dev->eo = &npe_ops;
 
 		p_npe->print_speed = 1;
 

index 8b08e0b..c433d3a 100644
@@ -294,6 +294,14 @@ OUTL(struct eth_device *dev, int command, u_long addr)
 	*(vu_long *) ((addr + dev->iobase)) = cpu_to_le32(command);
 }
 
+static struct eth_ops ns8382x_ops = {
+	.init = ns8382x_init,
+	.halt = ns8382x_disable,
+	.send = ns8382x_send,
+	.recv = ns8382x_poll
+};
+
+
 /* Function: ns8382x_initialize
  * Description: Retrieves the MAC address of the card, and sets up some
  *  globals required by other routines, and initializes the NIC, making it

@@ -346,10 +354,7 @@ ns8382x_initialize(bd_t * bis)
 		sprintf(dev->name, "dp8382x#%d", card_number);
 		dev->iobase = bus_to_phys(iobase);
 		dev->priv = (void *) devno;
-		dev->eo->init = ns8382x_init;
-		dev->eo->halt = ns8382x_disable;
-		dev->eo->send = ns8382x_send;
-		dev->eo->recv = ns8382x_poll;
+		dev->eo = &ns8382x_ops;
 
 		/* ns8382x has a non-standard PM control register
 		 * in PCI config space.  Some boards apparently need

index 35254c3..8bb8c67 100644
@@ -154,6 +154,12 @@ static struct pci_device_id supported[] = {
 	{}
 };
 
+static struct eth_ops pcnet_ops = {
+	.init = pcnet_init,
+	.halt = pcnet_halt,
+	.send = pcnet_send,
+	.recv = pcnet_recv
+};
 
 int pcnet_initialize (bd_t * bis)
 {

@@ -216,12 +222,9 @@ int pcnet_initialize (bd_t * bis)
 		}
 
 		/*
-		 * Setup device structure and register the driver.
+		 * Setup device ops and register the driver.
 		 */
-		dev->eo->init = pcnet_init;
-		dev->eo->halt = pcnet_halt;
-		dev->eo->send = pcnet_send;
-		dev->eo->recv = pcnet_recv;
+		dev->eo = &pcnet_ops;
 
 		eth_register (dev);
 	}

index d3eb692..3b5861f 100644
@@ -92,6 +92,12 @@ static unsigned char * plb2800_get_mac_addr(void);
 static int rx_new;
 static int mac_addr_set = 0;
 
+static struct eth_ops plb2800_eth_ops = {
+	.init = plb2800_eth_init,
+	.halt = plb2800_eth_halt,
+	.send = plb2800_eth_send,
+	.recv = plb2800_eth_recv
+};
 
 int plb2800_eth_initialize(bd_t * bis)
 {

@@ -110,10 +116,7 @@ int plb2800_eth_initialize(bd_t * bis)
 	memset(dev, 0, sizeof(*dev));
 
 	sprintf(dev->name, "PLB2800 Switch");
-	dev->eo->init = plb2800_eth_init;
-	dev->eo->halt = plb2800_eth_halt;
-	dev->eo->send = plb2800_eth_send;
-	dev->eo->recv = plb2800_eth_recv;
+	dev->eo = &plb2800_eth_ops;
 
 	eth_register(dev);
 

index ed02cf6..15e9f5f 100644
@@ -200,6 +200,16 @@ static struct pci_device_id supported[] = {
        {}
 };
 
+static struct eth_ops rtl8139_ops = {
+	init = rtl8139_probe,
+	halt = rtl_disable,
+	send = rtl_transmit,
+	recv = rtl_poll,
+#ifdef CONFIG_MCAST_TFTP
+	mcast = rtl_bcast_addr
+#endif
+};
+
 int rtl8139_initialize(bd_t *bis)
 {
 	pci_dev_t devno;

@@ -229,13 +239,7 @@ int rtl8139_initialize(bd_t *bis)
 
 		dev->priv = (void *) devno;
 		dev->iobase = (int)bus_to_phys(iobase);
-		dev->eo->init = rtl8139_probe;
-		dev->eo->halt = rtl_disable;
-		dev->eo->send = rtl_transmit;
-		dev->eo->recv = rtl_poll;
-#ifdef CONFIG_MCAST_TFTP
-		dev->eo->mcast = rtl_bcast_addr;
-#endif
+		dev->eo = &rtl8139_ops;
 
 		eth_register (dev);
 

index c75fd4f..80f8443 100644
@@ -872,6 +872,14 @@ static int rtl_init(struct eth_device *dev, bd_t *bis)
 	return 1;
 }
 
+static struct eth_ops rtl_ops = {
+	.init = rtl_reset,
+	.halt = rtl_halt,
+	.send = rtl_send,
+	.recv = rtl_recv
+};
+
+
 int rtl8169_initialize(bd_t *bis)
 {
 	pci_dev_t devno;

@@ -902,10 +910,7 @@ int rtl8169_initialize(bd_t *bis)
 		dev->priv = (void *) devno;
 		dev->iobase = (int)pci_mem_to_phys(devno, iobase);
 
-		dev->eo->init = rtl_reset;
-		dev->eo->halt = rtl_halt;
-		dev->eo->send = rtl_send;
-		dev->eo->recv = rtl_recv;
+		dev->eo = &rtl_ops;
 
 		eth_register (dev);
 

index 3ea7213..f237ef8 100644
@@ -1331,6 +1331,14 @@ static void print_packet( byte * buf, int length )
 }
 #endif
 
+static struct eth_ops smc_ops = {
+	.init = smc_init,
+	.halt = smc_halt,
+	.send = smc_send,
+	.recv = smc_rcv,
+	.write_hwaddr = smc_write_hwaddr
+};
+
 int smc91111_initialize(u8 dev_num, int base_addr)
 {
 	struct smc91111_priv *priv;

@@ -1357,11 +1365,7 @@ int smc91111_initialize(u8 dev_num, int base_addr)
 		dev->enetaddr[i] = SMC_inb(dev, (ADDR0_REG + i));
 	swap_to(FLASH);
 
-	dev->eo->init = smc_init;
-	dev->eo->halt = smc_halt;
-	dev->eo->send = smc_send;
-	dev->eo->recv = smc_rcv;
-	dev->eo->write_hwaddr = smc_write_hwaddr;
+	dev->eo = &smc_ops;
 	sprintf(dev->name, "%s-%hu", SMC_DEV_NAME, dev_num);
 
 	eth_register(dev);

index 5ba1bdf..0369376 100644
@@ -251,6 +251,13 @@ static int smc911x_miiphy_write(const char *devname, u8 phy, u8 reg, u16 val)
 }
 #endif
 
+static struct eth_ops smc911x_ops = {
+	.init = smc911x_init,
+	.halt = smc911x_halt,
+	.send = smc911x_send,
+	.recv = smc911x_rx
+};
+
 int smc911x_initialize(u8 dev_num, int base_addr)
 {
 	unsigned long addrl, addrh;

@@ -282,10 +289,7 @@ int smc911x_initialize(u8 dev_num, int base_addr)
 		dev->enetaddr[5] = addrh >> 8;
 	}
 
-	dev->eo->init = smc911x_init;
-	dev->eo->halt = smc911x_halt;
-	dev->eo->send = smc911x_send;
-	dev->eo->recv = smc911x_rx;
+	dev->eo = &smc911x_ops;
 	sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
 
 	eth_register(dev);

index 345d563..034f0ed 100644
@@ -605,6 +605,16 @@ static int init_phy(struct eth_device *dev)
 	return 1;
 }
 
+static struct eth_ops tsec_ops = {
+	.init = tsec_init,
+	.halt = tsec_halt,
+	.send = tsec_send,
+	.recv = tsec_recv,
+#ifdef CONFIG_MCAST_TFTP
+	.mcast = tsec_mcast_addr
+#endif
+};
+
 /* Initialize device structure. Returns success if PHY
  * initialization succeeded (i.e. if it recognizes the PHY)
  */

@@ -638,13 +648,7 @@ static int tsec_initialize(bd_t *bis, struct tsec_info_struct *tsec_info)
 	priv->bus = miiphy_get_dev_by_name(tsec_info->mii_devname);
 	dev->iobase = 0;
 	dev->priv = priv;
-	dev->eo->init = tsec_init;
-	dev->eo->halt = tsec_halt;
-	dev->eo->send = tsec_send;
-	dev->eo->recv = tsec_recv;
-#ifdef CONFIG_MCAST_TFTP
-	dev->eo->mcast = tsec_mcast_addr;
-#endif
+	dev->eo = &tsec_ops;
 
 	/* Tell u-boot to get the addr from the env */
 	for (i = 0; i < 6; i++)

index bed09d5..ea26c2c 100644
@@ -718,6 +718,13 @@ static int marvell_88e_phy_config (struct eth_device *dev, int *speed,
 	return 1;
 }
 
+static struct eth_ops tsi108_eth_ops = {
+	.init = tsi108_eth_probe,
+	.halt = tsi108_eth_halt,
+	.send = tsi108_eth_send,
+	.recv = tsi108_eth_recv
+};
+
 /*
  * External interface
  *

@@ -739,10 +746,7 @@ int tsi108_eth_initialize (bd_t * bis)
 
 		dev->iobase = ETH_BASE + (index * ETH_PORT_OFFSET);
 		dev->priv = (void *)(phy_address[index]);
-		dev->eo->init = tsi108_eth_probe;
-		dev->eo->halt = tsi108_eth_halt;
-		dev->eo->send = tsi108_eth_send;
-		dev->eo->recv = tsi108_eth_recv;
+		dev->eo = &tsi108_eth_ops;
 
 		eth_register(dev);
 	}

index 33d8b49..65670db 100644
@@ -198,6 +198,13 @@ static struct pci_device_id uli526x_pci_tbl[] = {
 	{}
 };
 
+static struct eth_ops uli526x_ops = {
+	.init = uli526x_init_one,
+	.halt = uli526x_disable,
+	.send = uli526x_start_xmit,
+	.recv = uli526x_rx_packet
+};
+
 /* ULI526X network board routine */
 
 /*

@@ -237,10 +244,7 @@ int uli526x_initialize(bd_t *bis)
 		db->pdev = devno;
 		dev->iobase = iobase;
 
-		dev->eo->init = uli526x_init_one;
-		dev->eo->halt = uli526x_disable;
-		dev->eo->send = uli526x_start_xmit;
-		dev->eo->recv = uli526x_rx_packet;
+		dev->eo = &uli526x_ops;
 
 		/* init db */
 		db->ioaddr = dev->iobase;

index 54a871b..44ece48 100644
@@ -622,6 +622,15 @@ static int axiemac_bus_reset(struct mii_dev *bus)
 	return 0;
 }
 
+static struct eth_ops axiemac_ops = {
+	.init = axiemac_init,
+	.halt = axiemac_halt,
+	.send = axiemac_send,
+	.recv = axiemac_recv,
+	.write_hwaddr = axiemac_setup_mac
+};
+
+
 int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
 							unsigned long dma_addr)
 {

@@ -645,11 +654,7 @@ int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
 	priv->dmatx = (struct axidma_reg *)dma_addr;
 	/* RX channel offset is 0x30 */
 	priv->dmarx = (struct axidma_reg *)(dma_addr + 0x30);
-	dev->eo->init = axiemac_init;
-	dev->eo->halt = axiemac_halt;
-	dev->eo->send = axiemac_send;
-	dev->eo->recv = axiemac_recv;
-	dev->eo->write_hwaddr = axiemac_setup_mac;
+	dev->eo = &axiemac_ops;
 
 #ifdef CONFIG_PHY_ADDR
 	priv->phyaddr = CONFIG_PHY_ADDR;

index c0fefa7..b5be0a3 100644
@@ -345,6 +345,13 @@ static int emaclite_recv(struct eth_device *dev)
 
 }
 
+static struct eth_ops emaclite_ops = {
+	init = emaclite_init,
+	halt = emaclite_halt,
+	send = emaclite_send,
+	recv = emaclite_recv
+};
+
 int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
 							int txpp, int rxpp)
 {

@@ -369,10 +376,7 @@ int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
 	sprintf(dev->name, "Xelite.%lx", base_addr);
 
 	dev->iobase = base_addr;
-	dev->eo->init = emaclite_init;
-	dev->eo->halt = emaclite_halt;
-	dev->eo->send = emaclite_send;
-	dev->eo->recv = emaclite_recv;
+	dev->eo = &emaclite_ops;
 
 	eth_register(dev);
 

index 3cba176..0a9a0f0 100644
@@ -399,6 +399,14 @@ static int zynq_gem_miiphy_write(const char *devname, uchar addr,
 	return phywrite(dev, addr, reg, val);
 }
 
+static struct eth_ops zynq_gem_ops = {
+	.init = zynq_gem_init,
+	.halt = zynq_gem_halt,
+	.send = zynq_gem_send,
+	.recv = zynq_gem_recv,
+	.write_hwaddr = zynq_gem_setup_mac
+};
+
 int zynq_gem_initialize(bd_t *bis, int base_addr)
 {
 	struct eth_device *dev;

@@ -425,11 +433,7 @@ int zynq_gem_initialize(bd_t *bis, int base_addr)
 
 	dev->iobase = base_addr;
 
-	dev->eo->init = zynq_gem_init;
-	dev->eo->halt = zynq_gem_halt;
-	dev->eo->send = zynq_gem_send;
-	dev->eo->recv = zynq_gem_recv;
-	dev->eo->write_hwaddr = zynq_gem_setup_mac;
+	dev->eo = &zynq_gem_ops;
 
 	eth_register(dev);
 

index 8f67417..5f52251 100644
@@ -282,6 +282,24 @@ static int ll_temac_phy_init(struct eth_device *dev)
 	return 1;
 }
 
+static struct eth_ops ll_temac_ops_sdma = {
+	.init = ll_temac_init,
+	.halt = ll_temac_halt,
+	.write_hwaddr = ll_temac_setup_mac_addr,
+	.recv = ll_temac_recv_sdma,
+	.send = ll_temac_send_sdma
+};
+
+static struct eth_ops ll_temac_ops_fifo = {
+	.init = ll_temac_init,
+	.halt = ll_temac_halt,
+	.write_hwaddr = ll_temac_setup_mac_addr,
+	.recv = ll_temac_recv_fifo,
+	.send = ll_temac_send_fifo
+};
+
+
+
 /*
  * Initialize a single ll_temac devices
  *

@@ -313,9 +331,6 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 	dev->iobase = devinf->base_addr;
 
 	dev->priv = ll_temac;
-	dev->eo->init = ll_temac_init;
-	dev->eo->halt = ll_temac_halt;
-	dev->eo->write_hwaddr = ll_temac_setup_mac_addr;
 
 	ll_temac->ctrladdr = devinf->ctrl_addr;
 	if (devinf->flags & XILINX_LL_TEMAC_M_SDMA_PLB) {

@@ -334,16 +349,14 @@ int xilinx_ll_temac_initialize(bd_t *bis, struct ll_temac_info *devinf)
 		ll_temac->ctrlinit = ll_temac_init_sdma;
 		ll_temac->ctrlhalt = ll_temac_halt_sdma;
 		ll_temac->ctrlreset = ll_temac_reset_sdma;
-		dev->eo->recv = ll_temac_recv_sdma;
-		dev->eo->send = ll_temac_send_sdma;
+		dev->eo = &ll_temac_ops_sdma;
 	} else {
 		ll_temac->in32 = NULL;
 		ll_temac->out32 = NULL;
 		ll_temac->ctrlinit = NULL;
 		ll_temac->ctrlhalt = NULL;
 		ll_temac->ctrlreset = ll_temac_reset_fifo;
-		dev->eo->recv = ll_temac_recv_fifo;
-		dev->eo->send = ll_temac_send_fifo;
+		dev->eo = &ll_temac_ops_fifo;
 	}
 
 	/* Link to specified MDIO bus */

index 1f8d0c1..e801bcb 100644
@@ -502,6 +502,13 @@ void sh_eth_halt(struct eth_device *dev)
 	sh_eth_stop(eth);
 }
 
+static struct eth_ops sh_eth_ops = {
+	.init = sh_eth_init,
+	.halt = sh_eth_halt,
+	.send = sh_eth_send,
+	.recv = sh_eth_recv
+};
+
 int sh_eth_initialize(bd_t *bd)
 {
     int ret = 0;

@@ -529,10 +536,7 @@ int sh_eth_initialize(bd_t *bd)
 
     dev->priv = (void *)eth;
     dev->iobase = 0;
-	dev->eo->init = sh_eth_init;
-	dev->eo->halt = sh_eth_halt;
-	dev->eo->send = sh_eth_send;
-	dev->eo->recv = sh_eth_recv;
+	dev->eo = &sh_eth_ops;
     eth->port_info[eth->port].dev = dev;
 
 	sprintf(dev->name, SHETHER_NAME);

index ac03a45..2909fb3 100644
@@ -295,11 +295,11 @@ int au1x00_enet_initialize(bd_t *bis){
 
 	sprintf(dev->name, "Au1X00 ethernet");
 	dev->iobase = 0;
-	dev->priv   = 0;
-	dev->init   = au1x00_init;
-	dev->halt   = au1x00_halt;
-	dev->send   = au1x00_send;
-	dev->recv   = au1x00_recv;
+	dev->priv = 0;
+	dev->eo->init = au1x00_init;
+	dev->eo->halt = au1x00_halt;
+	dev->eo->send = au1x00_send;
+	dev->eo->recv = au1x00_recv;
 
 	eth_register(dev);
 

index aaf9be1..9d6fcc1 100644
@@ -833,10 +833,10 @@ int mpc8220_fec_initialize (bd_t * bis)
 
 	dev->priv = (void *) fec;
 	dev->iobase = MMAP_FEC1;
-	dev->init = mpc8220_fec_init;
-	dev->halt = mpc8220_fec_halt;
-	dev->send = mpc8220_fec_send;
-	dev->recv = mpc8220_fec_recv;
+	dev->eo->init = mpc8220_fec_init;
+	dev->eo->halt = mpc8220_fec_halt;
+	dev->eo->send = mpc8220_fec_send;
+	dev->eo->recv = mpc8220_fec_recv;
 
 	sprintf (dev->name, "FEC");
 	eth_register (dev);

index 1853451..6b78235 100644
@@ -384,11 +384,11 @@ int fec_initialize(bd_t *bis)
 
 		sprintf(dev->name, "FCC%d",
 			ether_fcc_info[i].ether_index + 1);
-		dev->priv   = &ether_fcc_info[i];
-		dev->init   = fec_init;
-		dev->halt   = fec_halt;
-		dev->send   = fec_send;
-		dev->recv   = fec_recv;
+		dev->priv = &ether_fcc_info[i];
+		dev->eo->init = fec_init;
+		dev->eo->halt = fec_halt;
+		dev->eo->send = fec_send;
+		dev->eo->recv = fec_recv;
 
 		eth_register(dev);
 

index 3c71219..e56bfdf 100644
@@ -372,10 +372,10 @@ int mpc82xx_scc_enet_initialize(bd_t *bis)
 	memset(dev, 0, sizeof *dev);
 
 	sprintf(dev->name, "SCC");
-	dev->init   = sec_init;
-	dev->halt   = sec_halt;
-	dev->send   = sec_send;
-	dev->recv   = sec_rx;
+	dev->eo->init   = sec_init;
+	dev->eo->halt   = sec_halt;
+	dev->eo->send   = sec_send;
+	dev->eo->recv   = sec_rx;
 
 	eth_register(dev);
 

index 7d372aa..3b9eafa 100644
@@ -447,11 +447,11 @@ int fec_initialize(bd_t *bis)
 
 		sprintf(dev->name, "FCC%d",
 			ether_fcc_info[i].ether_index + 1);
-		dev->priv   = &ether_fcc_info[i];
-		dev->init   = fec_init;
-		dev->halt   = fec_halt;
-		dev->send   = fec_send;
-		dev->recv   = fec_recv;
+		dev->priv = &ether_fcc_info[i];
+		dev->eo->init = fec_init;
+		dev->eo->halt = fec_halt;
+		dev->eo->send = fec_send;
+		dev->eo->recv = fec_recv;
 
 		eth_register(dev);
 

index b348a98..5934d92 100644
@@ -178,10 +178,10 @@ int fec_initialize(bd_t *bis)
 		efis->actual_phy_addr = -1;
 
 		dev->priv = efis;
-		dev->init = fec_init;
-		dev->halt = fec_halt;
-		dev->send = fec_send;
-		dev->recv = fec_recv;
+		dev->eo->init = fec_init;
+		dev->eo->halt = fec_halt;
+		dev->eo->send = fec_send;
+		dev->eo->recv = fec_recv;
 
 		eth_register(dev);
 

index 2c93e24..801c689 100644
@@ -80,10 +80,10 @@ int scc_initialize(bd_t *bis)
 	sprintf(dev->name, "SCC");
 	dev->iobase = 0;
 	dev->priv   = 0;
-	dev->init   = scc_init;
-	dev->halt   = scc_halt;
-	dev->send   = scc_send;
-	dev->recv   = scc_recv;
+	dev->eo->init = scc_init;
+	dev->eo->halt = scc_halt;
+	dev->eo->send = scc_send;
+	dev->eo->recv = scc_recv;
 
 	eth_register(dev);
 

index 1874cd1..226b964 100644
@@ -259,10 +259,10 @@ void mv6436x_eth_initialize (bd_t * bis)
 		/* ronen - set the MAC addr in the HW */
 		eth_port_uc_addr_set (devnum, dev->enetaddr, 0);
 
-		dev->init = (void *) db64360_eth_probe;
-		dev->halt = (void *) ethernet_phy_reset;
-		dev->send = (void *) db64360_eth_transmit;
-		dev->recv = (void *) db64360_eth_poll;
+		dev->eo->init = (void *) db64360_eth_probe;
+		dev->eo->halt = (void *) ethernet_phy_reset;
+		dev->eo->send = (void *) db64360_eth_transmit;
+		dev->eo->recv = (void *) db64360_eth_poll;
 
 		ethernet_private = calloc (sizeof (*ethernet_private), 1);
 		dev->priv = (void *) ethernet_private;

index a24a7e8..df09be1 100644
@@ -259,10 +259,10 @@ void mv6446x_eth_initialize (bd_t * bis)
 		/* ronen - set the MAC addr in the HW */
 		eth_port_uc_addr_set (devnum, dev->enetaddr, 0);
 
-		dev->init = (void *) db64460_eth_probe;
-		dev->halt = (void *) ethernet_phy_reset;
-		dev->send = (void *) db64460_eth_transmit;
-		dev->recv = (void *) db64460_eth_poll;
+		dev->eo->init = (void *) db64460_eth_probe;
+		dev->eo->halt = (void *) ethernet_phy_reset;
+		dev->eo->send = (void *) db64460_eth_transmit;
+		dev->eo->recv = (void *) db64460_eth_poll;
 
 		ethernet_private = calloc (sizeof (*ethernet_private), 1);
 		dev->priv = (void *)ethernet_private;

index c45c94b..6463a08 100644
@@ -284,7 +284,7 @@ int board_eth_init(bd_t *bis)
 
 	/* provide the resulting addr to the driver */
 	memcpy(dev->enetaddr, mac_addr, 6);
-	dev->write_hwaddr(dev);
+	dev->eo->write_hwaddr(dev);
 
 	return 0;
 }

index 9455b62..8be3f9b 100644
@@ -259,10 +259,10 @@ void mv6436x_eth_initialize (bd_t * bis)
 		/* ronen - set the MAC addr in the HW */
 		eth_port_uc_addr_set (devnum, dev->enetaddr, 0);
 
-		dev->init = (void *) db64360_eth_probe;
-		dev->halt = (void *) ethernet_phy_reset;
-		dev->send = (void *) db64360_eth_transmit;
-		dev->recv = (void *) db64360_eth_poll;
+		dev->eo->init = (void *) db64360_eth_probe;
+		dev->eo->halt = (void *) ethernet_phy_reset;
+		dev->eo->send = (void *) db64360_eth_transmit;
+		dev->eo->recv = (void *) db64360_eth_poll;
 
 		ethernet_private =
 			calloc (sizeof (*ethernet_private), 1);

index a3a3276..783e0ae 100644
@@ -720,10 +720,10 @@ gt6426x_eth_initialize(bd_t *bis)
 				s = (*e) ? e+1 : e;
 		}
 
-		dev->init = (void*)gt6426x_eth_probe;
-		dev->halt = (void*)gt6426x_eth_reset;
-		dev->send = (void*)gt6426x_eth_transmit;
-		dev->recv = (void*)gt6426x_eth_poll;
+		dev->eo->init = (void *)gt6426x_eth_probe;
+		dev->eo->halt = (void *)gt6426x_eth_reset;
+		dev->eo->send = (void *)gt6426x_eth_transmit;
+		dev->eo->recv = (void *)gt6426x_eth_poll;
 
 		p = calloc( sizeof(*p), 1 );
 		dev->priv = (void*)p;

index 06f816d..69c2dba 100644
@@ -309,10 +309,10 @@ void mv6446x_eth_initialize (bd_t * bis)
 		/* ronen - set the MAC addr in the HW */
 		eth_port_uc_addr_set (devnum, dev->enetaddr, 0);
 
-		dev->init = (void *) db64460_eth_probe;
-		dev->halt = (void *) ethernet_phy_reset;
-		dev->send = (void *) db64460_eth_transmit;
-		dev->recv = (void *) db64460_eth_poll;
+		dev->eo->init = (void *) db64460_eth_probe;
+		dev->eo->halt = (void *) ethernet_phy_reset;
+		dev->eo->send = (void *) db64460_eth_transmit;
+		dev->eo->recv = (void *) db64460_eth_poll;
 
 		ethernet_private = calloc (sizeof (*ethernet_private), 1);
 		dev->priv = (void *)ethernet_private;

index 7c6e362..27b66dd 100644
@@ -2023,10 +2023,10 @@ int ppc_4xx_eth_initialize (bd_t * bis)
 
 		sprintf (dev->name, "ppc_4xx_eth%d", eth_num - CONFIG_EMAC_NR_START);
 		dev->priv = (void *) hw;
-		dev->init = ppc_4xx_eth_init;
-		dev->halt = ppc_4xx_eth_halt;
-		dev->send = ppc_4xx_eth_send;
-		dev->recv = ppc_4xx_eth_rx;
+		dev->eo->init = ppc_4xx_eth_init;
+		dev->eo->halt = ppc_4xx_eth_halt;
+		dev->eo->send = ppc_4xx_eth_send;
+		dev->eo->recv = ppc_4xx_eth_rx;
 
 		eth_register(dev);
 

index de517f8..ee1a1f6 100644
@@ -951,11 +951,11 @@ int altera_tse_initialize(u8 dev_num, int mac_base,
 
 	/* init eth structure */
 	dev->priv = priv;
-	dev->init = tse_eth_init;
-	dev->halt = tse_eth_halt;
-	dev->send = tse_eth_send;
-	dev->recv = tse_eth_rx;
-	dev->write_hwaddr = tse_set_mac_address;
+	dev->eo->init = tse_eth_init;
+	dev->eo->halt = tse_eth_halt;
+	dev->eo->send = tse_eth_send;
+	dev->eo->recv = tse_eth_rx;
+	dev->eo->write_hwaddr = tse_set_mac_address;
 	sprintf(dev->name, "%s-%hu", "ALTERA_TSE", dev_num);
 
 	eth_register(dev);

index ed7cf20..f256381 100644
@@ -718,10 +718,10 @@ int armada100_fec_register(unsigned long base_addr)
 	/* must be less than sizeof(dev->name) */
 	strcpy(dev->name, "armd-fec0");
 
-	dev->init = armdfec_init;
-	dev->halt = armdfec_halt;
-	dev->send = armdfec_send;
-	dev->recv = armdfec_recv;
+	dev->eo->init = armdfec_init;
+	dev->eo->halt = armdfec_halt;
+	dev->eo->send = armdfec_send;
+	dev->eo->recv = armdfec_recv;
 
 	eth_register(dev);
 

index 2fa6b68..3395dcc 100644
@@ -518,11 +518,11 @@ int at91emac_register(bd_t *bis, unsigned long iobase)
 	sprintf(dev->name, "emac");
 	dev->iobase = iobase;
 	dev->priv = emacfix;
-	dev->init = at91emac_init;
-	dev->halt = at91emac_halt;
-	dev->send = at91emac_send;
-	dev->recv = at91emac_recv;
-	dev->write_hwaddr = at91emac_write_hwaddr;
+	dev->eo->init = at91emac_init;
+	dev->eo->halt = at91emac_halt;
+	dev->eo->send = at91emac_send;
+	dev->eo->recv = at91emac_recv;
+	dev->eo->write_hwaddr = at91emac_write_hwaddr;
 
 	eth_register(dev);
 

index f501768..464f261 100644
@@ -725,10 +725,10 @@ int ax88180_initialize (bd_t * bis)
 	sprintf (dev->name, "ax88180");
 	dev->iobase = AX88180_BASE;
 	dev->priv = priv;
-	dev->init = ax88180_init;
-	dev->halt = ax88180_halt;
-	dev->send = ax88180_send;
-	dev->recv = ax88180_recv;
+	dev->eo->init = ax88180_init;
+	dev->eo->halt = ax88180_halt;
+	dev->eo->send = ax88180_send;
+	dev->eo->recv = ax88180_recv;
 
 	priv->BusWidth = BUS_WIDTH_32;
 	priv->PadSize = 3;

index c63398e..ef4736f 100644
@@ -103,11 +103,11 @@ int bfin_EMAC_initialize(bd_t *bis)
 
 	dev->iobase = 0;
 	dev->priv = 0;
-	dev->init = bfin_EMAC_init;
-	dev->halt = bfin_EMAC_halt;
-	dev->send = bfin_EMAC_send;
-	dev->recv = bfin_EMAC_recv;
-	dev->write_hwaddr = bfin_EMAC_setup_addr;
+	dev->eo->init = bfin_EMAC_init;
+	dev->eo->halt = bfin_EMAC_halt;
+	dev->eo->send = bfin_EMAC_send;
+	dev->eo->recv = bfin_EMAC_recv;
+	dev->eo->write_hwaddr = bfin_EMAC_setup_addr;
 
 	eth_register(dev);
 

index e3553d6..2346feb 100644
@@ -543,10 +543,10 @@ int calxedaxgmac_initialize(u32 id, ulong base_addr)
 	macaddr[0] = readl(&regs->macaddr[0].lo);
 	memcpy(dev->enetaddr, macaddr, 6);
 
-	dev->init = xgmac_init;
-	dev->send = xgmac_tx;
-	dev->recv = xgmac_rx;
-	dev->halt = xgmac_halt;
+	dev->eo->init = xgmac_init;
+	dev->eo->send = xgmac_tx;
+	dev->eo->recv = xgmac_rx;
+	dev->eo->halt = xgmac_halt;
 
 	eth_register(dev);
 

index af3d859..c120d4e 100644
@@ -974,10 +974,10 @@ int cpsw_register(struct cpsw_platform_data *data)
 
 	strcpy(dev->name, "cpsw");
 	dev->iobase	= 0;
-	dev->init	= cpsw_init;
-	dev->halt	= cpsw_halt;
-	dev->send	= cpsw_send;
-	dev->recv	= cpsw_recv;
+	dev->eo->init	= cpsw_init;
+	dev->eo->halt	= cpsw_halt;
+	dev->eo->send	= cpsw_send;
+	dev->eo->recv	= cpsw_recv;
 	dev->priv	= priv;
 
 	eth_register(dev);

index 6aaa0cf..65a4254 100644
@@ -320,10 +320,10 @@ int cs8900_initialize(u8 dev_num, int base_addr)
 
 	dev->iobase = base_addr;
 	dev->priv = priv;
-	dev->init = cs8900_init;
-	dev->halt = cs8900_halt;
-	dev->send = cs8900_send;
-	dev->recv = cs8900_recv;
+	dev->eo->init = cs8900_init;
+	dev->eo->halt = cs8900_halt;
+	dev->eo->send = cs8900_send;
+	dev->eo->recv = cs8900_recv;
 
 	/* Load MAC address from EEPROM */
 	cs8900_get_enetaddr(dev);

index 1db586d..a221092 100644
@@ -791,11 +791,11 @@ int davinci_emac_initialize(void)
 	sprintf(dev->name, "DaVinci-EMAC");
 
 	dev->iobase = 0;
-	dev->init = davinci_eth_open;
-	dev->halt = davinci_eth_close;
-	dev->send = davinci_eth_send_packet;
-	dev->recv = davinci_eth_rcv_packet;
-	dev->write_hwaddr = davinci_eth_set_mac_addr;
+	dev->eo->init = davinci_eth_open;
+	dev->eo->halt = davinci_eth_close;
+	dev->eo->send = davinci_eth_send_packet;
+	dev->eo->recv = davinci_eth_rcv_packet;
+	dev->eo->write_hwaddr = davinci_eth_set_mac_addr;
 
 	eth_register(dev);
 

index d9fcb5a..0361699 100644
@@ -300,10 +300,10 @@ int dc21x4x_initialize(bd_t *bis)
 		dev->iobase = pci_mem_to_phys(devbusfn, iobase);
 #endif
 		dev->priv   = (void*) devbusfn;
-		dev->init   = dc21x4x_init;
-		dev->halt   = dc21x4x_halt;
-		dev->send   = dc21x4x_send;
-		dev->recv   = dc21x4x_recv;
+		dev->eo->init   = dc21x4x_init;
+		dev->eo->halt   = dc21x4x_halt;
+		dev->eo->send   = dc21x4x_send;
+		dev->eo->recv   = dc21x4x_recv;
 
 		/* Ensure we're not sleeping. */
 		pci_write_config_byte(devbusfn, PCI_CFDA_PSM, WAKEUP);

index bf21a08..2d92591 100644
@@ -559,11 +559,11 @@ int designware_initialize(u32 id, ulong base_addr, u32 phy_addr, u32 interface)
 	priv->phy_configured = 0;
 	priv->interface = interface;
 
-	dev->init = dw_eth_init;
-	dev->send = dw_eth_send;
-	dev->recv = dw_eth_recv;
-	dev->halt = dw_eth_halt;
-	dev->write_hwaddr = dw_write_hwaddr;
+	dev->eo->init = dw_eth_init;
+	dev->eo->send = dw_eth_send;
+	dev->eo->recv = dw_eth_recv;
+	dev->eo->halt = dw_eth_halt;
+	dev->eo->write_hwaddr = dw_write_hwaddr;
 
 	eth_register(dev);
 

index f0c4499..bd96948 100644
@@ -630,10 +630,10 @@ int dm9000_initialize(bd_t *bis)
 	/* Load MAC address from EEPROM */
 	dm9000_get_enetaddr(dev);
 
-	dev->init = dm9000_init;
-	dev->halt = dm9000_halt;
-	dev->send = dm9000_send;
-	dev->recv = dm9000_rx;
+	dev->eo->init = dm9000_init;
+	dev->eo->halt = dm9000_halt;
+	dev->eo->send = dm9000_send;
+	dev->eo->recv = dm9000_rx;
 	sprintf(dev->name, "dm9000");
 
 	eth_register(dev);

index 944a0c0..be0891f 100644
@@ -374,13 +374,13 @@ int dnet_eth_initialize(int id, void *regs, unsigned int phy_addr)
 	dnet->phy_addr = phy_addr;
 
 	sprintf(netdev->name, "dnet%d", id);
-	netdev->init = dnet_init;
-	netdev->halt = dnet_halt;
-	netdev->send = dnet_send;
-	netdev->recv = dnet_recv;
+	netdev->eo->init = dnet_init;
+	netdev->eo->halt = dnet_halt;
+	netdev->eo->send = dnet_send;
+	netdev->eo->recv = dnet_recv;
 
 	dev_capa = readl(&dnet->regs->VERCAPS) & 0xFFFF;
-	debug("%s: has %smdio, %sirq, %sgigabit, %sdma \n", netdev->name,
+	debug("%s: has %smdio, %sirq, %sgigabit, %sdma\n", netdev->name,
 		(dev_capa & DNET_HAS_MDIO) ? "" : "no ",
 		(dev_capa & DNET_HAS_IRQ) ? "" : "no ",
 		(dev_capa & DNET_HAS_GIGABIT) ? "" : "no ",

index 2d4da4b..c9f9fb3 100644
@@ -5218,10 +5218,10 @@ e1000_initialize(bd_t * bis)
 		       nic->enetaddr[3], nic->enetaddr[4], nic->enetaddr[5]);
 
 		/* Set up the function pointers and register the device */
-		nic->init = e1000_init;
-		nic->recv = e1000_poll;
-		nic->send = e1000_transmit;
-		nic->halt = e1000_disable;
+		nic->eo->init = e1000_init;
+		nic->eo->recv = e1000_poll;
+		nic->eo->send = e1000_transmit;
+		nic->eo->halt = e1000_disable;
 		eth_register(nic);
 	}
 

index d2c8277..e3aa720 100644
@@ -458,10 +458,10 @@ int eepro100_initialize (bd_t * bis)
 		sprintf (dev->name, "i82559#%d", card_number);
 		dev->priv = (void *) devno; /* this have to come before bus_to_phys() */
 		dev->iobase = bus_to_phys (iobase);
-		dev->init = eepro100_init;
-		dev->halt = eepro100_halt;
-		dev->send = eepro100_send;
-		dev->recv = eepro100_recv;
+		dev->eo->init = eepro100_init;
+		dev->eo->halt = eepro100_halt;
+		dev->eo->send = eepro100_send;
+		dev->eo->recv = eepro100_recv;
 
 		eth_register (dev);
 

index c55667c..95f0b93 100644
@@ -962,11 +962,11 @@ int enc28j60_initialize(unsigned int bus, unsigned int cs,
 	enc->dev = dev;
 	/* now fill the eth_device object */
 	dev->priv = enc;
-	dev->init = enc_init;
-	dev->halt = enc_halt;
-	dev->send = enc_send;
-	dev->recv = enc_recv;
-	dev->write_hwaddr = enc_write_hwaddr;
+	dev->eo->init = enc_init;
+	dev->eo->halt = enc_halt;
+	dev->eo->send = enc_send;
+	dev->eo->recv = enc_recv;
+	dev->eo->write_hwaddr = enc_write_hwaddr;
 	sprintf(dev->name, "enc%i.%i", bus, cs);
 	eth_register(dev);
 #if defined(CONFIG_CMD_MII)

index 245ad1c..0b5cb3c 100644
@@ -499,10 +499,10 @@ int ep93xx_eth_initialize(u8 dev_num, int base_addr)
 
 	dev->iobase = base_addr;
 	dev->priv = priv;
-	dev->init = ep93xx_eth_open;
-	dev->halt = ep93xx_eth_close;
-	dev->send = ep93xx_eth_send_packet;
-	dev->recv = ep93xx_eth_rcv_packet;
+	dev->eo->init = ep93xx_eth_open;
+	dev->eo->halt = ep93xx_eth_close;
+	dev->eo->send = ep93xx_eth_send_packet;
+	dev->eo->recv = ep93xx_eth_rcv_packet;
 
 	sprintf(dev->name, "ep93xx_eth-%hu", dev_num);
 

index af06d4f..946b8e2 100644
@@ -499,11 +499,11 @@ int ethoc_initialize(u8 dev_num, int base_addr)
 	memset(dev, 0, sizeof(*dev));
 	dev->priv = priv;
 	dev->iobase = base_addr;
-	dev->init = ethoc_init;
-	dev->halt = ethoc_halt;
-	dev->send = ethoc_send;
-	dev->recv = ethoc_recv;
-	dev->write_hwaddr = ethoc_set_mac_address;
+	dev->eo->init = ethoc_init;
+	dev->eo->halt = ethoc_halt;
+	dev->eo->send = ethoc_send;
+	dev->eo->recv = ethoc_recv;
+	dev->eo->write_hwaddr = ethoc_set_mac_address;
 	sprintf(dev->name, "%s-%hu", "ETHOC", dev_num);
 
 	eth_register(dev);

index 3e232c7..f8a5556 100644
@@ -943,11 +943,11 @@ static int fec_probe(bd_t *bd, int dev_id, int phy_id, uint32_t base_addr)
 	memset(fec, 0, sizeof(*fec));
 
 	edev->priv = fec;
-	edev->init = fec_init;
-	edev->send = fec_send;
-	edev->recv = fec_recv;
-	edev->halt = fec_halt;
-	edev->write_hwaddr = fec_set_hwaddr;
+	edev->eo->init = fec_init;
+	edev->eo->send = fec_send;
+	edev->eo->recv = fec_recv;
+	edev->eo->halt = fec_halt;
+	edev->eo->write_hwaddr = fec_set_hwaddr;
 
 	fec->eth = (struct ethernet_regs *)base_addr;
 	fec->bd = bd;

index 2b616ad..8d881d4 100644
@@ -653,10 +653,10 @@ int fm_eth_initialize(struct ccsr_fman *reg, struct fm_eth_info *info)
 	devlist[num_controllers++] = dev;
 	dev->iobase = 0;
 	dev->priv = (void *)fm_eth;
-	dev->init = fm_eth_open;
-	dev->halt = fm_eth_halt;
-	dev->send = fm_eth_send;
-	dev->recv = fm_eth_recv;
+	dev->eo->init = fm_eth_open;
+	dev->eo->halt = fm_eth_halt;
+	dev->eo->send = fm_eth_send;
+	dev->eo->recv = fm_eth_recv;
 	fm_eth->dev = dev;
 	fm_eth->bus = info->bus;
 	fm_eth->phyaddr = info->phy_addr;

index 63842cd..2e70d22 100644
@@ -533,10 +533,10 @@ int mcdmafec_initialize(bd_t * bis)
 		sprintf(dev->name, "FEC%d", fec_info[i].index);
 
 		dev->priv = &fec_info[i];
-		dev->init = fec_init;
-		dev->halt = fec_halt;
-		dev->send = fec_send;
-		dev->recv = fec_recv;
+		dev->eo->init = fec_init;
+		dev->eo->halt = fec_halt;
+		dev->eo->send = fec_send;
+		dev->eo->recv = fec_recv;
 
 		/* setup Receive and Transmit buffer descriptor */
 #ifdef CONFIG_SYS_DMA_USE_INTSRAM

index 69ba57d..76391c1 100644
@@ -548,10 +548,10 @@ int ftgmac100_initialize(bd_t *bd)
 
 	sprintf(dev->name, "FTGMAC100");
 	dev->iobase	= CONFIG_FTGMAC100_BASE;
-	dev->init	= ftgmac100_init;
-	dev->halt	= ftgmac100_halt;
-	dev->send	= ftgmac100_send;
-	dev->recv	= ftgmac100_recv;
+	dev->eo->init	= ftgmac100_init;
+	dev->eo->halt	= ftgmac100_halt;
+	dev->eo->send	= ftgmac100_send;
+	dev->eo->recv	= ftgmac100_recv;
 	dev->priv	= priv;
 
 	eth_register(dev);

index fdd3ec0..6fd2bde 100644
@@ -260,10 +260,10 @@ int ftmac100_initialize (bd_t *bd)
 
 	sprintf (dev->name, "FTMAC100");
 	dev->iobase	= CONFIG_FTMAC100_BASE;
-	dev->init	= ftmac100_init;
-	dev->halt	= ftmac100_halt;
-	dev->send	= ftmac100_send;
-	dev->recv	= ftmac100_recv;
+	dev->eo->init	= ftmac100_init;
+	dev->eo->halt	= ftmac100_halt;
+	dev->eo->send	= ftmac100_send;
+	dev->eo->recv	= ftmac100_recv;
 	dev->priv	= priv;
 
 	eth_register (dev);

index 3103a74..150dccf 100644
@@ -623,10 +623,10 @@ int greth_initialize(bd_t * bis)
 	debug("Found GRETH at %p, irq %d\n", greth->regs, greth->irq);
 	dev->priv = (void *)greth;
 	dev->iobase = (unsigned int)greth->regs;
-	dev->init = greth_init;
-	dev->halt = greth_halt;
-	dev->send = greth_send;
-	dev->recv = greth_recv;
+	dev->eo->init = greth_init;
+	dev->eo->halt = greth_halt;
+	dev->eo->send = greth_send;
+	dev->eo->recv = greth_recv;
 	greth->dev = dev;
 
 	/* Reset Core */

index f0f62de..216122d 100644
@@ -189,10 +189,10 @@ int inca_switch_initialize(bd_t * bis)
 #endif
 
 	sprintf(dev->name, "INCA-IP Switch");
-	dev->init = inca_switch_init;
-	dev->halt = inca_switch_halt;
-	dev->send = inca_switch_send;
-	dev->recv = inca_switch_recv;
+	dev->eo->init = inca_switch_init;
+	dev->eo->halt = inca_switch_halt;
+	dev->eo->send = inca_switch_send;
+	dev->eo->recv = inca_switch_recv;
 
 	eth_register(dev);
 

index b4904b6..b0703ef 100644
@@ -230,10 +230,10 @@ int ks8695_eth_initialize(void)
 	memset(dev, 0, sizeof(*dev));
 
 	dev->iobase = KS8695_IO_BASE + KS8695_LAN_DMA_TX;
-	dev->init = ks8695_eth_init;
-	dev->halt = ks8695_eth_halt;
-	dev->send = ks8695_eth_send;
-	dev->recv = ks8695_eth_recv;
+	dev->eo->init = ks8695_eth_init;
+	dev->eo->halt = ks8695_eth_halt;
+	dev->eo->send = ks8695_eth_send;
+	dev->eo->recv = ks8695_eth_recv;
 	strcpy(dev->name, "ks8695eth");
 
 	eth_register(dev);

index 11d350e..d87302b 100644
@@ -806,10 +806,10 @@ int lan91c96_initialize(u8 dev_num, int base_addr)
 	}
 	get_rom_mac(dev, dev->enetaddr);
 
-	dev->init = lan91c96_init;
-	dev->halt = lan91c96_halt;
-	dev->send = lan91c96_send;
-	dev->recv = lan91c96_recv;
+	dev->eo->init = lan91c96_init;
+	dev->eo->halt = lan91c96_halt;
+	dev->eo->send = lan91c96_send;
+	dev->eo->recv = lan91c96_recv;
 	sprintf(dev->name, "%s-%hu", supported_chips[r].name, dev_num);
 
 	eth_register(dev);