# HG changeset patch # User Patrick Bruenn # Date 1404303923 -7200 # Node ID d707b650fa522ec8049aa9e94fbda7a0643ed11d # Parent 8b2a511a2bf8c632aa98237d6762a9f8c6d82645 - increase version number to 0.10 - run indent script on netdev.c diff -r 8b2a511a2bf8 -r d707b650fa52 devices/ccat/module.h --- 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 diff -r 8b2a511a2bf8 -r d707b650fa52 devices/ccat/netdev.c --- 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);