Commit dcf1b493 authored by Ralf Bächle's avatar Ralf Bächle

Kill remaining sti().

parent d03b376f
...@@ -298,6 +298,11 @@ extern ax25_route *ax25_rt_find_route(ax25_route *, ax25_address *, ...@@ -298,6 +298,11 @@ extern ax25_route *ax25_rt_find_route(ax25_route *, ax25_address *,
extern struct sk_buff *ax25_rt_build_path(struct sk_buff *, ax25_address *, ax25_address *, ax25_digi *); extern struct sk_buff *ax25_rt_build_path(struct sk_buff *, ax25_address *, ax25_address *, ax25_digi *);
extern void ax25_rt_free(void); extern void ax25_rt_free(void);
static inline void ax25_put_route(ax25_route *ax25_rt)
{
atomic_dec(&ax25_rt->ref);
}
/* ax25_std_in.c */ /* ax25_std_in.c */
extern int ax25_std_frame_in(ax25_cb *, struct sk_buff *, int); extern int ax25_std_frame_in(ax25_cb *, struct sk_buff *, int);
......
...@@ -778,7 +778,6 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -778,7 +778,6 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags)
do { do {
if ((skb = skb_dequeue(&sk->receive_queue)) == NULL) { if ((skb = skb_dequeue(&sk->receive_queue)) == NULL) {
if (flags & O_NONBLOCK) { if (flags & O_NONBLOCK) {
sti();
return -EWOULDBLOCK; return -EWOULDBLOCK;
} }
interruptible_sleep_on(sk->sleep); interruptible_sleep_on(sk->sleep);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment