- increase version number to 0.10 stable-1.5
authorPatrick Bruenn <p.bruenn@beckhoff.com>
Wed, 02 Jul 2014 14:25:23 +0200
branchstable-1.5
changeset 2578 d707b650fa52
parent 2577 8b2a511a2bf8
child 2579 273d15e0f301
- increase version number to 0.10
- run indent script on netdev.c
devices/ccat/module.h
devices/ccat/netdev.c
--- a/devices/ccat/module.h	Wed Jul 02 12:48:01 2014 +0200
+++ b/devices/ccat/module.h	Wed Jul 02 14:25:23 2014 +0200
@@ -28,7 +28,7 @@
 #include "../ecdev.h"
 
 #define DRV_EXTRAVERSION "-ec"
-#define DRV_VERSION      "0.9" DRV_EXTRAVERSION
+#define DRV_VERSION      "0.10" DRV_EXTRAVERSION
 #define DRV_DESCRIPTION  "Beckhoff CCAT Ethernet/EtherCAT Network Driver"
 
 #undef pr_fmt
--- a/devices/ccat/netdev.c	Wed Jul 02 12:48:01 2014 +0200
+++ b/devices/ccat/netdev.c	Wed Jul 02 14:25:23 2014 +0200
@@ -252,7 +252,7 @@
 
 	/* Queue frame into CCAT TX-FIFO, CCAT ignores the first 8 bytes of the tx descriptor */
 	addr_and_length = offsetof(struct ccat_eth_frame, length);
-	addr_and_length += ((void*)fifo->next - fifo->dma.virt);
+	addr_and_length += ((void *)fifo->next - fifo->dma.virt);
 	addr_and_length += ((skb->len + CCAT_ETH_FRAME_HEAD_LEN) / 8) << 24;
 	iowrite32(addr_and_length, priv->reg.tx_fifo);