net: cosmetic: Cleanup internal packet buffer names

[karo-tx-uboot.git] / net / cdp.c

diff --git a/net/cdp.c b/net/cdp.c
index 3d9559eb3b66b67c3214b1f65165e42ae3dc1062..392437d9948c66363f7ca41bb36be78238b1e46f 100644 (file)
--- a/net/cdp.c
+++ b/net/cdp.c
@@ -6,6 +6,7 @@
  *     Copyright 2000 Roland Borde
  *     Copyright 2000 Paolo Scaffardi
  *     Copyright 2000-2002 Wolfgang Denk, wd@denx.de
+ *     SPDX-License-Identifier:        GPL-2.0
  */
 
 #include <common.h>
@@ -17,7 +18,7 @@
 #include "cdp.h"
 
 /* Ethernet bcast address */
-const uchar NetCDPAddr[6] = { 0x01, 0x00, 0x0c, 0xcc, 0xcc, 0xcc };
+const u8 net_cdp_ethaddr[6] = { 0x01, 0x00, 0x0c, 0xcc, 0xcc, 0xcc };
 
 #define CDP_DEVICE_ID_TLV              0x0001
 #define CDP_ADDRESS_TLV                        0x0002
@@ -117,14 +118,14 @@ CDPSendTrigger(void)
        char buf[32];
 #endif
 
-       pkt = NetTxPacket;
+       pkt = net_tx_packet;
        et = (struct ethernet_hdr *)pkt;
 
        /* NOTE: trigger sent not on any VLAN */
 
        /* form ethernet header */
-       memcpy(et->et_dest, NetCDPAddr, 6);
-       memcpy(et->et_src, NetOurEther, 6);
+       memcpy(et->et_dest, net_cdp_ethaddr, 6);
+       memcpy(et->et_src, net_ethaddr, 6);
 
        pkt += ETHER_HDR_SIZE;
 
@@ -144,7 +145,7 @@ CDPSendTrigger(void)
 #ifdef CONFIG_CDP_DEVICE_ID
        *s++ = htons(CDP_DEVICE_ID_TLV);
        *s++ = htons(CONFIG_CDP_DEVICE_ID);
-       sprintf(buf, CONFIG_CDP_DEVICE_ID_PREFIX "%pm", NetOurEther);
+       sprintf(buf, CONFIG_CDP_DEVICE_ID_PREFIX "%pm", net_ethaddr);
        memcpy((uchar *)s, buf, 16);
        s += 16 / 2;
 #endif
@@ -206,17 +207,17 @@ CDPSendTrigger(void)
 #endif
 
        /* length of ethernet packet */
-       len = (uchar *)s - ((uchar *)NetTxPacket + ETHER_HDR_SIZE);
+       len = (uchar *)s - ((uchar *)net_tx_packet + ETHER_HDR_SIZE);
        et->et_protlen = htons(len);
 
        len = ETHER_HDR_SIZE + sizeof(CDP_SNAP_hdr);
-       chksum = CDP_compute_csum((uchar *)NetTxPacket + len,
-                                 (uchar *)s - (NetTxPacket + len));
+       chksum = CDP_compute_csum((uchar *)net_tx_packet + len,
+                                 (uchar *)s - (net_tx_packet + len));
        if (chksum == 0)
                chksum = 0xFFFF;
        *cp = htons(chksum);
 
-       NetSendPacket(NetTxPacket, (uchar *)s - NetTxPacket);
+       net_send_packet(net_tx_packet, (uchar *)s - net_tx_packet);
        return 0;
 }