diff --git a/[refs] b/[refs] index ad8379bc6d97..0af10eb1918a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55349790d7cbf0d381873a7ece1dcafcffd4aaa9 +refs/heads/master: 79545b681961d7001c1f4c3eb9ffb87bed4485db diff --git a/trunk/net/llc/llc_conn.c b/trunk/net/llc/llc_conn.c index a8dde9b010da..c0539ffdb272 100644 --- a/trunk/net/llc/llc_conn.c +++ b/trunk/net/llc/llc_conn.c @@ -827,7 +827,8 @@ void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb) else { dprintk("%s: adding to backlog...\n", __func__); llc_set_backlog_type(skb, LLC_PACKET); - sk_add_backlog(sk, skb); + if (sk_add_backlog_limited(sk, skb)) + goto drop_unlock; } out: bh_unlock_sock(sk);