diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-05-07 02:55:41 +0000 |
| commit | dcec8a13bf565e47942a1751a9cec21bec5648fe (patch) | |
| tree | 548b69625b18cc2e88c3e68d0923be546c9ebb03 /net/netrom/nr_subr.c | |
| parent | 2e0f55e79c49509b7ff70ff1a10e1e9e90a3dfd4 (diff) | |
o Merge with Linux 2.1.99.
o Fix ancient bug in the ELF loader making ldd crash.
o Fix ancient bug in the keyboard code for SGI, SNI and Jazz.
Diffstat (limited to 'net/netrom/nr_subr.c')
| -rw-r--r-- | net/netrom/nr_subr.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/net/netrom/nr_subr.c b/net/netrom/nr_subr.c index 7ae69fe07..096ca3a8f 100644 --- a/net/netrom/nr_subr.c +++ b/net/netrom/nr_subr.c @@ -229,7 +229,7 @@ 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. */ -void nr_transmit_dm(struct sk_buff *skb) +void nr_transmit_refusal(struct sk_buff *skb, int mine) { struct sk_buff *skbn; unsigned char *dptr; @@ -258,10 +258,18 @@ void nr_transmit_dm(struct sk_buff *skb) *dptr++ = sysctl_netrom_network_ttl_initialiser; - *dptr++ = skb->data[15]; - *dptr++ = skb->data[16]; - *dptr++ = 0; - *dptr++ = 0; + if (mine) { + *dptr++ = 0; + *dptr++ = 0; + *dptr++ = skb->data[15]; + *dptr++ = skb->data[16]; + } else { + *dptr++ = skb->data[15]; + *dptr++ = skb->data[16]; + *dptr++ = 0; + *dptr++ = 0; + } + *dptr++ = NR_CONNACK | NR_CHOKE_FLAG; *dptr++ = 0; |