diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 17:57:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 17:57:46 -0400 |
| commit | dcbd39a1f1073b10debdb965fccc0ab806d59780 (patch) | |
| tree | 9a1ea287985af6a896fd6a13cc6a1ecbc9d384ca /net/atm/br2684.c | |
| parent | 582fd487611baa06b07665978429192390c29b8f (diff) | |
| parent | 4f55cd105c38af4aa157804729d694f864fbc78a (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/atm/br2684.c')
| -rw-r--r-- | net/atm/br2684.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/atm/br2684.c b/net/atm/br2684.c index 289956c4dd3e..72f3f7b8de80 100644 --- a/net/atm/br2684.c +++ b/net/atm/br2684.c | |||
| @@ -220,7 +220,7 @@ static int br2684_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 220 | /* netif_stop_queue(dev); */ | 220 | /* netif_stop_queue(dev); */ |
| 221 | dev_kfree_skb(skb); | 221 | dev_kfree_skb(skb); |
| 222 | read_unlock(&devs_lock); | 222 | read_unlock(&devs_lock); |
| 223 | return -EUNATCH; | 223 | return 0; |
| 224 | } | 224 | } |
| 225 | if (!br2684_xmit_vcc(skb, brdev, brvcc)) { | 225 | if (!br2684_xmit_vcc(skb, brdev, brvcc)) { |
| 226 | /* | 226 | /* |