diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 11:00:06 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-03 11:00:06 -0500 |
| commit | 61420e147a706ee7c7a902008045547fb2a2a330 (patch) | |
| tree | c5739fe1feac05cac49c96107138520c65f8f657 /net/netrom/nr_in.c | |
| parent | 3d0a59c02303df01848537b3bf938dc11e9a0ded (diff) | |
| parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'net/netrom/nr_in.c')
| -rw-r--r-- | net/netrom/nr_in.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c index 004e8599b8fe..a7d88b5ad756 100644 --- a/net/netrom/nr_in.c +++ b/net/netrom/nr_in.c | |||
| @@ -99,7 +99,7 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb, | |||
| 99 | break; | 99 | break; |
| 100 | 100 | ||
| 101 | case NR_RESET: | 101 | case NR_RESET: |
| 102 | if (sysctl_netrom_reset_circuit); | 102 | if (sysctl_netrom_reset_circuit) |
| 103 | nr_disconnect(sk, ECONNRESET); | 103 | nr_disconnect(sk, ECONNRESET); |
| 104 | break; | 104 | break; |
| 105 | 105 | ||
| @@ -130,7 +130,7 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb, | |||
| 130 | break; | 130 | break; |
| 131 | 131 | ||
| 132 | case NR_RESET: | 132 | case NR_RESET: |
| 133 | if (sysctl_netrom_reset_circuit); | 133 | if (sysctl_netrom_reset_circuit) |
| 134 | nr_disconnect(sk, ECONNRESET); | 134 | nr_disconnect(sk, ECONNRESET); |
| 135 | break; | 135 | break; |
| 136 | 136 | ||
| @@ -265,7 +265,7 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype | |||
| 265 | break; | 265 | break; |
| 266 | 266 | ||
| 267 | case NR_RESET: | 267 | case NR_RESET: |
| 268 | if (sysctl_netrom_reset_circuit); | 268 | if (sysctl_netrom_reset_circuit) |
| 269 | nr_disconnect(sk, ECONNRESET); | 269 | nr_disconnect(sk, ECONNRESET); |
| 270 | break; | 270 | break; |
| 271 | 271 | ||