| | Date | Tue, 30 Mar 2010 15:42:38 -0700 | | From | Greg KH <> | | Subject | [124/156] llc: use limited socket backlog |
| |
2.6.33-stable review patch. If anyone has any objections, please let us know.
------------------ From: Zhu Yi <yi.zhu@intel.com>
[ 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> --- net/llc/llc_conn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c @@ -756,7 +756,8 @@ void llc_conn_handler(struct llc_sap *sa 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);
|