aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2010-03-04 13:01:43 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-01 19:02:03 -0400
commit9b3d968b35b5bca4260c429545e16813febfebfe (patch)
tree0b9c9b5ce6516cb98b2cd61fbbb094b8bb5cbd26
parent230401ee7e13ca89e15b64ddd1e8514a016a627e (diff)
llc: use limited socket backlog
[ Upstream commit 79545b681961d7001c1f4c3eb9ffb87bed4485db ] Make llc adapt to the limited socket backlog change. Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--net/llc/llc_conn.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index c6bab39b018e..8f97546726b3 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -756,7 +756,8 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb)
756 else { 756 else {
757 dprintk("%s: adding to backlog...\n", __func__); 757 dprintk("%s: adding to backlog...\n", __func__);
758 llc_set_backlog_type(skb, LLC_PACKET); 758 llc_set_backlog_type(skb, LLC_PACKET);
759 sk_add_backlog(sk, skb); 759 if (sk_add_backlog_limited(sk, skb))
760 goto drop_unlock;
760 } 761 }
761out: 762out:
762 bh_unlock_sock(sk); 763 bh_unlock_sock(sk);