コミット: e8d79dcb72f7625af8ad5d6542982f6a3b86dfc8 - uboot (git)

コミットメタ情報

• リビジョン: e8d79dcb72f7625af8ad5d6542982f6a3b86dfc8 (tree)
• 日時: 2016-05-22 22:22:56
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

ne2000: private data for dynamic allocation

driver private data assigned to heap

Signed-off-by: Yoshinori Sato <[e-mail]>

変更サマリ

• modified: drivers/net/8390.h
• modified: drivers/net/ne2000.c
• modified: drivers/net/ne2000_base.c
• modified: drivers/net/ne2000_base.h

差分

--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -41,8 +41,8 @@ are GPL, so this is, of course, GPL.
  *      - removed AMIGA_PCMCIA from this list, handled as ISA io now
  */
 
-#define n2k_inb(port)   (*((volatile unsigned char *)(port+CONFIG_DRIVER_NE2000_BASE)))
-#define n2k_outb(val,port)  (*((volatile unsigned char *)(port+CONFIG_DRIVER_NE2000_BASE)) = val)
+#define n2k_inb(base, port)   (*((volatile unsigned char *)(port+base)))
+#define n2k_outb(val, base, port)  (*((volatile unsigned char *)(port+base)) = val)
 
 #define EI_SHIFT(x)	(x)
 

--- a/drivers/net/ne2000.c
+++ b/drivers/net/ne2000.c
@@ -178,23 +178,23 @@ static void pcnet_reset_8390(u8* addr)
 {
 	int i, r;
 
-	n2k_outb(E8390_NODMA + E8390_PAGE0+E8390_STOP, E8390_CMD);
-	PRINTK("cmd (at %lx) is %x\n", addr + E8390_CMD, n2k_inb(E8390_CMD));
-	n2k_outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, E8390_CMD);
-	PRINTK("cmd (at %lx) is %x\n", addr + E8390_CMD, n2k_inb(E8390_CMD));
-	n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD);
-	PRINTK("cmd (at %lx) is %x\n", addr + E8390_CMD, n2k_inb(E8390_CMD));
-	n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD);
+	n2k_outb(E8390_NODMA + E8390_PAGE0+E8390_STOP, addr, E8390_CMD);
+	PRINTK("cmd (at %lx) is %x\n", addr + E8390_CMD, n2k_inb(addr,E8390_CMD));
+	n2k_outb(E8390_NODMA+E8390_PAGE1+E8390_STOP, addr, E8390_CMD);
+	PRINTK("cmd (at %lx) is %x\n", addr + E8390_CMD, n2k_inb(addr, E8390_CMD));
+	n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, addr, E8390_CMD);
+	PRINTK("cmd (at %lx) is %x\n", addr + E8390_CMD, n2k_inb(addr, E8390_CMD));
+	n2k_outb(E8390_NODMA+E8390_PAGE0+E8390_STOP, addr, E8390_CMD);
 
-	n2k_outb(n2k_inb(PCNET_RESET), PCNET_RESET);
+	n2k_outb(n2k_inb(addr, PCNET_RESET), addr, PCNET_RESET);
 
 	for (i = 0; i < 100; i++) {
-		if ((r = (n2k_inb(EN0_ISR) & ENISR_RESET)) != 0)
+		if ((r = (n2k_inb(addr, EN0_ISR) & ENISR_RESET)) != 0)
 			break;
 		PRINTK("got %x in reset\n", r);
 		udelay(100);
 	}
-	n2k_outb(ENISR_RESET, EN0_ISR); /* Ack intr. */
+	n2k_outb(ENISR_RESET, addr, EN0_ISR); /* Ack intr. */
 
 	if (i == 100)
 		printf("pcnet_reset_8390() did not complete.\n");
@@ -229,11 +229,11 @@ int get_prom(u8* mac_addr, u8* base_addr)
 	mdelay (10);
 
 	for (i = 0; i < ARRAY_SIZE(program_seq); i++)
-		n2k_outb (program_seq[i].value, program_seq[i].offset);
+		n2k_outb (program_seq[i].value, base_addr, program_seq[i].offset);
 
 	PRINTK ("PROM:");
 	for (i = 0; i < 32; i++) {
-		prom[i] = n2k_inb (PCNET_DATAPORT);
+		prom[i] = n2k_inb (base_addr, PCNET_DATAPORT);
 		PRINTK (" %02x", prom[i]);
 	}
 	PRINTK ("\n");

--- a/drivers/net/ne2000_base.c
+++ b/drivers/net/ne2000_base.c
@@ -78,10 +78,6 @@ Add SNMP
 #include <malloc.h>
 #include <linux/compiler.h>
 
-/* forward definition of function used for the uboot interface */
-void uboot_push_packet_len(int len);
-void uboot_push_tx_done(int key, int val);
-
 /* NE2000 base header file */
 #include "ne2000_base.h"
 
@@ -93,24 +89,23 @@ void uboot_push_tx_done(int key, int val);
 #include "ne2000.h"
 #endif
 
-static dp83902a_priv_data_t nic; /* just one instance of the card supported */
+/* forward definition of function used for the uboot interface */
+static void uboot_push_packet_len(dp83902a_priv_data_t *dp, u8 *base, int len);
+static void uboot_push_tx_done(dp83902a_priv_data_t *dp, int key, int val);
 
 /**
  * This function reads the MAC address from the serial EEPROM,
  * used if PROM read fails. Does nothing for ax88796 chips (sh boards)
  */
 static bool
-dp83902a_init(unsigned char *enetaddr)
+dp83902a_init(u8 *base, u8 enetaddr[])
 {
-	dp83902a_priv_data_t *dp = &nic;
-	u8* base;
 #if defined(NE2000_BASIC_INIT)
 	int i;
 #endif
 
 	DEBUG_FUNCTION();
 
-	base = dp->base;
 	if (!base)
 		return false;	/* No device found */
 
@@ -122,29 +117,25 @@ dp83902a_init(unsigned char *enetaddr)
 	DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE1);	/* Select page 1 */
 	/* Use the address from the serial EEPROM */
 	for (i = 0; i < 6; i++)
-		DP_IN(base, DP_P1_PAR0+i, dp->esa[i]);
+		DP_IN(base, DP_P1_PAR0+i, enetaddr[i]);
 	DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0);	/* Select page 0 */
 
 	printf("NE2000 - %s ESA: %02x:%02x:%02x:%02x:%02x:%02x\n",
 		"eeprom",
-		dp->esa[0],
-		dp->esa[1],
-		dp->esa[2],
-		dp->esa[3],
-		dp->esa[4],
-		dp->esa[5] );
-
-	memcpy(enetaddr, dp->esa, 6); /* Use MAC from serial EEPROM */
+		enetaddr[0],
+		enetaddr[1],
+		enetaddr[2],
+		enetaddr[3],
+		enetaddr[4],
+		enetaddr[5] );
+
 #endif	/* NE2000_BASIC_INIT */
 	return true;
 }
 
 static void
-dp83902a_stop(void)
+dp83902a_stop(dp83902a_priv_data_t *dp, u8 *base)
 {
-	dp83902a_priv_data_t *dp = &nic;
-	u8 *base = dp->base;
-
 	DEBUG_FUNCTION();
 
 	DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_STOP);	/* Brutal */
@@ -161,13 +152,11 @@ dp83902a_stop(void)
  * the hardware ready to send/receive packets.
  */
 static void
-dp83902a_start(u8 * enaddr)
+dp83902a_start(dp83902a_priv_data_t *dp, u8 *base, u8 enetaddr[])
 {
-	dp83902a_priv_data_t *dp = &nic;
-	u8 *base = dp->base;
 	int i;
 
-	debug("The MAC is %pM\n", enaddr);
+	debug("The MAC is %pM\n", enetaddr);
 
 	DEBUG_FUNCTION();
 
@@ -196,7 +185,7 @@ dp83902a_start(u8 * enaddr)
 		/* FIXME */
 		/*((vu_short*)( base + ((DP_P1_PAR0 + i) * 2) +
 		 * 0x1400)) = enaddr[i];*/
-		DP_OUT(base, DP_P1_PAR0+i, enaddr[i]);
+		DP_OUT(base, DP_P1_PAR0+i, enetaddr[i]);
 	}
 	/* Enable and start device */
 	DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_NODMA | DP_CR_START);
@@ -212,10 +201,9 @@ dp83902a_start(u8 * enaddr)
  */
 
 static void
-dp83902a_start_xmit(int start_page, int len)
+dp83902a_start_xmit(dp83902a_priv_data_t *dp, u8 *base,
+		    int start_page, int len)
 {
-	dp83902a_priv_data_t *dp = (dp83902a_priv_data_t *) &nic;
-	u8 *base = dp->base;
 
 	DEBUG_FUNCTION();
 
@@ -240,10 +228,9 @@ dp83902a_start_xmit(int start_page, int len)
  * that there is free buffer space (dp->tx_next).
  */
 static void
-dp83902a_send(u8 *data, int total_len, u32 key)
+dp83902a_send(dp83902a_priv_data_t *dp, u8 *base,
+	      u8 *data, int total_len, u32 key)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
-	u8 *base = dp->base;
 	int len, start_page, pkt_len, i, isr;
 #if DEBUG & 4
 	int dx;
@@ -288,7 +275,7 @@ dp83902a_send(u8 *data, int total_len, u32 key)
 		DP_OUT(base, DP_RBCL, len);
 		DP_OUT(base, DP_RBCH, 0);
 		DP_OUT(base, DP_CR, DP_CR_PAGE0 | DP_CR_RDMA | DP_CR_START);
-		DP_IN_DATA(dp->data, tmp);
+		DP_IN_DATA(base + DP_DATA, tmp);
 	}
 
 #ifdef CYGHWR_NS_DP83902A_PLF_BROKEN_TX_DMA
@@ -317,7 +304,7 @@ dp83902a_send(u8 *data, int total_len, u32 key)
 		if (0 == (++dx % 16)) printf("\n ");
 #endif
 
-		DP_OUT_DATA(dp->data, *data++);
+		DP_OUT_DATA(base + DP_DATA, *data++);
 		len--;
 	}
 #if DEBUG & 4
@@ -330,7 +317,7 @@ dp83902a_send(u8 *data, int total_len, u32 key)
 		/* Padding to 802.3 length was required */
 		for (i = total_len; i < pkt_len;) {
 			i++;
-			DP_OUT_DATA(dp->data, 0);
+			DP_OUT_DATA(base + DP_DATA, 0);
 		}
 	}
 
@@ -358,7 +345,7 @@ dp83902a_send(u8 *data, int total_len, u32 key)
 		} else {
 			dp->tx_int = 2; /* Expecting interrupt from BUF2 */
 		}
-		dp83902a_start_xmit(start_page, pkt_len);
+		dp83902a_start_xmit(dp, base, start_page, pkt_len);
 	}
 }
 
@@ -370,10 +357,8 @@ dp83902a_send(u8 *data, int total_len, u32 key)
  * 'dp83902a_recv' will be called to actually fetch it from the hardware.
  */
 static void
-dp83902a_RxEvent(void)
+dp83902a_RxEvent(dp83902a_priv_data_t *dp, u8 *base)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
-	u8 *base = dp->base;
 	__maybe_unused u8 rsr;
 	u8 rcv_hdr[4];
 	int i, len, pkt, cur;
@@ -415,7 +400,7 @@ dp83902a_RxEvent(void)
 
 		/* read header (get data size)*/
 		for (i = 0; i < sizeof(rcv_hdr);) {
-			DP_IN_DATA(dp->data, rcv_hdr[i++]);
+			DP_IN_DATA(base + DP_DATA, rcv_hdr[i++]);
 		}
 
 #if DEBUG & 5
@@ -425,7 +410,7 @@ dp83902a_RxEvent(void)
 		len = ((rcv_hdr[3] << 8) | rcv_hdr[2]) - sizeof(rcv_hdr);
 
 		/* data read */
-		uboot_push_packet_len(len);
+		uboot_push_packet_len(dp, base, len);
 
 		if (rcv_hdr[1] == dp->rx_buf_start)
 			DP_OUT(base, DP_BNDRY, dp->rx_buf_end - 1);
@@ -442,10 +427,8 @@ dp83902a_RxEvent(void)
  * efficient processing in the upper layers of the stack.
  */
 static void
-dp83902a_recv(u8 *data, int len)
+dp83902a_recv(dp83902a_priv_data_t *dp, u8 *base, u8 *data, int len)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
-	u8 *base = dp->base;
 	int i, mlen;
 	u8 saved_char = 0;
 	bool saved;
@@ -490,7 +473,7 @@ dp83902a_recv(u8 *data, int len)
 
 				{
 					u8 tmp;
-					DP_IN_DATA(dp->data, tmp);
+					DP_IN_DATA(base + DP_DATA, tmp);
 #if DEBUG & 4
 					printf(" %02x", tmp);
 					if (0 == (++dx % 16)) printf("\n ");
@@ -507,10 +490,8 @@ dp83902a_recv(u8 *data, int len)
 }
 
 static void
-dp83902a_TxEvent(void)
+dp83902a_TxEvent(dp83902a_priv_data_t *dp, u8 *base)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
-	u8 *base = dp->base;
 	__maybe_unused u8 tsr;
 	u32 key;
 
@@ -527,16 +508,16 @@ dp83902a_TxEvent(void)
 	/* Start next packet if one is ready */
 	dp->tx_started = false;
 	if (dp->tx1) {
-		dp83902a_start_xmit(dp->tx1, dp->tx1_len);
+		dp83902a_start_xmit(dp, base, dp->tx1, dp->tx1_len);
 		dp->tx_int = 1;
 	} else if (dp->tx2) {
-		dp83902a_start_xmit(dp->tx2, dp->tx2_len);
+		dp83902a_start_xmit(dp, base, dp->tx2, dp->tx2_len);
 		dp->tx_int = 2;
 	} else {
 		dp->tx_int = 0;
 	}
 	/* Tell higher level we sent this packet */
-	uboot_push_tx_done(key, 0);
+	uboot_push_tx_done(dp, key, 0);
 }
 
 /*
@@ -544,10 +525,8 @@ dp83902a_TxEvent(void)
  * interrupt.
  */
 static void
-dp83902a_ClearCounters(void)
+dp83902a_ClearCounters(u8 *base)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
-	u8 *base = dp->base;
 	__maybe_unused u8 cnt1, cnt2, cnt3;
 
 	DP_IN(base, DP_FER, cnt1);
@@ -561,10 +540,8 @@ dp83902a_ClearCounters(void)
  * out in section 7.0 of the datasheet.
  */
 static void
-dp83902a_Overflow(void)
+dp83902a_Overflow(dp83902a_priv_data_t *dp, u8 *base)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *)&nic;
-	u8 *base = dp->base;
 	u8 isr;
 
 	/* Issue a stop command and wait 1.6ms for it to complete. */
@@ -584,7 +561,7 @@ dp83902a_Overflow(void)
 	 * interrupts. Since the buffer has overflowed, a receive event of
 	 * some kind will have occurred.
 	 */
-	dp83902a_RxEvent();
+	dp83902a_RxEvent(dp, base);
 	DP_OUT(base, DP_ISR, DP_ISR_RxP|DP_ISR_RxE);
 
 	/* Clear the overflow condition and leave loopback mode. */
@@ -602,10 +579,8 @@ dp83902a_Overflow(void)
 }
 
 static void
-dp83902a_poll(void)
+dp83902a_poll(dp83902a_priv_data_t *dp, u8 *base)
 {
-	struct dp83902a_priv_data *dp = (struct dp83902a_priv_data *) &nic;
-	u8 *base = dp->base;
 	u8 isr;
 
 	DP_OUT(base, DP_CR, DP_CR_NODMA | DP_CR_PAGE0 | DP_CR_START);
@@ -617,7 +592,7 @@ dp83902a_poll(void)
 		 * we should read their values to reset them.
 		 */
 		if (isr & DP_ISR_CNT) {
-			dp83902a_ClearCounters();
+			dp83902a_ClearCounters(base);
 		}
 		/*
 		 * Check for overflow. It's a special case, since there's a
@@ -625,7 +600,7 @@ dp83902a_poll(void)
 		 * a running state.a
 		 */
 		if (isr & DP_ISR_OFLW) {
-			dp83902a_Overflow();
+			dp83902a_Overflow(dp, base);
 		} else {
 			/*
 			 * Other kinds of interrupts can be acknowledged simply by
@@ -639,10 +614,10 @@ dp83902a_poll(void)
 			 * spuriously it seems.
 			 */
 			if (isr & (DP_ISR_TxP|DP_ISR_TxE) && dp->tx_started) {
-				dp83902a_TxEvent();
+				dp83902a_TxEvent(dp, base);
 			}
 			if (isr & (DP_ISR_RxP|DP_ISR_RxE)) {
-				dp83902a_RxEvent();
+				dp83902a_RxEvent(dp, base);
 			}
 		}
 		DP_IN(base, DP_ISR, isr);
@@ -651,26 +626,24 @@ dp83902a_poll(void)
 
 
 /* U-Boot specific routines */
-static u8 *pbuf = NULL;
-
-static int pkey = -1;
-static int initialized = 0;
 
-void uboot_push_packet_len(int len) {
+static void uboot_push_packet_len(dp83902a_priv_data_t *dp, u8 *base, int len)
+{
 	PRINTK("pushed len = %d\n", len);
 	if (len >= 2000) {
 		printf("NE2000: packet too big\n");
 		return;
 	}
-	dp83902a_recv(&pbuf[0], len);
+	dp83902a_recv(dp, base, dp->pbuf, len);
 
 	/*Just pass it to the upper layer*/
-	net_process_received_packet(&pbuf[0], len);
+	net_process_received_packet(dp->pbuf, len);
 }
 
-void uboot_push_tx_done(int key, int val) {
+void uboot_push_tx_done(dp83902a_priv_data_t *dp, int key, int val)
+{
 	PRINTK("pushed key = %d\n", key);
-	pkey = key;
+	dp->pkey = key;
 }
 
 /**
@@ -680,13 +653,13 @@ void uboot_push_tx_done(int key, int val) {
  * @param struct ethdevice of this instance of the driver for dev->enetaddr
  * @return 0 on success, -1 on error (causing caller to print error msg)
  */
-static int ne2k_setup_driver(struct eth_device *dev)
+static int ne2k_setup_driver(dp83902a_priv_data_t *dp, u8 *base, u8 enetaddr[])
 {
 	PRINTK("### ne2k_setup_driver\n");
 
-	if (!pbuf) {
-		pbuf = malloc(2000);
-		if (!pbuf) {
+	if (!dp->pbuf) {
+		dp->pbuf = malloc(2000);
+		if (!dp->pbuf) {
 			printf("Cannot allocate rx buffer\n");
 			return -1;
 		}
@@ -702,66 +675,70 @@ static int ne2k_setup_driver(struct eth_device *dev)
 	}
 #endif
 
-	nic.base = (u8 *) CONFIG_DRIVER_NE2000_BASE;
-
-	nic.data = nic.base + DP_DATA;
-	nic.tx_buf1 = START_PG;
-	nic.tx_buf2 = START_PG2;
-	nic.rx_buf_start = RX_START;
-	nic.rx_buf_end = RX_END;
+	dp->tx_buf1 = START_PG;
+	dp->tx_buf2 = START_PG2;
+	dp->rx_buf_start = RX_START;
+	dp->rx_buf_end = RX_END;
 
 	/*
 	 * According to doc/README.enetaddr, drivers shall give priority
 	 * to the MAC address value in the environment, so we do not read
 	 * it from the prom or eeprom if it is specified in the environment.
 	 */
-	if (!eth_getenv_enetaddr("ethaddr", dev->enetaddr)) {
+	if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
 		/* If the MAC address is not in the environment, get it: */
-		if (!get_prom(dev->enetaddr, nic.base)) /* get MAC from prom */
-			dp83902a_init(dev->enetaddr);   /* fallback: seeprom */
+		if (!get_prom(enetaddr, base)) /* get MAC from prom */
+			dp83902a_init(base, enetaddr);   /* fallback: seeprom */
 		/* And write it into the environment otherwise eth_write_hwaddr
 		 * returns -1 due to eth_getenv_enetaddr_by_index() failing,
 		 * and this causes "Warning: failed to set MAC address", and
 		 * cmd_bdinfo has no ethaddr value which it can show: */
-		eth_setenv_enetaddr("ethaddr", dev->enetaddr);
+		eth_setenv_enetaddr("ethaddr", enetaddr);
 	}
 	return 0;
 }
 
 static int ne2k_init(struct eth_device *dev, bd_t *bd)
 {
-	dp83902a_start(dev->enetaddr);
-	initialized = 1;
+	struct dp83902a_priv_data *dp = dev->priv;
+
+	dp83902a_start(dp, (u8 *)dev->iobase, dev->enetaddr);
+	dp->initialized = 1;
 	return 0;
 }
 
 static void ne2k_halt(struct eth_device *dev)
 {
+	struct dp83902a_priv_data *dp = dev->priv;
+
 	debug("### ne2k_halt\n");
-	if(initialized)
-		dp83902a_stop();
-	initialized = 0;
+	if(dp->initialized)
+		dp83902a_stop(dp, (u8 *)dev->iobase);
+	dp->initialized = 0;
 }
 
 static int ne2k_recv(struct eth_device *dev)
 {
-	dp83902a_poll();
+	struct dp83902a_priv_data *dp = dev->priv;
+
+	dp83902a_poll(dp, (u8 *)dev->iobase);
 	return 1;
 }
 
 static int ne2k_send(struct eth_device *dev, void *packet, int length)
 {
+	struct dp83902a_priv_data *dp = dev->priv;
 	int tmo;
 
 	debug("### ne2k_send\n");
 
-	pkey = -1;
+	dp->pkey = -1;
 
-	dp83902a_send((u8 *) packet, length, 666);
+	dp83902a_send(dp, (u8 *)dev->iobase, (u8 *) packet, length, 666);
 	tmo = get_timer (0) + TOUT * CONFIG_SYS_HZ;
 	while(1) {
-		dp83902a_poll();
-		if (pkey != -1) {
+		dp83902a_poll(dp, (u8 *)dev->iobase);
+		if (dp->pkey != -1) {
 			PRINTK("Packet sucesfully sent\n");
 			return 0;
 		}
@@ -785,8 +762,14 @@ int ne2k_register(void)
 	dev = calloc(sizeof(*dev), 1);
 	if (dev == NULL)
 		return -1;
+	dev->priv = calloc(sizeof(struct dp83902a_priv_data), 1);
+	if (dev == NULL)
+		return -1;
 
-	if (ne2k_setup_driver(dev))
+	dev->iobase = CONFIG_DRIVER_NE2000_BASE;
+	if (ne2k_setup_driver((struct dp83902a_priv_data *)dev->priv,
+			      (u8 *)dev->iobase,
+			      dev->enetaddr))
 		return -1;
 
 	dev->init = ne2k_init;

--- a/drivers/net/ne2000_base.h
+++ b/drivers/net/ne2000_base.h
@@ -122,9 +122,6 @@ typedef struct hw_info_t {
 } hw_info_t;
 
 typedef struct dp83902a_priv_data {
-	u8* base;
-	u8* data;
-	u8* reset;
 	int tx_next;		/* First free Tx page */
 	int tx_int;		/* Expecting interrupt from this buffer */
 	int rx_next;		/* First free Rx page */
@@ -132,12 +129,15 @@ typedef struct dp83902a_priv_data {
 	u32 tx1_key, tx2_key;	/* Used to ack when packet sent */
 	int tx1_len, tx2_len;
 	bool tx_started, running, hardwired_esa;
-	u8 esa[6];
 	void* plf_priv;
 
 	/* Buffer allocation */
 	int tx_buf1, tx_buf2;
 	int rx_buf_start, rx_buf_end;
+	unsigned char *pbuf;
+	int initialized;
+	int pkey;
+
 } dp83902a_priv_data_t;
 
 /* ------------------------------------------------------------------------ */