net: add rte prefix to ARP structures

[dpdk.git] / lib / librte_net / rte_arp.c

diff --git a/lib/librte_net/rte_arp.c b/lib/librte_net/rte_arp.c
index d7223b0..c80ebc7 100644 (file)
--- a/lib/librte_net/rte_arp.c
+++ b/lib/librte_net/rte_arp.c
@@ -7,36 +7,44 @@
 #include <rte_arp.h>
 
 #define RARP_PKT_SIZE  64
-int
-rte_net_make_rarp_packet(struct rte_mbuf *mbuf, const struct ether_addr *mac)
+struct rte_mbuf * __rte_experimental
+rte_net_make_rarp_packet(struct rte_mempool *mpool,
+               const struct ether_addr *mac)
 {
        struct ether_hdr *eth_hdr;
-       struct arp_hdr *rarp;
+       struct rte_arp_hdr *rarp;
+       struct rte_mbuf *mbuf;
 
-       if (mbuf->buf_len < RARP_PKT_SIZE)
-               return -1;
+       if (mpool == NULL)
+               return NULL;
+
+       mbuf = rte_pktmbuf_alloc(mpool);
+       if (mbuf == NULL)
+               return NULL;
+
+       eth_hdr = (struct ether_hdr *)rte_pktmbuf_append(mbuf, RARP_PKT_SIZE);
+       if (eth_hdr == NULL) {
+               rte_pktmbuf_free(mbuf);
+               return NULL;
+       }
 
        /* Ethernet header. */
-       eth_hdr = rte_pktmbuf_mtod(mbuf, struct ether_hdr *);
        memset(eth_hdr->d_addr.addr_bytes, 0xff, ETHER_ADDR_LEN);
        ether_addr_copy(mac, &eth_hdr->s_addr);
        eth_hdr->ether_type = htons(ETHER_TYPE_RARP);
 
        /* RARP header. */
-       rarp = (struct arp_hdr *)(eth_hdr + 1);
-       rarp->arp_hrd = htons(ARP_HRD_ETHER);
-       rarp->arp_pro = htons(ETHER_TYPE_IPv4);
-       rarp->arp_hln = ETHER_ADDR_LEN;
-       rarp->arp_pln = 4;
-       rarp->arp_op  = htons(ARP_OP_REVREQUEST);
+       rarp = (struct rte_arp_hdr *)(eth_hdr + 1);
+       rarp->arp_hardware = htons(ARP_HRD_ETHER);
+       rarp->arp_protocol = htons(ETHER_TYPE_IPv4);
+       rarp->arp_hlen = ETHER_ADDR_LEN;
+       rarp->arp_plen = 4;
+       rarp->arp_opcode  = htons(ARP_OP_REVREQUEST);
 
        ether_addr_copy(mac, &rarp->arp_data.arp_sha);
        ether_addr_copy(mac, &rarp->arp_data.arp_tha);
        memset(&rarp->arp_data.arp_sip, 0x00, 4);
        memset(&rarp->arp_data.arp_tip, 0x00, 4);
 
-       mbuf->data_len = RARP_PKT_SIZE;
-       mbuf->pkt_len = RARP_PKT_SIZE;
-
-       return 0;
+       return mbuf;
 }