diff options
Diffstat (limited to 'net/atm')
-rw-r--r-- | net/atm/clip.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c index 127fe70a1baa..5de42ea309bc 100644 --- a/net/atm/clip.c +++ b/net/atm/clip.c | |||
@@ -330,6 +330,8 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb, | |||
330 | struct atmarp_entry *entry; | 330 | struct atmarp_entry *entry; |
331 | struct neighbour *n; | 331 | struct neighbour *n; |
332 | struct atm_vcc *vcc; | 332 | struct atm_vcc *vcc; |
333 | struct rtable *rt; | ||
334 | __be32 *daddr; | ||
333 | int old; | 335 | int old; |
334 | unsigned long flags; | 336 | unsigned long flags; |
335 | 337 | ||
@@ -340,7 +342,12 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb, | |||
340 | dev->stats.tx_dropped++; | 342 | dev->stats.tx_dropped++; |
341 | return NETDEV_TX_OK; | 343 | return NETDEV_TX_OK; |
342 | } | 344 | } |
343 | n = dst_get_neighbour_noref(dst); | 345 | rt = (struct rtable *) dst; |
346 | if (rt->rt_gateway) | ||
347 | daddr = &rt->rt_gateway; | ||
348 | else | ||
349 | daddr = &ip_hdr(skb)->daddr; | ||
350 | n = dst_neigh_lookup(dst, daddr); | ||
344 | if (!n) { | 351 | if (!n) { |
345 | pr_err("NO NEIGHBOUR !\n"); | 352 | pr_err("NO NEIGHBOUR !\n"); |
346 | dev_kfree_skb(skb); | 353 | dev_kfree_skb(skb); |
@@ -360,7 +367,7 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb, | |||
360 | dev_kfree_skb(skb); | 367 | dev_kfree_skb(skb); |
361 | dev->stats.tx_dropped++; | 368 | dev->stats.tx_dropped++; |
362 | } | 369 | } |
363 | return NETDEV_TX_OK; | 370 | goto out_release_neigh; |
364 | } | 371 | } |
365 | pr_debug("neigh %p, vccs %p\n", entry, entry->vccs); | 372 | pr_debug("neigh %p, vccs %p\n", entry, entry->vccs); |
366 | ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc; | 373 | ATM_SKB(skb)->vcc = vcc = entry->vccs->vcc; |
@@ -379,14 +386,14 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb, | |||
379 | old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */ | 386 | old = xchg(&entry->vccs->xoff, 1); /* assume XOFF ... */ |
380 | if (old) { | 387 | if (old) { |
381 | pr_warning("XOFF->XOFF transition\n"); | 388 | pr_warning("XOFF->XOFF transition\n"); |
382 | return NETDEV_TX_OK; | 389 | goto out_release_neigh; |
383 | } | 390 | } |
384 | dev->stats.tx_packets++; | 391 | dev->stats.tx_packets++; |
385 | dev->stats.tx_bytes += skb->len; | 392 | dev->stats.tx_bytes += skb->len; |
386 | vcc->send(vcc, skb); | 393 | vcc->send(vcc, skb); |
387 | if (atm_may_send(vcc, 0)) { | 394 | if (atm_may_send(vcc, 0)) { |
388 | entry->vccs->xoff = 0; | 395 | entry->vccs->xoff = 0; |
389 | return NETDEV_TX_OK; | 396 | goto out_release_neigh; |
390 | } | 397 | } |
391 | spin_lock_irqsave(&clip_priv->xoff_lock, flags); | 398 | spin_lock_irqsave(&clip_priv->xoff_lock, flags); |
392 | netif_stop_queue(dev); /* XOFF -> throttle immediately */ | 399 | netif_stop_queue(dev); /* XOFF -> throttle immediately */ |
@@ -398,6 +405,8 @@ static netdev_tx_t clip_start_xmit(struct sk_buff *skb, | |||
398 | of the brief netif_stop_queue. If this isn't true or if it | 405 | of the brief netif_stop_queue. If this isn't true or if it |
399 | changes, use netif_wake_queue instead. */ | 406 | changes, use netif_wake_queue instead. */ |
400 | spin_unlock_irqrestore(&clip_priv->xoff_lock, flags); | 407 | spin_unlock_irqrestore(&clip_priv->xoff_lock, flags); |
408 | out_release_neigh: | ||
409 | neigh_release(n); | ||
401 | return NETDEV_TX_OK; | 410 | return NETDEV_TX_OK; |
402 | } | 411 | } |
403 | 412 | ||