summaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-11-24 16:01:23 -0500
committerDavid S. Miller <davem@davemloft.net>2016-11-24 16:01:23 -0500
commitfab96ec86771a5815024651cc1356783c70f55b1 (patch)
tree38a16bc5ebb219b31233c2f61cb9109590a8210f /drivers/pcmcia
parentac32378f3eca55123fe917a6bb38e581118de9e3 (diff)
parentde0af0bf64fc11fab253f63424bd3aba12e5f614 (diff)
downloadlinux-fab96ec86771a5815024651cc1356783c70f55b1.tar.bz2
Merge branch 'mlx5-next'
Saeed Mahameed says: ==================== Mellanox 100G mlx5 SRIOV switchdev update This series from Roi and Or further enhances the new SRIOV switchdev mode. Roi's patches deal with allowing users to configure though devlink the level of inline headers that the VF should be setting in order for the eswitch HW to do proper matching. We also enforce that the matching required for offloaded TC rules is aligned with that level on the PF driver. Or's patches deals with allowing the user to control on the VF operational link state through admin directives on the mlx5 VF rep link. Also in this series is implementation of HW and SW counters for the mlx5 VF rep which is aligned with the design set by commit a5ea31f57309 'Merge branch net-offloaded-stats'. v1 --> v2: * constified the net-device param of get offloaded stats ndo in mlxsw (pointed by 0-day screaming on us...) * added Or's Review-by tags for Roi's patches This series was generated against commit e796f49d826a ("net: ieee802154: constify ieee802154_ops structures") ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions