From be89551e218b08ed5ad204cb5de8a83f24940ec7 Mon Sep 17 00:00:00 2001 From: Patrick Bruenn Date: Wed, 2 Jul 2014 14:25:23 +0200 Subject: [PATCH] - increase version number to 0.10 - run indent script on netdev.c --- devices/ccat/module.h | 2 +- devices/ccat/netdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/ccat/module.h b/devices/ccat/module.h index bd3e2024..74e2db43 100644 --- a/devices/ccat/module.h +++ b/devices/ccat/module.h @@ -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 --git a/devices/ccat/netdev.c b/devices/ccat/netdev.c index 7bcc2792..7cc82002 100644 --- a/devices/ccat/netdev.c +++ b/devices/ccat/netdev.c @@ -252,7 +252,7 @@ static netdev_tx_t ccat_eth_start_xmit(struct sk_buff *skb, /* 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);