Merge branch 'tg3-fixes'
authorDavid S. Miller <davem@davemloft.net>
Wed, 3 Aug 2016 18:56:19 +0000 (11:56 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 3 Aug 2016 18:56:19 +0000 (11:56 -0700)
commitcfaa21893bae71f527f751e056fb35ee1dabdec1
treeb347afb8e9a916f51b03f006dada6fd242d86dc3
parent1f415a74b0ca64b5bfacbb12d71ed2ec050a8cfb
parent9ce6fd7a81e6f787756be2f4b85f4f7bb3658de3
Merge branch 'tg3-fixes'

Siva Reddy Kallam says:

====================
tg3: Disallow 0 rx coalesce time and correctly report RSS queues in tg3_get_rxnfc

First patch:
        Diasllow rx coalescing time to be 0

Second patch:
        Report the correct number of RSS queues through tg3_get_rxnfc
====================

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