diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-09-04 07:33:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-07 10:56:33 +0200 |
| commit | 384824281caa9ac4b76664033416f1eac4a652fe (patch) | |
| tree | 335ce38565014ba7cea4a7f096794a2d23e26c1f /drivers/net/wan/sdla.c | |
| parent | netxen: update version to 4.0.50 (diff) | |
| download | linux-384824281caa9ac4b76664033416f1eac4a652fe.tar.xz linux-384824281caa9ac4b76664033416f1eac4a652fe.zip | |
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.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan/sdla.c')
| -rw-r--r-- | drivers/net/wan/sdla.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c index 63c76458431c..2b15a7e40d5b 100644 --- a/drivers/net/wan/sdla.c +++ b/drivers/net/wan/sdla.c @@ -652,7 +652,7 @@ static int sdla_dlci_conf(struct net_device *slave, struct net_device *master, i /* 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 sk_buff *skb, } 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 sk_buff *skb, if(flp->master[i]!=NULL) netif_wake_queue(flp->master[i]); } + + dev_kfree_skb(skb); return NETDEV_TX_OK; } |