diff options
| author | David S. Miller | 2021-11-23 12:10:07 +0000 |
|---|---|---|
| committer | David S. Miller | 2021-11-23 12:10:07 +0000 |
| commit | 52911bb62ed82f0ba4dfddcd1540494d78b1a717 (patch) | |
| tree | f96c20d29b1fc0cf4eb19ae5b10b6d35c8ada14d /drivers/net/ethernet/adaptec | |
| parent | 60ebd6737c880e81eefa30b6ea7961fceee4bdec (diff) | |
| parent | f65ee535df775a13a1046c0a0b2d72db342f8a5b (diff) | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2021-11-22
Maciej Fijalkowski says:
Here are the two fixes for issues around ethtool's set_channels()
callback for ice driver. Both are related to XDP resources. First one
corrects the size of vsi->txq_map that is used to track the usage of Tx
resources and the second one prevents the wrong refcounting of bpf_prog.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/adaptec')
0 files changed, 0 insertions, 0 deletions