From 71ccf634eeef120467379f1579b5586bb4069d8c Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Wed, 13 Feb 2008 11:17:58 +0000 Subject: [PATCH] --- yaml --- r: 85821 b: refs/heads/master c: 9f30c768c00fd0f0a2ab37ef29d8c8c5a7abdf2e h: refs/heads/master i: 85819: 5a565fbee39d809df9fecfae1be204df78ef7107 v: v3 --- [refs] | 2 +- trunk/drivers/net/hamradio/mkiss.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 64b3613168a0..a454c897cd5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1a98b72dbd17e53cd92b8e78f404525ebcfd981 +refs/heads/master: 9f30c768c00fd0f0a2ab37ef29d8c8c5a7abdf2e diff --git a/trunk/drivers/net/hamradio/mkiss.c b/trunk/drivers/net/hamradio/mkiss.c index cfcd15af501e..30c9b3b0d131 100644 --- a/trunk/drivers/net/hamradio/mkiss.c +++ b/trunk/drivers/net/hamradio/mkiss.c @@ -289,7 +289,6 @@ static void ax_bump(struct mkiss *ax) *ax->rbuff &= ~0x20; } } - spin_unlock_bh(&ax->buflock); count = ax->rcount; @@ -297,17 +296,17 @@ static void ax_bump(struct mkiss *ax) printk(KERN_ERR "mkiss: %s: memory squeeze, dropping packet.\n", ax->dev->name); ax->stats.rx_dropped++; + spin_unlock_bh(&ax->buflock); return; } - spin_lock_bh(&ax->buflock); memcpy(skb_put(skb,count), ax->rbuff, count); - spin_unlock_bh(&ax->buflock); skb->protocol = ax25_type_trans(skb, ax->dev); netif_rx(skb); ax->dev->last_rx = jiffies; ax->stats.rx_packets++; ax->stats.rx_bytes += count; + spin_unlock_bh(&ax->buflock); } static void kiss_unesc(struct mkiss *ax, unsigned char s)