diff options
Diffstat (limited to 'drivers/net/hamradio/mkiss.c')
-rw-r--r-- | drivers/net/hamradio/mkiss.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index cfcd15af501e..30c9b3b0d131 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
@@ -289,7 +289,6 @@ static void ax_bump(struct mkiss *ax) | |||
289 | *ax->rbuff &= ~0x20; | 289 | *ax->rbuff &= ~0x20; |
290 | } | 290 | } |
291 | } | 291 | } |
292 | spin_unlock_bh(&ax->buflock); | ||
293 | 292 | ||
294 | count = ax->rcount; | 293 | count = ax->rcount; |
295 | 294 | ||
@@ -297,17 +296,17 @@ static void ax_bump(struct mkiss *ax) | |||
297 | printk(KERN_ERR "mkiss: %s: memory squeeze, dropping packet.\n", | 296 | printk(KERN_ERR "mkiss: %s: memory squeeze, dropping packet.\n", |
298 | ax->dev->name); | 297 | ax->dev->name); |
299 | ax->stats.rx_dropped++; | 298 | ax->stats.rx_dropped++; |
299 | spin_unlock_bh(&ax->buflock); | ||
300 | return; | 300 | return; |
301 | } | 301 | } |
302 | 302 | ||
303 | spin_lock_bh(&ax->buflock); | ||
304 | memcpy(skb_put(skb,count), ax->rbuff, count); | 303 | memcpy(skb_put(skb,count), ax->rbuff, count); |
305 | spin_unlock_bh(&ax->buflock); | ||
306 | skb->protocol = ax25_type_trans(skb, ax->dev); | 304 | skb->protocol = ax25_type_trans(skb, ax->dev); |
307 | netif_rx(skb); | 305 | netif_rx(skb); |
308 | ax->dev->last_rx = jiffies; | 306 | ax->dev->last_rx = jiffies; |
309 | ax->stats.rx_packets++; | 307 | ax->stats.rx_packets++; |
310 | ax->stats.rx_bytes += count; | 308 | ax->stats.rx_bytes += count; |
309 | spin_unlock_bh(&ax->buflock); | ||
311 | } | 310 | } |
312 | 311 | ||
313 | static void kiss_unesc(struct mkiss *ax, unsigned char s) | 312 | static void kiss_unesc(struct mkiss *ax, unsigned char s) |