diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 08:44:56 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-08-29 08:44:56 +0300 |
| commit | c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8 (patch) | |
| tree | 8db2b6a6ef0a08f6e9d78dde00bf44bf60d09d54 /drivers/net/ethernet/broadcom | |
| parent | 6c9cfb853063f317b2953c5e852b6bac1eb0cade (diff) | |
| parent | 90ca51e8c654699b672ba61aeaa418dfb3252e5e (diff) | |
| download | linux-c873512ef3a39cc1a605b7a5ff2ad0a33d619aa8.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.6 net-next PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index e388bffda2dd..14b311196b8f 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -17794,10 +17794,7 @@ static int tg3_init_one(struct pci_dev *pdev, tnapi->tx_pending = TG3_DEF_TX_RING_PENDING; tnapi->int_mbox = intmbx; - if (i <= 4) - intmbx += 0x8; - else - intmbx += 0x4; + intmbx += 0x8; tnapi->consmbox = rcvmbx; tnapi->prodmbox = sndmbx; |