Merge /spare/repo/linux-2.6/

1 files changed, 3 insertions, 4 deletions

diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c
index 587bed2674bf..bcb9946b4f56 100644
--- a/net/netrom/nr_subr.c
+++ b/net/netrom/nr_subr.c
@@ -210,10 +210,9 @@ void nr_write_internal(struct sock *sk, int frametype)
 }
 
 /*
- * This routine is called when a Connect Acknowledge with the Choke Flag
- * set is needed to refuse a connection.
+ * This routine is called to send an error reply.
  */
-void nr_transmit_refusal(struct sk_buff *skb, int mine)
+void __nr_transmit_reply(struct sk_buff *skb, int mine, unsigned char cmdflags)
 {
         struct sk_buff *skbn;
         unsigned char *dptr;
@@ -254,7 +253,7 @@ void nr_transmit_refusal(struct sk_buff *skb, int mine)
                 *dptr++ = 0;
         }
 
-        *dptr++ = NR_CONNACK | NR_CHOKE_FLAG;
+        *dptr++ = cmdflags;
         *dptr++ = 0;
 
         if (!nr_route_frame(skbn, NULL))