Merge branch 'bnxt_en-fixes'
commitc5ba5c8ac86591f5ee2570ec989377cdda2be237
authorDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2015 20:07:14 +0000 (3 15:07 -0500)
committerDavid S. Miller <davem@davemloft.net>
Thu, 3 Dec 2015 20:07:14 +0000 (3 15:07 -0500)
treecac1cc1b91a074ac0129bb620716fb57cfeae6e0
parent39198ec98751477313f30569b935503b216f85d0
parentb664f008b0d885db1d5617ed1c51d29a8c04da93
Merge branch 'bnxt_en-fixes'

Michael Chan says:

====================
bnxt_en: set mac address and uc_list bug fixes.

Fix ndo_set_mac_address() for PF and VF.
Re-apply uc_list after chip reset.

v2: Fix compile error if CONFIG_BNXT_SRIOV is not set.
====================

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