From: David S. Miller Date: Thu, 6 Nov 2014 20:16:44 +0000 (-0500) Subject: Merge branch 'sunvnet-next' X-Git-Tag: v3.19-rc1~118^2~253 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=271d70f4b7f2990c84138be267f8e42c33506cc7;p=~emulex%2Finfiniband.git Merge branch 'sunvnet-next' Sowmini Varadhan says: ==================== sunvnet: bug fixes This patch series has a coding-style fix and a bug fix. The coding style fix (patch 1) is the extra indentation flagged by Ben Hutchings: http://marc.info/?l=linux-netdev&m=141529243409594&w=2 The bugfix (patch 2) is the following: when vnet_event_napi() is called as part of napi_resume (i.e., continuation of a previous NAPI read that was truncated due to budget constraints), and then finds no more packets to read, the code was trying to avoid an additional trip through ldc_rx as an optimization. However, when this corner case happens, we would need to reset a number of dring state bits such as rcv_nxt carefully, which quickly becomes complex and hacky. The cleaner solution is to just roll back to vnet_poll, re-enable interrupts and set up dring state as was done in the pre-NAPI version of the driver. ==================== Signed-off-by: David S. Miller --- 271d70f4b7f2990c84138be267f8e42c33506cc7