diff options
| author | David S. Miller | 2016-06-30 11:03:36 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-06-30 11:03:36 +0200 |
| commit | ee58b57100ca953da7320c285315a95db2f7053d (patch) | |
| tree | 77b815a31240adc4d6326346908137fc6c2c3a96 /net/rds/loop.c | |
| parent | Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirshe... (diff) | |
| parent | Merge tag 'nfs-for-4.7-2' of git://git.linux-nfs.org/projects/anna/linux-nfs (diff) | |
| download | kernel-qcow2-linux-ee58b57100ca953da7320c285315a95db2f7053d.tar.gz kernel-qcow2-linux-ee58b57100ca953da7320c285315a95db2f7053d.tar.xz kernel-qcow2-linux-ee58b57100ca953da7320c285315a95db2f7053d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Several cases of overlapping changes, except the packet scheduler
conflicts which deal with the addition of the free list parameter
to qdisc_enqueue().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rds/loop.c')
| -rw-r--r-- | net/rds/loop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/rds/loop.c b/net/rds/loop.c index 268f07faaa1a..15f83db78f0c 100644 --- a/net/rds/loop.c +++ b/net/rds/loop.c @@ -96,8 +96,9 @@ out: */ static void rds_loop_inc_free(struct rds_incoming *inc) { - struct rds_message *rm = container_of(inc, struct rds_message, m_inc); - rds_message_put(rm); + struct rds_message *rm = container_of(inc, struct rds_message, m_inc); + + rds_message_put(rm); } /* we need to at least give the thread something to succeed */ |