mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
net: amd-xgbe: Get rid of custom hex_dump_to_buffer()
Get rid of yet another custom hex_dump_to_buffer(). The output is slightly changed, i.e. each byte followed by white space. Note, we don't use print_hex_dump() here since the original code uses nedev_dbg(). Acked-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
97bbf6623e
commit
9a07ae6893
@ -2930,9 +2930,8 @@ void xgbe_dump_rx_desc(struct xgbe_prv_data *pdata, struct xgbe_ring *ring,
|
||||
void xgbe_print_pkt(struct net_device *netdev, struct sk_buff *skb, bool tx_rx)
|
||||
{
|
||||
struct ethhdr *eth = (struct ethhdr *)skb->data;
|
||||
unsigned char *buf = skb->data;
|
||||
unsigned char buffer[128];
|
||||
unsigned int i, j;
|
||||
unsigned int i;
|
||||
|
||||
netdev_dbg(netdev, "\n************** SKB dump ****************\n");
|
||||
|
||||
@ -2943,22 +2942,13 @@ void xgbe_print_pkt(struct net_device *netdev, struct sk_buff *skb, bool tx_rx)
|
||||
netdev_dbg(netdev, "Src MAC addr: %pM\n", eth->h_source);
|
||||
netdev_dbg(netdev, "Protocol: %#06hx\n", ntohs(eth->h_proto));
|
||||
|
||||
for (i = 0, j = 0; i < skb->len;) {
|
||||
j += snprintf(buffer + j, sizeof(buffer) - j, "%02hhx",
|
||||
buf[i++]);
|
||||
for (i = 0; i < skb->len; i += 32) {
|
||||
unsigned int len = min(skb->len - i, 32U);
|
||||
|
||||
if ((i % 32) == 0) {
|
||||
netdev_dbg(netdev, " %#06x: %s\n", i - 32, buffer);
|
||||
j = 0;
|
||||
} else if ((i % 16) == 0) {
|
||||
buffer[j++] = ' ';
|
||||
buffer[j++] = ' ';
|
||||
} else if ((i % 4) == 0) {
|
||||
buffer[j++] = ' ';
|
||||
}
|
||||
hex_dump_to_buffer(&skb->data[i], len, 32, 1,
|
||||
buffer, sizeof(buffer), false);
|
||||
netdev_dbg(netdev, " %#06x: %s\n", i, buffer);
|
||||
}
|
||||
if (i % 32)
|
||||
netdev_dbg(netdev, " %#06x: %s\n", i - (i % 32), buffer);
|
||||
|
||||
netdev_dbg(netdev, "\n************** SKB dump ****************\n");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user