Commit da0e5171 authored by David S. Miller's avatar David S. Miller

Merge branch 'ieee802154-for-davem-2019-01-31' of...

Merge branch 'ieee802154-for-davem-2019-01-31' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan

Stefan Schmidt says:

====================
pull-request: ieee802154 for net 2019-01-31

An update from ieee802154 for your *net* tree.

I waited a while to see if anything else comes up, but it seems this time
we only have one fixup patch for the -rc rounds.
Colin fixed some indentation in the mcr20a drivers. That's about it.

If there are any problems with taking these two before the final 5.0 let
me know.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6fa19f56 34aaaac8
...@@ -905,9 +905,9 @@ mcr20a_irq_clean_complete(void *context) ...@@ -905,9 +905,9 @@ mcr20a_irq_clean_complete(void *context)
} }
break; break;
case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_SEQIRQ): case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_SEQIRQ):
/* rx is starting */ /* rx is starting */
dev_dbg(printdev(lp), "RX is starting\n"); dev_dbg(printdev(lp), "RX is starting\n");
mcr20a_handle_rx(lp); mcr20a_handle_rx(lp);
break; break;
case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ): case (DAR_IRQSTS1_RXIRQ | DAR_IRQSTS1_TXIRQ | DAR_IRQSTS1_SEQIRQ):
if (lp->is_tx) { if (lp->is_tx) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment