diff options
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r-- | drivers/net/tg3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 0fa7688ab483..22cf1c446de3 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -5279,7 +5279,7 @@ static void tg3_poll_controller(struct net_device *dev) | |||
5279 | struct tg3 *tp = netdev_priv(dev); | 5279 | struct tg3 *tp = netdev_priv(dev); |
5280 | 5280 | ||
5281 | for (i = 0; i < tp->irq_cnt; i++) | 5281 | for (i = 0; i < tp->irq_cnt; i++) |
5282 | tg3_interrupt(tp->napi[i].irq_vec, dev); | 5282 | tg3_interrupt(tp->napi[i].irq_vec, &tp->napi[i]); |
5283 | } | 5283 | } |
5284 | #endif | 5284 | #endif |
5285 | 5285 | ||
@@ -9776,7 +9776,7 @@ static int tg3_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
9776 | ADVERTISED_Pause | | 9776 | ADVERTISED_Pause | |
9777 | ADVERTISED_Asym_Pause; | 9777 | ADVERTISED_Asym_Pause; |
9778 | 9778 | ||
9779 | if (!(tp->tg3_flags2 & TG3_FLAG_10_100_ONLY)) | 9779 | if (!(tp->tg3_flags & TG3_FLAG_10_100_ONLY)) |
9780 | mask |= ADVERTISED_1000baseT_Half | | 9780 | mask |= ADVERTISED_1000baseT_Half | |
9781 | ADVERTISED_1000baseT_Full; | 9781 | ADVERTISED_1000baseT_Full; |
9782 | 9782 | ||