Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a8341b6 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

net: use the common ascii hex helpers 



Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 697f8d03

drivers/net/skfp/smt.c

+6 −7
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "h/smc.h"

#include "h/smt_p.h"

#include <linux/bitrev.h>

#include <linux/kernel.h>



#define KERNEL

#include "h/smtstate.h"
@@ -1730,16 +1731,14 @@ void fddi_send_antc(struct s_smc *smc, struct fddi_addr *dest) 
#endif



#ifdef	DEBUG

#define hextoasc(x)	"0123456789abcdef"[x]



char *addr_to_string(struct fddi_addr *addr)

{

	int	i ;

	static char	string[6*3] = "****" ;



	for (i = 0 ; i < 6 ; i++) {

		string[i*3] = hextoasc((addr->a[i]>>4)&0xf) ;

		string[i*3+1] = hextoasc((addr->a[i])&0xf) ;

		string[i * 3] = hex_asc_hi(addr->a[i]);

		string[i * 3 + 1] = hex_asc_lo(addr->a[i]);

		string[i * 3 + 2] = ':';

	}

	string[5 * 3 + 2] = 0;

net/ipv4/netfilter/ipt_CLUSTERIP.c

+2 −3
Original line number Diff line number Diff line
@@ -475,11 +475,10 @@ static void arp_print(struct arp_payload *payload) 
#define HBUFFERLEN 30

	char hbuffer[HBUFFERLEN];

	int j,k;

	const char hexbuf[]= "0123456789abcdef";



	for (k=0, j=0; k < HBUFFERLEN-3 && j < ETH_ALEN; j++) {

		hbuffer[k++]=hexbuf[(payload->src_hw[j]>>4)&15];

		hbuffer[k++]=hexbuf[payload->src_hw[j]&15];

		hbuffer[k++] = hex_asc_hi(payload->src_hw[j]);

		hbuffer[k++] = hex_asc_lo(payload->src_hw[j]);

		hbuffer[k++]=':';

	}

	hbuffer[--k]='\0';