summaryrefslogtreecommitdiff
path: root/sound/ppc/awacs.c
diff options
context:
space:
mode:
authorNetanel Belgazal <netanel@annapurnalabs.com>2017-02-09 15:21:34 +0200
committerDavid S. Miller <davem@davemloft.net>2017-02-09 22:27:06 -0500
commitb1669c9f5ac9d50651889e22e4a82f1b34af32d3 (patch)
treea423109f7ef7fad295c80a5c463bf133feed31e7 /sound/ppc/awacs.c
parent3f6159dbfc24c5e61fb5deb9b69e0abb934609bb (diff)
net/ena: use napi_complete_done() return value
Do not unamsk interrupts if we are in busy poll mode. Signed-off-by: Netanel Belgazal <netanel@annapurnalabs.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/ppc/awacs.c')
0 files changed, 0 insertions, 0 deletions
commit/drivers/usb/misc/usbsevseg.c?h=nds-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/misc/usbsevseg.c')