diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-05 13:13:03 -0400 |
| commit | 5e66dd6d66ffe758b39b6dcadf2330753ee1159b (patch) | |
| tree | a72cdcff4448e4af9425cc213ddf56ab23e697fe /net/netrom/af_netrom.c | |
| parent | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'net/netrom/af_netrom.c')
| -rw-r--r-- | net/netrom/af_netrom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index eba6df054b1f..389a4119e1b4 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
| @@ -800,7 +800,7 @@ static int nr_accept(struct socket *sock, struct socket *newsock, int flags) | |||
| 800 | 800 | ||
| 801 | /* Now attach up the new socket */ | 801 | /* Now attach up the new socket */ |
| 802 | kfree_skb(skb); | 802 | kfree_skb(skb); |
| 803 | sk->sk_ack_backlog--; | 803 | sk_acceptq_removed(sk); |
| 804 | newsock->sk = newsk; | 804 | newsock->sk = newsk; |
| 805 | 805 | ||
| 806 | out: | 806 | out: |
| @@ -985,7 +985,7 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) | |||
| 985 | nr_make->vr = 0; | 985 | nr_make->vr = 0; |
| 986 | nr_make->vl = 0; | 986 | nr_make->vl = 0; |
| 987 | nr_make->state = NR_STATE_3; | 987 | nr_make->state = NR_STATE_3; |
| 988 | sk->sk_ack_backlog++; | 988 | sk_acceptq_added(sk); |
| 989 | 989 | ||
| 990 | nr_insert_socket(make); | 990 | nr_insert_socket(make); |
| 991 | 991 | ||