diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 17:05:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-15 17:05:58 -0700 |
| commit | fa04a008a16ac633a55f41baf9e84b551e613e7e (patch) | |
| tree | 47d851bf415167751d3b8c20449fdd7a035f7220 /net/rxrpc/ar-connection.c | |
| parent | d09c6b809432668371b5de9102f4f9aa6a7c79cc (diff) | |
| parent | 16c61add51f2182140637c924687a2aab6b568f9 (diff) | |
| download | op-kernel-dev-fa04a008a16ac633a55f41baf9e84b551e613e7e.zip op-kernel-dev-fa04a008a16ac633a55f41baf9e84b551e613e7e.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[RXRPC] net/rxrpc/ar-connection.c: fix NULL dereference
[TCP]: Fix logic breakage due to DSACK separation
[TCP]: Congestion control API RTT sampling fix
Diffstat (limited to 'net/rxrpc/ar-connection.c')
| -rw-r--r-- | net/rxrpc/ar-connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c index 43cb3e0..482750e 100644 --- a/net/rxrpc/ar-connection.c +++ b/net/rxrpc/ar-connection.c @@ -211,7 +211,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp) conn->header_size = sizeof(struct rxrpc_header); } - _leave(" = %p{%d}", conn, conn->debug_id); + _leave(" = %p{%d}", conn, conn ? conn->debug_id : 0); return conn; } |
