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/output.c | |
parent | 9333f207920336575cba4ed60603c1cdb79ace4f (diff) | |
parent | 48995423143a097527802e28d7add20e5a27677a (diff) | |
download | linux-stable-2e2d6f0342be7f73a34526077fa96f42f0e8c661.tar.gz linux-stable-2e2d6f0342be7f73a34526077fa96f42f0e8c661.tar.bz2 linux-stable-2e2d6f0342be7f73a34526077fa96f42f0e8c661.zip |
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/output.c')
-rw-r--r-- | net/rxrpc/output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 0f0b499d1202..189418888839 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c @@ -572,7 +572,8 @@ void rxrpc_reject_packets(struct rxrpc_local *local) whdr.flags ^= RXRPC_CLIENT_INITIATED; whdr.flags &= RXRPC_CLIENT_INITIATED; - ret = kernel_sendmsg(local->socket, &msg, iov, 2, size); + ret = kernel_sendmsg(local->socket, &msg, + iov, ioc, size); if (ret < 0) trace_rxrpc_tx_fail(local->debug_id, 0, ret, rxrpc_tx_point_reject); |