diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-16 20:24:53 -0400 |
| commit | 492b057c426e4aa747484958e18e9da29003985d (patch) | |
| tree | 34e08c24618688d8bcc190523028b5f94cce0c0b /drivers/net/wan/dlci.c | |
| parent | 313485175da221c388f6a8ecf4c30062ba9bea17 (diff) | |
| parent | 300df7dc89cc276377fc020704e34875d5c473b6 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'drivers/net/wan/dlci.c')
| -rw-r--r-- | drivers/net/wan/dlci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wan/dlci.c b/drivers/net/wan/dlci.c index e8d155c3e59f..2fa275a58f9d 100644 --- a/drivers/net/wan/dlci.c +++ b/drivers/net/wan/dlci.c | |||
| @@ -205,15 +205,15 @@ static int dlci_transmit(struct sk_buff *skb, struct net_device *dev) | |||
| 205 | { | 205 | { |
| 206 | case DLCI_RET_OK: | 206 | case DLCI_RET_OK: |
| 207 | dev->stats.tx_packets++; | 207 | dev->stats.tx_packets++; |
| 208 | ret = 0; | 208 | ret = NETDEV_TX_OK; |
| 209 | break; | 209 | break; |
| 210 | case DLCI_RET_ERR: | 210 | case DLCI_RET_ERR: |
| 211 | dev->stats.tx_errors++; | 211 | dev->stats.tx_errors++; |
| 212 | ret = 0; | 212 | ret = NETDEV_TX_OK; |
| 213 | break; | 213 | break; |
| 214 | case DLCI_RET_DROP: | 214 | case DLCI_RET_DROP: |
| 215 | dev->stats.tx_dropped++; | 215 | dev->stats.tx_dropped++; |
| 216 | ret = 1; | 216 | ret = NETDEV_TX_BUSY; |
| 217 | break; | 217 | break; |
| 218 | } | 218 | } |
| 219 | /* Alan Cox recommends always returning 0, and always freeing the packet */ | 219 | /* Alan Cox recommends always returning 0, and always freeing the packet */ |