Commit 42afa0f8 authored by Jie Deng's avatar Jie Deng Committed by David S. Miller

net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer()

Get rid of 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().
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarJie Deng <jiedeng@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe1c3ef2
...@@ -333,9 +333,8 @@ void xlgmac_print_pkt(struct net_device *netdev, ...@@ -333,9 +333,8 @@ void xlgmac_print_pkt(struct net_device *netdev,
struct sk_buff *skb, bool tx_rx) struct sk_buff *skb, bool tx_rx)
{ {
struct ethhdr *eth = (struct ethhdr *)skb->data; struct ethhdr *eth = (struct ethhdr *)skb->data;
unsigned char *buf = skb->data;
unsigned char buffer[128]; unsigned char buffer[128];
unsigned int i, j; unsigned int i;
netdev_dbg(netdev, "\n************** SKB dump ****************\n"); netdev_dbg(netdev, "\n************** SKB dump ****************\n");
...@@ -346,22 +345,13 @@ void xlgmac_print_pkt(struct net_device *netdev, ...@@ -346,22 +345,13 @@ void xlgmac_print_pkt(struct net_device *netdev,
netdev_dbg(netdev, "Src MAC addr: %pM\n", eth->h_source); netdev_dbg(netdev, "Src MAC addr: %pM\n", eth->h_source);
netdev_dbg(netdev, "Protocol: %#06hx\n", ntohs(eth->h_proto)); netdev_dbg(netdev, "Protocol: %#06hx\n", ntohs(eth->h_proto));
for (i = 0, j = 0; i < skb->len;) { for (i = 0; i < skb->len; i += 32) {
j += snprintf(buffer + j, sizeof(buffer) - j, "%02hhx", unsigned int len = min(skb->len - i, 32U);
buf[i++]);
hex_dump_to_buffer(&skb->data[i], len, 32, 1,
if ((i % 32) == 0) { buffer, sizeof(buffer), false);
netdev_dbg(netdev, " %#06x: %s\n", i - 32, buffer); netdev_dbg(netdev, " %#06x: %s\n", i, buffer);
j = 0;
} else if ((i % 16) == 0) {
buffer[j++] = ' ';
buffer[j++] = ' ';
} else if ((i % 4) == 0) {
buffer[j++] = ' ';
}
} }
if (i % 32)
netdev_dbg(netdev, " %#06x: %s\n", i - (i % 32), buffer);
netdev_dbg(netdev, "\n************** SKB dump ****************\n"); netdev_dbg(netdev, "\n************** SKB dump ****************\n");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment