diff options
author | Bernard Pidoux F6BVP <f6bvp@free.fr> | 2009-12-17 05:25:18 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-01-03 21:21:16 -0800 |
commit | 1f731b63752dac76ff4dbf568a08ff2e3663316f (patch) | |
tree | 452db46db4863269d7368afcafdf2f071c803c11 /net/rose/rose_loopback.c | |
parent | 35bb5cadc8c7b1462df57e32e08d964f1be7a75c (diff) | |
download | linux-stable-1f731b63752dac76ff4dbf568a08ff2e3663316f.tar.gz linux-stable-1f731b63752dac76ff4dbf568a08ff2e3663316f.tar.bz2 linux-stable-1f731b63752dac76ff4dbf568a08ff2e3663316f.zip |
rose_loopback_timer sets VC number <= ROSE_DEFAULT_MAXVC
cat /proc/net/rose displayed a rose sockets abnormal lci value, i.e.
greater than maximum number of VCs per neighbour allowed.
This number prevents further test of lci value during rose operations.
Example (lines shortened) :
[bernard]# cat /proc/net/rose
dest_addr dest_call src_addr src_call dev lci neigh st vs vr va
* * 2080175520 F6BVP-1 rose0 000 00000 0 0 0 0
2080175520 FPAD-0 2080175520 WP-0 rose0 FFE 00001 3 0 0 0
Here are the default parameters :
linux/include/net/rose.h:#define ROSE_DEFAULT_MAXVC 50 /* Maximum number of VCs per neighbour */
linux/net/rose/af_rose.c:int sysctl_rose_maximum_vcs = ROSE_DEFAULT_MAXVC;
With the following patch, rose_loopback_timer() attributes a VC number
within limits.
Signed-off-by: Bernard Pidoux <f6bvp@amsat.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rose/rose_loopback.c')
-rw-r--r-- | net/rose/rose_loopback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c index 114df6eec8c3..968e8bac1b5d 100644 --- a/net/rose/rose_loopback.c +++ b/net/rose/rose_loopback.c @@ -75,7 +75,7 @@ static void rose_loopback_timer(unsigned long param) lci_i = ((skb->data[0] << 8) & 0xF00) + ((skb->data[1] << 0) & 0x0FF); frametype = skb->data[2]; dest = (rose_address *)(skb->data + 4); - lci_o = 0xFFF - lci_i; + lci_o = ROSE_DEFAULT_MAXVC + 1 - lci_i; skb_reset_transport_header(skb); |