diff options
author | David S. Miller <davem@davemloft.net> | 2017-03-10 04:38:32 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-10 04:38:32 +0300 |
commit | 81dca07b3be974e81cff250a19282473d67a870b (patch) | |
tree | 7d32ed82e14f6a7539f18e9229a843cf686d9820 /net/x25/af_x25.c | |
parent | 6cbac9828627b89487144c1e4448d7e0a6ab22ca (diff) | |
parent | 520ad89a54edea84496695d528f73ddcf4a52ea4 (diff) | |
download | linux-81dca07b3be974e81cff250a19282473d67a870b.tar.xz |
Merge branch 'bnxt_en-misc-small-fixes'
Michael Chan says:
====================
bnxt_en: Misc. small fixes.
Fixes include moving the initial function reset, notifying the RDMA driver
during tx timeout, setting dcbx_cap properly depending on whether the
firmware agent is running or not, and an autoneg related improvement.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/x25/af_x25.c')
0 files changed, 0 insertions, 0 deletions