Skip to contentSkip to conversation

linux-next: net tree build warnings

PATCH Applied Stephen Rothwell 4 participants 7 messages Sep 4, 2009 – Sep 7, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Hi Dave,

Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced thes warnings:

drivers/net/wan/dlci.c: In function 'dlci_transmit':
drivers/net/wan/dlci.c:205: warning: enumeration value 'NETDEV_TX_LOCKED' not handled in switch drivers/net/wan/dlci.c:215: warning: case value '2' not in enumerated type 'netdev_tx_t'

Introduced by commit d71a674922e7519edb477ecb585e7d29d69c7aa7 ("wan:
convert drivers to netdev_tx_t").

Signature · 3 lines
Cheers,
Stephen Rothwell                    [email protected]
http://www.canb.auug.org.au/~sfr/
maintainer
#1 lore raw

From: Stephen Rothwell <[email protected]>
Date: Fri, 4 Sep 2009 14:34:39 +1000

Quoted 9 lines

Today's linux-next build (x86_64 allmodconfig gcc-4.4.0) produced thes warnings:

drivers/net/wan/dlci.c: In function 'dlci_transmit':
drivers/net/wan/dlci.c:205: warning: enumeration value 'NETDEV_TX_LOCKED' not handled in switch drivers/net/wan/dlci.c:215: warning: case value '2' not in enumerated type 'netdev_tx_t'

Introduced by commit d71a674922e7519edb477ecb585e7d29d69c7aa7 ("wan:
convert drivers to netdev_tx_t").

I know about it, this code sucks and it's not easy to quelch that one trivially.

#2 lore raw

PATCH 1/1 wan: dlci/sdla transmit return dehacking

This is a brute force removal of the wierd slave interface done for DLCI -> SDLA transmit. Before it was using non-standard return values and freeing skb in caller. This changes it to using normal return values, and freeing in the callee. Luckly only one driver pair was doing this. Not tested on real hardware, in fact I wonder if this driver pair is even being used by any users.

---
 drivers/net/wan/dlci.c  |   43 +++++--------------------------------------
 drivers/net/wan/sdla.c  |    8 ++++----
 include/linux/if_frad.h |    5 -----
 3 files changed, 9 insertions(+), 47 deletions(-)
drivers/net/wan/dlci.c +5 -38
@@ -186,46 +186,13 @@ static void dlci_receive(struct sk_buff 
 		dev_kfree_skb(skb);
 }
 
-static netdev_tx_t dlci_transmit(struct sk_buff *skb,
-				       struct net_device *dev)
+static netdev_tx_t dlci_transmit(struct sk_buff *skb, struct net_device *dev)
 {
-	struct dlci_local *dlp;
-	netdev_tx_t ret;
-
-	if (!skb || !dev)
-		return NETDEV_TX_OK;
-
-	dlp = netdev_priv(dev);
-
-	netif_stop_queue(dev);
-	
-	/* This is hackish, overloads driver specific return values
-	   on top of normal transmit return! */
-	ret = dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
-	switch (ret)
-	{
-		case DLCI_RET_OK:
-			dev->stats.tx_packets++;
-			ret = NETDEV_TX_OK;
-			break;
-		case DLCI_RET_ERR:
-			dev->stats.tx_errors++;
-			ret = NETDEV_TX_OK;
-			break;
-		case DLCI_RET_DROP:
-			dev->stats.tx_dropped++;
-			ret = NETDEV_TX_BUSY;
-			break;
-	}
-	/* Alan Cox recommends always returning 0, and always freeing the packet */
-	/* experience suggest a slightly more conservative approach */
+	struct dlci_local *dlp = netdev_priv(dev);
 
-	if (ret == NETDEV_TX_OK)
-	{
-		dev_kfree_skb(skb);
-		netif_wake_queue(dev);
-	}
-	return(ret);
+	if (skb)
+		dlp->slave->netdev_ops->ndo_start_xmit(skb, dlp->slave);
+	return NETDEV_TX_OK;
 }
 
 static int dlci_config(struct net_device *dev, struct dlci_conf __user *conf, int get)
drivers/net/wan/sdla.c +4 -4
@@ -652,7 +652,7 @@ static int sdla_dlci_conf(struct net_dev
 
 /* NOTE: the DLCI driver deals with freeing the SKB!! */
 static netdev_tx_t sdla_transmit(struct sk_buff *skb,
-				       struct net_device *dev)
+				 struct net_device *dev)
 {
 	struct frad_local *flp;
 	int               ret, addr, accept, i;
@@ -712,23 +712,21 @@ static netdev_tx_t sdla_transmit(struct 
 				}
 				break;
 		}
+
 		switch (ret)
 		{
 			case SDLA_RET_OK:
 				dev->stats.tx_packets++;
-				ret = DLCI_RET_OK;
 				break;
 
 			case SDLA_RET_CIR_OVERFLOW:
 			case SDLA_RET_BUF_OVERSIZE:
 			case SDLA_RET_NO_BUFS:
 				dev->stats.tx_dropped++;
-				ret = DLCI_RET_DROP;
 				break;
 
 			default:
 				dev->stats.tx_errors++;
-				ret = DLCI_RET_ERR;
 				break;
 		}
 	}
@@ -738,6 +736,8 @@ static netdev_tx_t sdla_transmit(struct 
 		if(flp->master[i]!=NULL)
 			netif_wake_queue(flp->master[i]);
 	}		
+
+	dev_kfree_skb(skb);
 	return NETDEV_TX_OK;
 }
 
include/linux/if_frad.h +0 -5
@@ -69,11 +69,6 @@ struct dlci_conf {
 
 #define DLCI_VALID_FLAGS	0x000B
 
-/* FRAD driver uses these to indicate what it did with packet */
-#define DLCI_RET_OK		0x00
-#define DLCI_RET_ERR		0x01
-#define DLCI_RET_DROP		0x02
-
 /* defines for the actual Frame Relay hardware */
 #define FRAD_GET_CONF	(SIOCDEVPRIVATE)
 #define FRAD_SET_CONF	(SIOCDEVPRIVATE + 1)
#3 lore raw

Re: [PATCH net-next] wan: dlci/sdla transmit return dehacking

Quoted 6 lines · Stephen Hemminger

This is a brute force removal of the wierd slave interface done for DLCI -> SDLA transmit. Before it was using non-standard return values and freeing skb in caller. This changes it to using normal return values, and freeing in the callee. Luckly only one driver pair was doing this. Not tested on real hardware, in fact I wonder if this driver pair is even being used by any users.

The only hardware which seems to be driven by dlci.c is sdla.c = old Sangoma ISA cards.

Sangoma seems to maintain their own drivers for their hw (including these ISA cards).

Are the in-kernel drivers functional after all those years? I don't know.

Signature · 1 line
Krzysztof Halasa
#4 lore raw

Re: [PATCH net-next] wan: dlci/sdla transmit return dehacking

Quoted 9 lines · On Fri, 04 Sep 2009 20:48:50 +0200 Krzysztof Halasa <[email protected]> wrote:
Quoted 6 lines · Stephen Hemminger

This is a brute force removal of the wierd slave interface done for DLCI -> SDLA transmit. Before it was using non-standard return values and freeing skb in caller. This changes it to using normal return values, and freeing in the callee. Luckly only one driver pair was doing this. Not tested on real hardware, in fact I wonder if this driver pair is even being used by any users.

Quoted 8 lines

The only hardware which seems to be driven by dlci.c is sdla.c = old Sangoma ISA cards.

Sangoma seems to maintain their own drivers for their hw (including these ISA cards).

Are the in-kernel drivers functional after all those years? I don't know.

In the Vyatta product we use the Sangoma drivers, so we actually have to make and not configure in the existing WAN drivers.

#5 lore raw

Re: [PATCH net-next] wan: dlci/sdla transmit return dehacking

Quoted 2 lines · Stephen Hemminger

In the Vyatta product we use the Sangoma drivers, so we actually have to make and not configure in the existing WAN drivers.

I'd expect all users of their hw are doing precisely the same (not to imply there are any S5* (ISA) cards still in use).
But I don't know for sure, sometimes people use really old and long unmaintained drivers with success. OTOH ISA...

Signature · 1 line
Krzysztof Halasa
maintainer Applied
#6 lore raw

Re: [PATCH net-next] wan: dlci/sdla transmit return dehacking

In reply to Stephen Hemminger

From: Stephen Hemminger <[email protected]>
Date: Fri, 4 Sep 2009 08:33:46 -0700

Quoted 7 lines

This is a brute force removal of the wierd slave interface done for DLCI -> SDLA transmit. Before it was using non-standard return values and freeing skb in caller. This changes it to using normal return values, and freeing in the callee. Luckly only one driver pair was doing this. Not tested on real hardware, in fact I wonder if this driver pair is even being used by any users.

Irregardless of what we should do with the SDLA driver, this patch should go in while that code is still in the tree.

Applied to net-next-2.6, thanks.