aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-core
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-01-28 13:05:50 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-02-03 15:23:58 -0500
commitbe87b90f8c70bd1f28c5680a4f9f88b4ac3b0503 (patch)
tree4d9e965321d2420b2f5976abae05becf01ac13d9 /drivers/media/dvb-core
parentf3a9d7ef7990ccb543b3441d9964b9ebc9bae046 (diff)
[media] dvb_net: Use vsprintf %pM extension to print Ethernet addresses
No need for more macros, so remove them and use the kernel extension. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/dvb-core')
-rw-r--r--drivers/media/dvb-core/dvb_net.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index e4041f074909..ff79b0b82354 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -90,9 +90,6 @@ static inline __u32 iov_crc32( __u32 c, struct kvec *iov, unsigned int cnt )
90 90
91#ifdef ULE_DEBUG 91#ifdef ULE_DEBUG
92 92
93#define MAC_ADDR_PRINTFMT "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x"
94#define MAX_ADDR_PRINTFMT_ARGS(macap) (macap)[0],(macap)[1],(macap)[2],(macap)[3],(macap)[4],(macap)[5]
95
96#define isprint(c) ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9')) 93#define isprint(c) ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'))
97 94
98static void hexdump( const unsigned char *buf, unsigned short len ) 95static void hexdump( const unsigned char *buf, unsigned short len )
@@ -700,8 +697,8 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
700 697
701 if (drop) { 698 if (drop) {
702#ifdef ULE_DEBUG 699#ifdef ULE_DEBUG
703 dprintk("Dropping SNDU: MAC destination address does not match: dest addr: "MAC_ADDR_PRINTFMT", dev addr: "MAC_ADDR_PRINTFMT"\n", 700 dprintk("Dropping SNDU: MAC destination address does not match: dest addr: %pM, dev addr: %pM\n",
704 MAX_ADDR_PRINTFMT_ARGS(priv->ule_skb->data), MAX_ADDR_PRINTFMT_ARGS(dev->dev_addr)); 701 priv->ule_skb->data, dev->dev_addr);
705#endif 702#endif
706 dev_kfree_skb(priv->ule_skb); 703 dev_kfree_skb(priv->ule_skb);
707 goto sndu_done; 704 goto sndu_done;