Re: net: fix network drivers ndo_start_xmit() return values

[Jarek Poplawski <jarkao2@gmail.com>]

On 15-06-2009 19:00, Patrick McHardy wrote:
> This patch contains the final driver ndo_start_xmit() return
> value fixups. I'm pretty sure I got them all ...
...
> commit fbc7a709feec3792247fb8596ac3d91a6d2c9ecc
> Author: Patrick McHardy <kaber@trash.net>
> Date:   Mon Jun 15 18:55:45 2009 +0200
> 
> @@ -1591,6 +1586,10 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
>  	dev->trans_start = jiffies;
>  
>  	return 0;

	??

> +
> +drop:
> +	dev_kfree_skb(skb);
> +	return NETDEV_TX_OK;
>  }
>  
>  
...
> @@ -1759,6 +1753,11 @@ static int hp100_start_xmit(struct sk_buff *skb, struct net_device *dev)
>  #endif
>  
>  	return 0;

	??

> +
> +drop:
> +	dev_kfree_skb(skb);
> +	return NETDEV_TX_OK;
> +
>  }
>  
>  
> diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c
> index 2dd78d2..1907939 100644
> --- a/drivers/net/wan/lapbether.c
> +++ b/drivers/net/wan/lapbether.c
> @@ -149,46 +149,42 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
>   */
>  static int lapbeth_xmit(struct sk_buff *skb, struct net_device *dev)
>  {
> -	int err = -ENODEV;
> +	int err;
>  
>  	/*
>  	 * Just to be *really* sure not to send anything if the interface
>  	 * is down, the ethernet device may have gone.
>  	 */
>  	if (!netif_running(dev)) {
> +		// XXX

 	/* XXX */ ??

Jarek P.