[PATCH 0/4] FDDI: defza: Fix a bunch of small issues

[PATCH 0/4] FDDI: defza: Fix a bunch of small issues

[Maciej W. Rozycki]

Hi,

 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.

 Please apply.

  Maciej

[PATCH 1/4] FDDI: defza: Fix SPDX annotation

[Maciej W. Rozycki]

The SPDX annotation for this driver does not match the license text, 
which specifies GNU GPL 2 or later.  Make the two match by correcting 
the SPDX tag.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
 drivers/net/fddi/defza.c |    2 +-
 drivers/net/fddi/defza.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

linux-defza-spdx-fix.diff
Index: linux-20181104-4maxp64/drivers/net/fddi/defza.c
===================================================================
--- linux-20181104-4maxp64.orig/drivers/net/fddi/defza.c
+++ linux-20181104-4maxp64/drivers/net/fddi/defza.c
@@ -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.
  *
  *	Copyright (c) 2018  Maciej W. Rozycki
Index: linux-20181104-4maxp64/drivers/net/fddi/defza.h
===================================================================
--- linux-20181104-4maxp64.orig/drivers/net/fddi/defza.h
+++ linux-20181104-4maxp64/drivers/net/fddi/defza.h
@@ -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.
  *
  *	Copyright (c) 2018  Maciej W. Rozycki

[PATCH 2/4] FDDI: defza: Add missing comment closing

[Maciej W. Rozycki]

Fix:

drivers/net/fddi/defza.h:238:1: warning: "/*" within comment [-Wcomment]

by adding a missing comment closing.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
 drivers/net/fddi/defza.h |    1 +
 1 file changed, 1 insertion(+)

linux-defza-cmd-size-comment-fix.diff
Index: linux-20181104-4maxp64/drivers/net/fddi/defza.h
===================================================================
--- linux-20181104-4maxp64.orig/drivers/net/fddi/defza.h
+++ linux-20181104-4maxp64/drivers/net/fddi/defza.h
@@ -235,6 +235,7 @@ struct fza_ring_cmd {
 #define FZA_RING_CMD		0x200400	/* command ring address */
 #define FZA_RING_CMD_SIZE	0x40		/* command descriptor ring
 						 * size
+						 */
 /* Command constants. */
 #define FZA_RING_CMD_MASK	0x7fffffff
 #define FZA_RING_CMD_NOP	0x00000000	/* nop */

[PATCH 3/4] FDDI: defza: Move SMT Tx data buffer declaration next to its skb

[Maciej W. Rozycki]

Move the temporary data buffer used when tapping into the SMT Tx queue 
from the outer function level into the conditional block it's actually 
used in and its containing skb is also declared, making the structure of 
code better.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
Hi,

 This was also present, though not further complained about in kbuild bot 
output:

drivers/net/fddi/defza.c:787:45: warning: unused variable 'skb_data_ptr' [-Wunused-variable]

because it ran on a tree revision as at commit 61414f5ec983 ("FDDI: defza: 
Add support for DEC FDDIcontroller 700 TURBOchannel adapter") and 
therefore without commit 9f9a742db40f ("FDDI: defza: Support capturing 
outgoing SMT traffic"), indicating that the buffer should have been 
declared in the containing block rather than at the function level, 
especially as the skb it comes from is also declared within that block.

  Maciej
---
 drivers/net/fddi/defza.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

linux-defza-skb-data-ptr-fix.diff
Index: linux-20181104-4maxp64/drivers/net/fddi/defza.c
===================================================================
--- linux-20181104-4maxp64.orig/drivers/net/fddi/defza.c
+++ linux-20181104-4maxp64/drivers/net/fddi/defza.c
@@ -784,7 +784,7 @@ static void fza_rx(struct net_device *de
 static void fza_tx_smt(struct net_device *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;
 	u32 own;
 
@@ -799,6 +799,7 @@ static void fza_tx_smt(struct net_device
 
 		if (!netif_queue_stopped(dev)) {
 			if (dev_nit_active(dev)) {
+				struct fza_buffer_tx *skb_data_ptr;
 				struct sk_buff *skb;
 
 				/* Length must be a multiple of 4 as only word

[PATCH 4/4] FDDI: defza: Make the driver version string constant

[Maciej W. Rozycki]

The driver version string is obviously not meant to be changed at run 
time, so mark it `const'.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
---
 drivers/net/fddi/defza.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

linux-defza-version-static-fix.patch
Index: linux-20181104-4maxp64/drivers/net/fddi/defza.c
===================================================================
--- linux-20181104-4maxp64.orig/drivers/net/fddi/defza.c
+++ linux-20181104-4maxp64/drivers/net/fddi/defza.c
@@ -56,7 +56,7 @@
 #define DRV_VERSION "v.1.1.4"
 #define DRV_RELDATE "Oct  6 2018"
 
-static char version[] =
+static const char version[] =
 	DRV_NAME ": " DRV_VERSION "  " DRV_RELDATE "  Maciej W. Rozycki\n";
 
 MODULE_AUTHOR("Maciej W. Rozycki <macro@linux-mips.org>");

Re: [PATCH 0/4] FDDI: defza: Fix a bunch of small issues

[David Miller]

From: "Maciej W. Rozycki" <macro@linux-mips.org>
Date: Wed, 7 Nov 2018 12:06:46 +0000 (GMT)

>  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.
> 
>  Please apply.

Series applied.