* [PATCH net-next] net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer()
@ 2017-12-21 5:32 Jie Deng
2017-12-21 12:23 ` Andy Shevchenko
2017-12-21 20:06 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Jie Deng @ 2017-12-21 5:32 UTC (permalink / raw)
To: netdev; +Cc: davem, Jose.Abreu, andriy.shevchenko, Jie Deng
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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jie Deng <jiedeng@synopsys.com>
---
drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 24 +++++++----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
index d655a42..eb1c6b0 100644
--- a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
+++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
@@ -333,9 +333,8 @@ void xlgmac_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");
@@ -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, "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++]);
-
- 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++] = ' ';
- }
+ for (i = 0; i < skb->len; i += 32) {
+ unsigned int len = min(skb->len - i, 32U);
+
+ 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");
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer()
2017-12-21 5:32 [PATCH net-next] net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer() Jie Deng
@ 2017-12-21 12:23 ` Andy Shevchenko
2017-12-21 20:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2017-12-21 12:23 UTC (permalink / raw)
To: Jie Deng, netdev; +Cc: davem, Jose.Abreu
On Thu, 2017-12-21 at 13:32 +0800, Jie Deng wrote:
> 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().
>
Jie, thanks for taking care of update.
David, please, consider this one to be applied.
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Jie Deng <jiedeng@synopsys.com>
> ---
> drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 24 +++++++-------
> ---------
> 1 file changed, 7 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
> b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
> index d655a42..eb1c6b0 100644
> --- a/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
> +++ b/drivers/net/ethernet/synopsys/dwc-xlgmac-common.c
> @@ -333,9 +333,8 @@ void xlgmac_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");
>
> @@ -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, "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++]);
> -
> - 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++] = ' ';
> - }
> + for (i = 0; i < skb->len; i += 32) {
> + unsigned int len = min(skb->len - i, 32U);
> +
> + 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");
> }
--
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer()
2017-12-21 5:32 [PATCH net-next] net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer() Jie Deng
2017-12-21 12:23 ` Andy Shevchenko
@ 2017-12-21 20:06 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2017-12-21 20:06 UTC (permalink / raw)
To: Jie.Deng1; +Cc: netdev, Jose.Abreu, andriy.shevchenko
From: Jie Deng <Jie.Deng1@synopsys.com>
Date: Thu, 21 Dec 2017 13:32:00 +0800
> 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: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Jie Deng <jiedeng@synopsys.com>
Applied, thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-21 20:06 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-21 5:32 [PATCH net-next] net: dwc-xlgmac: Get rid of custom hex_dump_to_buffer() Jie Deng
2017-12-21 12:23 ` Andy Shevchenko
2017-12-21 20:06 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).