tree 404ad71042e212734fb4c5cbf9db7c45a00f4f78
parent ebfa00c5745660fe7f0a91eea88d4dff658486c4
parent 7a4b813cb739ce598ffbad2e84d19d13fa23e25d
author David S. Miller <davem@davemloft.net> 1503713608 -0700
committer David S. Miller <davem@davemloft.net> 1503713608 -0700

Merge branch 'r8169-Be-drop-monitor-friendly'

Florian Fainelli says:

====================
r8169: Be drop monitor friendly

First patch may be questionable but no other driver appears to be
doing that and while it is defendable to account for left packets as
dropped during TX clean, this appears misleading. I picked Stanislaw
changes which brings us back to 2010, but this was present from
pre-git days as well.

Second patch fixes the two missing calls to dev_consume_skb_any().
====================

Signed-off-by: David S. Miller <davem@davemloft.net>