diff options
| author | James Morris <jmorris@namei.org> | 2010-03-30 17:39:27 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-03-30 17:39:27 -0400 |
| commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
| tree | 7362b182dedd825fc762ef7706830837e42943af /net/x25/x25_dev.c | |
| parent | 225a9be24d799aa16d543c31fb09f0c9ed1d9caa (diff) | |
| parent | 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'net/x25/x25_dev.c')
| -rw-r--r-- | net/x25/x25_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index 3e1efe534645..52e304212241 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c | |||
| @@ -53,7 +53,7 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb) | |||
| 53 | if (!sock_owned_by_user(sk)) { | 53 | if (!sock_owned_by_user(sk)) { |
| 54 | queued = x25_process_rx_frame(sk, skb); | 54 | queued = x25_process_rx_frame(sk, skb); |
| 55 | } else { | 55 | } else { |
| 56 | sk_add_backlog(sk, skb); | 56 | queued = !sk_add_backlog(sk, skb); |
| 57 | } | 57 | } |
| 58 | bh_unlock_sock(sk); | 58 | bh_unlock_sock(sk); |
| 59 | sock_put(sk); | 59 | sock_put(sk); |