diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-19 11:03:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-19 11:03:06 -0700 |
| commit | 2e2d6f0342be7f73a34526077fa96f42f0e8c661 (patch) | |
| tree | 29f3740825a70aa606e03cf3a048d9a3a751529c /net/rxrpc/call_accept.c | |
| parent | 9333f207920336575cba4ed60603c1cdb79ace4f (diff) | |
| parent | 48995423143a097527802e28d7add20e5a27677a (diff) | |
| download | linux-2e2d6f0342be7f73a34526077fa96f42f0e8c661.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/sched/cls_api.c has overlapping changes to a call to nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL to the 5th argument, and another (from 'net-next') added cb->extack instead of NULL to the 6th argument. net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to code which moved (to mr_table_dump)) in 'net-next'. Thanks to David Ahern for the heads up. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/call_accept.c')
| -rw-r--r-- | net/rxrpc/call_accept.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index e0d8ca03169a..44860505246d 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -337,7 +337,7 @@ struct rxrpc_call *rxrpc_new_incoming_call(struct rxrpc_local *local, { struct rxrpc_skb_priv *sp = rxrpc_skb(skb); struct rxrpc_connection *conn; - struct rxrpc_peer *peer; + struct rxrpc_peer *peer = NULL; struct rxrpc_call *call; _enter(""); |