summaryrefslogtreecommitdiff
path: root/net/net.c
diff options
context:
space:
mode:
authorJoe Hershberger <joe.hershberger@ni.com>2015-04-08 06:41:06 (GMT)
committerSimon Glass <sjg@chromium.org>2015-04-18 17:11:33 (GMT)
commit1fd92db83d399ff7918e51ba84bc73d2466b5eb6 (patch)
tree6d42cf4bc236ce7024c179e492957d9a1316f644 /net/net.c
parent1203fcceec113d502995f7242d7e1be09d373e80 (diff)
downloadu-boot-1fd92db83d399ff7918e51ba84bc73d2466b5eb6.tar.xz
net: cosmetic: Fix var naming net <-> eth drivers
Update the naming convention used in the network stack functions and variables that Ethernet drivers use to interact with it. This cleans up the temporary hacks that were added to this interface along with the DM support. This patch has a few remaining checkpatch.pl failures that would be out of the scope of this patch to fix (drivers that are in gross violation of checkpatch.pl). Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'net/net.c')
-rw-r--r--net/net.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/net/net.c b/net/net.c
index 0e8e9c9..5898260 100644
--- a/net/net.c
+++ b/net/net.c
@@ -178,13 +178,8 @@ int NetTimeOffset;
#endif
static uchar net_pkt_buf[(PKTBUFSRX+1) * PKTSIZE_ALIGN + PKTALIGN];
-#ifdef CONFIG_DM_ETH
/* Receive packets */
uchar *net_rx_packets[PKTBUFSRX];
-#else
-/* Receive packet */
-uchar *NetRxPackets[PKTBUFSRX];
-#endif
/* Current UDP RX packet handler */
static rxhand_f *udp_packet_handler;
/* Current ARP RX packet handler */
@@ -303,16 +298,10 @@ void net_init(void)
net_tx_packet = &net_pkt_buf[0] + (PKTALIGN - 1);
net_tx_packet -= (ulong)net_tx_packet % PKTALIGN;
-#ifdef CONFIG_DM_ETH
for (i = 0; i < PKTBUFSRX; i++) {
net_rx_packets[i] = net_tx_packet +
(i + 1) * PKTSIZE_ALIGN;
}
-#else
- for (i = 0; i < PKTBUFSRX; i++)
- NetRxPackets[i] = net_tx_packet +
- (i + 1) * PKTSIZE_ALIGN;
-#endif
ArpInit();
net_clear_handlers();