diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-11-03 19:38:42 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-11-03 21:21:54 +0100 |
| commit | fbeb229a6622523c092a13c02bd0e15f69240dde (patch) | |
| tree | a48bf5ff455cedae6555ef071e0d8bdb29487824 /drivers/net/ethernet/xilinx | |
| parent | Merge branch 'add-new-pcp-and-apptrust-attributes-to-dcbnl' (diff) | |
| parent | Merge tag 'net-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | linux-fbeb229a6622523c092a13c02bd0e15f69240dde.tar.xz linux-fbeb229a6622523c092a13c02bd0e15f69240dde.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/xilinx')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 05848ff15fb5..a3967f8de417 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c @@ -108,7 +108,7 @@ * @next_tx_buf_to_use: next Tx buffer to write to * @next_rx_buf_to_use: next Rx buffer to read from * @base_addr: base address of the Emaclite device - * @reset_lock: lock used for synchronization + * @reset_lock: lock to serialize xmit and tx_timeout execution * @deferred_skb: holds an skb (for transmission at a later time) when the * Tx buffer is not free * @phy_dev: pointer to the PHY device |