leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'FDDI-defza-Fix-a-bunch-of-small-issues'

Browse Source 
Maciej W. Rozycki says:

====================
FDDI: defza: Fix a bunch of small issues

 Here is a bunch of small fixes addressing issues that I missed in my
final round of testing.  None of these affect run-time behaviour.  One was
actually found by the kbuild bot, which turned out to be more pedantic
than my compiler.  See individual change descriptions for details.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-11-07 21:53:31 -08:00
commit b1870a6d3f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/fddi/defza.c
View File

@ -1,4 +1,4 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0+
/* FDDI network adapter driver for DEC FDDIcontroller 700/700-C devices. /* FDDI network adapter driver for DEC FDDIcontroller 700/700-C devices.
* *
* Copyright (c) 2018 Maciej W. Rozycki * Copyright (c) 2018 Maciej W. Rozycki
@ -56,7 +56,7 @@
#define DRV_VERSION "v.1.1.4" #define DRV_VERSION "v.1.1.4"
#define DRV_RELDATE "Oct 6 2018" #define DRV_RELDATE "Oct 6 2018"
static char version[] = static const char version[] =
DRV_NAME ": " DRV_VERSION " " DRV_RELDATE " Maciej W. Rozycki\n"; DRV_NAME ": " DRV_VERSION " " DRV_RELDATE " Maciej W. Rozycki\n";
MODULE_AUTHOR("Maciej W. Rozycki <macro@linux-mips.org>"); MODULE_AUTHOR("Maciej W. Rozycki <macro@linux-mips.org>");
@ -784,7 +784,7 @@ err_rx:
static void fza_tx_smt(struct net_device *dev) static void fza_tx_smt(struct net_device *dev)
{ {
struct fza_private *fp = netdev_priv(dev); struct fza_private *fp = netdev_priv(dev);
struct fza_buffer_tx __iomem *smt_tx_ptr, *skb_data_ptr; struct fza_buffer_tx __iomem *smt_tx_ptr;
int i, len; int i, len;
u32 own; u32 own;
@ -799,6 +799,7 @@ static void fza_tx_smt(struct net_device *dev)
if (!netif_queue_stopped(dev)) { if (!netif_queue_stopped(dev)) {
if (dev_nit_active(dev)) { if (dev_nit_active(dev)) {
struct fza_buffer_tx *skb_data_ptr;
struct sk_buff *skb; struct sk_buff *skb;
/* Length must be a multiple of 4 as only word /* Length must be a multiple of 4 as only word

3
drivers/net/fddi/defza.h
View File

@ -1,4 +1,4 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0+ */
/* FDDI network adapter driver for DEC FDDIcontroller 700/700-C devices. /* FDDI network adapter driver for DEC FDDIcontroller 700/700-C devices.
* *
* Copyright (c) 2018 Maciej W. Rozycki * Copyright (c) 2018 Maciej W. Rozycki
@ -235,6 +235,7 @@ struct fza_ring_cmd {
#define FZA_RING_CMD 0x200400 /* command ring address */ #define FZA_RING_CMD 0x200400 /* command ring address */
#define FZA_RING_CMD_SIZE 0x40 /* command descriptor ring #define FZA_RING_CMD_SIZE 0x40 /* command descriptor ring
* size * size
*/
/* Command constants. */ /* Command constants. */
#define FZA_RING_CMD_MASK 0x7fffffff #define FZA_RING_CMD_MASK 0x7fffffff
#define FZA_RING_CMD_NOP 0x00000000 /* nop */ #define FZA_RING_CMD_NOP 0x00000000 /* nop */