summaryrefslogtreecommitdiffstats
path: root/net/x25/af_x25.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-03-09 17:38:32 -0800
committerDavid S. Miller <davem@davemloft.net>2017-03-09 17:38:32 -0800
commit81dca07b3be974e81cff250a19282473d67a870b (patch)
tree7d32ed82e14f6a7539f18e9229a843cf686d9820 /net/x25/af_x25.c
parent6cbac9828627b89487144c1e4448d7e0a6ab22ca (diff)
parent520ad89a54edea84496695d528f73ddcf4a52ea4 (diff)
downloadlinux-81dca07b3be974e81cff250a19282473d67a870b.tar.bz2
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