From: David S. Miller Date: Wed, 17 May 2017 19:12:50 +0000 (-0400) Subject: Merge branch 'bnxt_en-DCBX-fixes' X-Git-Tag: v4.12-rc2~24^2~14 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f917174caf71a470e520fbee0daf9d9e62da3ef6;p=linux-2.6-block.git Merge branch 'bnxt_en-DCBX-fixes' Michael Chan says: ==================== bnxt_en: DCBX fixes. 2 bug fixes for the case where the NIC's firmware DCBX agent is enabled. With these fixes, we will return the proper information to lldpad. ==================== Signed-off-by: David S. Miller --- f917174caf71a470e520fbee0daf9d9e62da3ef6