summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-12-29 12:33:02 -0800
committerJosh Blum <josh@joshknows.com>2010-12-29 12:33:02 -0800
commit55556d641ec1d8e70b53f54998cd5878ce45a2e0 (patch)
tree9b6790767a2f39f5126d5f1feb580d7dddbe4ead /firmware
parentca0f4f0be8c19533007e4284d1ccc47df0f1c6e3 (diff)
downloaduhd-55556d641ec1d8e70b53f54998cd5878ce45a2e0.tar.gz
uhd-55556d641ec1d8e70b53f54998cd5878ce45a2e0.tar.bz2
uhd-55556d641ec1d8e70b53f54998cd5878ce45a2e0.zip
usrp2: removed extra print ip functions
Diffstat (limited to 'firmware')
-rw-r--r--firmware/zpu/lib/net_common.c23
1 files changed, 2 insertions, 21 deletions
diff --git a/firmware/zpu/lib/net_common.c b/firmware/zpu/lib/net_common.c
index c1ca280d9..ec9198090 100644
--- a/firmware/zpu/lib/net_common.c
+++ b/firmware/zpu/lib/net_common.c
@@ -320,12 +320,6 @@ handle_icmp_packet(struct ip_addr src, struct ip_addr dst,
}
}
-static void __attribute__((unused))
-print_arp_ip(const unsigned char ip[4])
-{
- printf("%d.%d.%d.%d", ip[0], ip[1], ip[2],ip[3]);
-}
-
static void
send_arp_reply(struct arp_eth_ipv4 *req, eth_mac_addr_t our_mac)
{
@@ -376,9 +370,9 @@ handle_arp_packet(struct arp_eth_ipv4 *p, size_t size)
printf("ar_pln = %d\n", p->ar_pln);
printf("ar_op = %d\n", p->ar_op);
printf("ar_sha = "); print_mac_addr(p->ar_sha); newline();
- printf("ar_sip = "); print_arp_ip(p->ar_sip); newline();
+ printf("ar_sip = "); print_ip_addr (p->ar_sip); newline();
printf("ar_tha = "); print_mac_addr(p->ar_tha); newline();
- printf("ar_tip = "); print_arp_ip(p->ar_tip); newline();
+ printf("ar_tip = "); print_ip_addr (p->ar_tip); newline();
}
if (p->ar_hrd != ARPHRD_ETHER
@@ -448,16 +442,3 @@ handle_eth_packet(uint32_t *p, size_t nlines)
else
return; // Not ARP or IPV4, ignore
}
-
-// ------------------------------------------------------------------------
-
-void
-print_ip(struct ip_addr ip)
-{
- unsigned int t = ntohl(ip.addr);
- printf("%d.%d.%d.%d",
- (t >> 24) & 0xff,
- (t >> 16) & 0xff,
- (t >> 8) & 0xff,
- t & 0xff);
-}