Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d36b82bc authored by Stefan Sørensen's avatar Stefan Sørensen Committed by David S. Miller
Browse files

dp83640: don't hold spinlock while calling netif_rx_ni 



We should not hold a spinlock while pushing the skb into the networking
stack, so move the call to netif_rx_ni out of the critical region to where
we have dropped the spinlock.

Signed-off-by: default avatarStefan Sørensen <stefan.sorensen@spectralink.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f379fdf1

drivers/net/phy/dp83640.c

+5 −2
Original line number Diff line number Diff line
@@ -874,7 +874,6 @@ static void decode_rxts(struct dp83640_private *dp83640, 
			shhwtstamps = skb_hwtstamps(skb);

			memset(shhwtstamps, 0, sizeof(*shhwtstamps));

			shhwtstamps->hwtstamp = ns_to_ktime(rxts->ns);

			netif_rx_ni(skb);

			list_add(&rxts->list, &dp83640->rxpool);

			break;

		}
@@ -885,6 +884,9 @@ static void decode_rxts(struct dp83640_private *dp83640, 
		list_add_tail(&rxts->list, &dp83640->rxts);

out:

	spin_unlock_irqrestore(&dp83640->rx_lock, flags);



	if (shhwtstamps)

		netif_rx_ni(skb);

}



static void decode_txts(struct dp83640_private *dp83640,
@@ -1425,7 +1427,6 @@ static bool dp83640_rxtstamp(struct phy_device *phydev, 
			shhwtstamps = skb_hwtstamps(skb);

			memset(shhwtstamps, 0, sizeof(*shhwtstamps));

			shhwtstamps->hwtstamp = ns_to_ktime(rxts->ns);

			netif_rx_ni(skb);

			list_del_init(&rxts->list);

			list_add(&rxts->list, &dp83640->rxpool);

			break;
@@ -1438,6 +1439,8 @@ static bool dp83640_rxtstamp(struct phy_device *phydev, 
		skb_info->tmo = jiffies + SKB_TIMESTAMP_TIMEOUT;

		skb_queue_tail(&dp83640->rx_queue, skb);

		schedule_delayed_work(&dp83640->ts_work, SKB_TIMESTAMP_TIMEOUT);

	} else {

		netif_rx_ni(skb);

	}



	return true;