X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2Fnetrom%2Fnr_in.c;h=5560acbaaa9548d78feabbd877370b1fb214a2c7;hb=414f827c46973ba39320cfb43feb55a0eeb9b4e8;hp=64b81a7969077c706353e76309a67698380f2095;hpb=e3ee3b78f83688a0ae4315e8be71b2eac559904a;p=linux-2.6

diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index 64b81a7969..5560acbaaa 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -12,7 +12,6 @@
 #include <linux/socket.h>
 #include <linux/in.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/string.h>
 #include <linux/sockios.h>
@@ -98,6 +97,11 @@ static int nr_state1_machine(struct sock *sk, struct sk_buff *skb,
 		nr_disconnect(sk, ECONNREFUSED);
 		break;
 
+	case NR_RESET:
+		if (sysctl_netrom_reset_circuit)
+			nr_disconnect(sk, ECONNRESET);
+		break;
+
 	default:
 		break;
 	}
@@ -124,6 +128,11 @@ static int nr_state2_machine(struct sock *sk, struct sk_buff *skb,
 		nr_disconnect(sk, 0);
 		break;
 
+	case NR_RESET:
+		if (sysctl_netrom_reset_circuit)
+			nr_disconnect(sk, ECONNRESET);
+		break;
+
 	default:
 		break;
 	}
@@ -254,6 +263,11 @@ static int nr_state3_machine(struct sock *sk, struct sk_buff *skb, int frametype
 		}
 		break;
 
+	case NR_RESET:
+		if (sysctl_netrom_reset_circuit)
+			nr_disconnect(sk, ECONNRESET);
+		break;
+
 	default:
 		break;
 	}