diff options
author | David S. Miller <davem@davemloft.net> | 2017-03-07 13:47:16 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-03-07 13:47:16 -0800 |
commit | b73d2da8c724bb26885512e1ba47b91e2a9f48c3 (patch) | |
tree | 8bb7a94c993c7896097f9b568bd1618ebc087ee4 /net/ipv4/tcp_timer.c | |
parent | 239870f2a0ebf75cc8f6d987dc528c5243f93d69 (diff) | |
parent | e39513259450a8312cb98a9a3b16bb924310dbcc (diff) | |
download | linux-b73d2da8c724bb26885512e1ba47b91e2a9f48c3.tar.bz2 |
Merge branch 'bnx2x-fixes'
Michal Schmidt says:
====================
bnx2x: PTP crash, VF VLAN fixes
here are fixes for a crash with PTP, a crash in setting of VF multicast
addresses, and non-working VLAN filters configuration from the VF side.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions