Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 15 insertions, 0 deletions

diff --git a/net/netrom/nr_in.c b/net/netrom/nr_in.c
index 64b81a796907..004e8599b8fe 100644
--- a/net/netrom/nr_in.c
+++ b/net/netrom/nr_in.c
@@ -98,6 +98,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 +129,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 +264,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;
         }