git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
netrom
/
nr_subr.c
diff --git
a/net/netrom/nr_subr.c
b/net/netrom/nr_subr.c
index
0627347
..
bcb9946
100644
(file)
--- a/
net/netrom/nr_subr.c
+++ b/
net/netrom/nr_subr.c
@@
-21,7
+21,7
@@
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/sock.h>
#include <linux/netdevice.h>
#include <linux/skbuff.h>
#include <net/sock.h>
-#include <net/tcp.h>
+#include <net/tcp
_states
.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/fcntl.h>
#include <asm/uaccess.h>
#include <asm/system.h>
#include <linux/fcntl.h>
@@
-77,7
+77,7
@@
void nr_requeue_frames(struct sock *sk)
if (skb_prev == NULL)
skb_queue_head(&sk->sk_write_queue, skb);
else
if (skb_prev == NULL)
skb_queue_head(&sk->sk_write_queue, skb);
else
- skb_append(skb_prev, skb);
+ skb_append(skb_prev, skb
, &sk->sk_write_queue
);
skb_prev = skb;
}
}
skb_prev = skb;
}
}
@@
-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;
{
struct sk_buff *skbn;
unsigned char *dptr;
@@
-254,7
+253,7
@@
void nr_transmit_refusal(struct sk_buff *skb, int mine)
*dptr++ = 0;
}
*dptr++ = 0;
}
- *dptr++ =
NR_CONNACK | NR_CHOKE_FLAG
;
+ *dptr++ =
cmdflags
;
*dptr++ = 0;
if (!nr_route_frame(skbn, NULL))
*dptr++ = 0;
if (!nr_route_frame(skbn, NULL))