unimore/kernel-hacking-2024-linux-steffo
unimore/kernel-hacking-2024-linux-steffo
1
Fork 0
Code Pull requests 5 Wiki Activity

net: sgi: ioc3-eth: protect emcr in all cases

Browse source 
emcr in private struct wasn't always protected by spinlock.

Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Thomas Bogendoerfer 2019-08-30 11:25:37 +02:00 committed by David S. Miller
parent 3498cb272e
commit d1c9454274
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/net/ethernet/sgi/ioc3-eth.c
View file

@ -729,6 +729,8 @@ static inline void ioc3_setup_duplex(struct ioc3_private *ip)
{
struct ioc3_ethregs *regs = ip->regs;
spin_lock_irq(&ip->ioc3_lock);
if (ip->mii.full_duplex) {
writel(ETCSR_FD, &regs->etcsr);
ip->emcr |= EMCR_DUPLEX;
@ -737,6 +739,8 @@ static inline void ioc3_setup_duplex(struct ioc3_private *ip)
ip->emcr &= ~EMCR_DUPLEX;
}
writel(ip->emcr, &regs->emcr);
spin_unlock_irq(&ip->ioc3_lock);
}
static void ioc3_timer(struct timer_list *t)
@ -1625,6 +1629,8 @@ static void ioc3_set_multicast_list(struct net_device *dev)
netif_stop_queue(dev); /* Lock out others. */
spin_lock_irq(&ip->ioc3_lock);
if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */
ip->emcr |= EMCR_PROMISC;
writel(ip->emcr, &regs->emcr);
@ -1653,6 +1659,8 @@ static void ioc3_set_multicast_list(struct net_device *dev)
writel(ip->ehar_l, &regs->ehar_l);
}
spin_unlock_irq(&ip->ioc3_lock);
netif_wake_queue(dev); /* Let us get going again. */
}