diff --git a/[refs] b/[refs] index e8654a64d276..10bffd22353c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 006f68b84fe19fc5015a8cf838a10d75f91f0218 +refs/heads/master: 18601a7d30c8340af4d786793ee52828471d2630 diff --git a/trunk/net/netrom/af_netrom.c b/trunk/net/netrom/af_netrom.c index eba6df054b1f..389a4119e1b4 100644 --- a/trunk/net/netrom/af_netrom.c +++ b/trunk/net/netrom/af_netrom.c @@ -800,7 +800,7 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags) /* Now attach up the new socket */ kfree_skb(skb); - sk->sk_ack_backlog--; + sk_acceptq_removed(sk); newsock->sk = newsk; out: @@ -985,7 +985,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) nr_make->vr = 0; nr_make->vl = 0; nr_make->state = NR_STATE_3; - sk->sk_ack_backlog++; + sk_acceptq_added(sk); nr_insert_socket(make);