diff options
| author | David S. Miller <davem@davemloft.net> | 2018-09-25 13:35:29 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-25 13:35:29 -0400 |
| commit | a06ee256e5d6f03fffbd088de9bf84035658cc5a (patch) | |
| tree | 9b88044cd4a46496d15a05b43246810c8b677f46 /net/rds | |
| parent | bd6207202db8974ca3d3183ca0d5611d45b2973c (diff) | |
| parent | 846e8dd47c264e0b359afed28ea88e0acdee6818 (diff) | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Version bump conflict in batman-adv, take what's in net-next.
iavf conflict, adjustment of netdev_ops in net-next conflicting
with poll controller method removal in net.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/ib.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/ib.h b/net/rds/ib.h index 73427ff439f9..71ff356ee702 100644 --- a/net/rds/ib.h +++ b/net/rds/ib.h | |||
| @@ -443,7 +443,7 @@ int rds_ib_send_grab_credits(struct rds_ib_connection *ic, u32 wanted, | |||
| 443 | int rds_ib_xmit_atomic(struct rds_connection *conn, struct rm_atomic_op *op); | 443 | int rds_ib_xmit_atomic(struct rds_connection *conn, struct rm_atomic_op *op); |
| 444 | 444 | ||
| 445 | /* ib_stats.c */ | 445 | /* ib_stats.c */ |
| 446 | DECLARE_PER_CPU(struct rds_ib_statistics, rds_ib_stats); | 446 | DECLARE_PER_CPU_SHARED_ALIGNED(struct rds_ib_statistics, rds_ib_stats); |
| 447 | #define rds_ib_stats_inc(member) rds_stats_inc_which(rds_ib_stats, member) | 447 | #define rds_ib_stats_inc(member) rds_stats_inc_which(rds_ib_stats, member) |
| 448 | #define rds_ib_stats_add(member, count) \ | 448 | #define rds_ib_stats_add(member, count) \ |
| 449 | rds_stats_add_which(rds_ib_stats, member, count) | 449 | rds_stats_add_which(rds_ib_stats, member, count) |