linux.git/net/x25, branch v2.6.36

X25: Remove bkl in sockopts

2010-05-18T00:39:28+00:00

Removes the BKL in x25 setsock and getsockopts.

Signed-off-by: Andrew Hendry 
Signed-off-by: David S. Miller

X25: Move accept approve flag to bitfield

2010-05-18T00:39:27+00:00

Moves the x25 accept approve flag from char into bitfield.

Signed-off-by: Andrew Hendry 
Signed-off-by: David S. Miller

X25: Move interrupt flag to bitfield

2010-05-18T00:39:27+00:00

Moves the x25 interrupt flag from char into bitfield.

Signed-off-by: Andrew Hendry 
Signed-off-by: David S. Miller

X25: Move qbit flag to bitfield

2010-05-18T00:39:26+00:00

Moves the X25 q bit flag from char into a bitfield to allow BKL cleanup.

Signed-off-by: Andrew Hendry 
Signed-off-by: David S. Miller

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

2010-04-27T19:49:13+00:00

Conflicts:
	drivers/net/e100.c
	drivers/net/e1000e/netdev.c

X25: Add if_x25.h and x25 to device identifiers

2010-04-22T23:12:36+00:00

V2 Feedback from John Hughes.
- Add header for userspace implementations such as xot/xoe to use
- Use explicit values for interface stability
- No changes to driver patches

V1
- Use identifiers instead of magic numbers for X25 layer 3 to device interface.
- Also fixed checkpatch notes on updated code.

[ Add new user header to include/linux/Kbuild  -DaveM ]

Signed-off-by: Andrew Hendry 
Signed-off-by: David S. Miller

X25 fix dead unaccepted sockets

2010-04-21T23:31:50+00:00

1, An X25 program binds and listens
2, calls arrive waiting to be accepted
3, Program exits without accepting
4, Sockets time out but don't get correctly cleaned up
5, cat /proc/net/x25/socket shows the dead sockets with bad inode fields.

This line borrowed from AX25 sets the dying socket so the timers clean up later.

Signed-off-by: Andrew Hendry 
Signed-off-by: David S. Miller

net: sk_sleep() helper

2010-04-20T23:37:13+00:00

Define a new function to return the waitqueue of a "struct sock".

static inline wait_queue_head_t *sk_sleep(struct sock *sk)
{
	return sk->sk_sleep;
}

Change all read occurrences of sk_sleep by a call to this function.

Needed for a future RCU conversion. sk_sleep wont be a field directly
available.

Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-04-11T09:44:30+00:00

x.25 attempts to negotiate invalid throughput

2010-04-08T04:33:02+00:00

The current X.25 code has some bugs in throughput negotiation:

   1. It does negotiation in all cases, usually there is no need
   2. It incorrectly attempts to negotiate the throughput class in one
      direction only.  There are separate throughput classes for input
      and output and if either is negotiated both mist be negotiates.

This is bug https://bugzilla.kernel.org/show_bug.cgi?id=15681

This bug was first reported by Daniel Ferenci to the linux-x25 mailing
list on 6/8/2004, but is still present.

The current (2.6.34) x.25 code doesn't seem to know that the X.25
throughput facility includes two values, one for the required
throughput outbound, one for inbound.

This causes it to attempt to negotiate throughput 0x0A, which is
throughput 9600 inbound and the illegal value "0" for inbound
throughput.

Because of this some X.25 devices (e.g. Cisco 1600) refuse to connect
to Linux X.25.

The following patch fixes this behaviour.  Unless the user specifies a
required throughput it does not attempt to negotiate.  If the user
does not specify a throughput it accepts the suggestion of the remote
X.25 system.  If the user requests a throughput then it validates both
the input and output throughputs and correctly negotiates them with
the remote end.

Signed-off-by: John Hughes 
Tested-by: Andrew Hendry 
Signed-off-by: David S. Miller