]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:08:36 +0000 (09:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:08:36 +0000 (09:08 -0700)
commitfc9b7293e6823584bbf1bee1edcb147a1995e467
tree19b942f2f76ac87a508df1161091b088fcb616ad
parentb8bea92db357afa4cbc81566cfcc84efb96e7641
parent47a0f80b2148d23a6941eaa49c7ea6fdcaecf6c0
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

Ben Hutchings says:

====================
1. Fix potential badness when running a self-test with SR-IOV enabled.
2. Fix calculation of some interface statistics that could run backward.
3. Miscellaneous cleanup.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sfc/net_driver.h
drivers/net/ethernet/sfc/rx.c