diff options
Diffstat (limited to 'net/sched/sch_teql.c')
-rw-r--r-- | net/sched/sch_teql.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 9c002b6e0533..5a002c247231 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -268,7 +268,7 @@ static inline int teql_resolve(struct sk_buff *skb, | |||
268 | return __teql_resolve(skb, skb_res, dev); | 268 | return __teql_resolve(skb, skb_res, dev); |
269 | } | 269 | } |
270 | 270 | ||
271 | static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev) | 271 | static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) |
272 | { | 272 | { |
273 | struct teql_master *master = netdev_priv(dev); | 273 | struct teql_master *master = netdev_priv(dev); |
274 | struct netdev_queue *txq = netdev_get_tx_queue(dev, 0); | 274 | struct netdev_queue *txq = netdev_get_tx_queue(dev, 0); |
@@ -307,14 +307,14 @@ restart: | |||
307 | 307 | ||
308 | if (!netif_tx_queue_stopped(slave_txq) && | 308 | if (!netif_tx_queue_stopped(slave_txq) && |
309 | !netif_tx_queue_frozen(slave_txq) && | 309 | !netif_tx_queue_frozen(slave_txq) && |
310 | slave_ops->ndo_start_xmit(skb, slave) == 0) { | 310 | slave_ops->ndo_start_xmit(skb, slave) == NETDEV_TX_OK) { |
311 | txq_trans_update(slave_txq); | 311 | txq_trans_update(slave_txq); |
312 | __netif_tx_unlock(slave_txq); | 312 | __netif_tx_unlock(slave_txq); |
313 | master->slaves = NEXT_SLAVE(q); | 313 | master->slaves = NEXT_SLAVE(q); |
314 | netif_wake_queue(dev); | 314 | netif_wake_queue(dev); |
315 | txq->tx_packets++; | 315 | txq->tx_packets++; |
316 | txq->tx_bytes += length; | 316 | txq->tx_bytes += length; |
317 | return 0; | 317 | return NETDEV_TX_OK; |
318 | } | 318 | } |
319 | __netif_tx_unlock(slave_txq); | 319 | __netif_tx_unlock(slave_txq); |
320 | } | 320 | } |
@@ -323,7 +323,7 @@ restart: | |||
323 | break; | 323 | break; |
324 | case 1: | 324 | case 1: |
325 | master->slaves = NEXT_SLAVE(q); | 325 | master->slaves = NEXT_SLAVE(q); |
326 | return 0; | 326 | return NETDEV_TX_OK; |
327 | default: | 327 | default: |
328 | nores = 1; | 328 | nores = 1; |
329 | break; | 329 | break; |
@@ -345,7 +345,7 @@ restart: | |||
345 | drop: | 345 | drop: |
346 | txq->tx_dropped++; | 346 | txq->tx_dropped++; |
347 | dev_kfree_skb(skb); | 347 | dev_kfree_skb(skb); |
348 | return 0; | 348 | return NETDEV_TX_OK; |
349 | } | 349 | } |
350 | 350 | ||
351 | static int teql_master_open(struct net_device *dev) | 351 | static int teql_master_open(struct net_device *dev) |