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

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
...@@ -874,7 +874,6 @@ static void decode_rxts(struct dp83640_private *dp83640, ...@@ -874,7 +874,6 @@ static void decode_rxts(struct dp83640_private *dp83640,
shhwtstamps = skb_hwtstamps(skb); shhwtstamps = skb_hwtstamps(skb);
memset(shhwtstamps, 0, sizeof(*shhwtstamps)); memset(shhwtstamps, 0, sizeof(*shhwtstamps));
shhwtstamps->hwtstamp = ns_to_ktime(rxts->ns); shhwtstamps->hwtstamp = ns_to_ktime(rxts->ns);
netif_rx_ni(skb);
list_add(&rxts->list, &dp83640->rxpool); list_add(&rxts->list, &dp83640->rxpool);
break; break;
} }
...@@ -885,6 +884,9 @@ static void decode_rxts(struct dp83640_private *dp83640, ...@@ -885,6 +884,9 @@ static void decode_rxts(struct dp83640_private *dp83640,
list_add_tail(&rxts->list, &dp83640->rxts); list_add_tail(&rxts->list, &dp83640->rxts);
out: out:
spin_unlock_irqrestore(&dp83640->rx_lock, flags); spin_unlock_irqrestore(&dp83640->rx_lock, flags);
if (shhwtstamps)
netif_rx_ni(skb);
} }
static void decode_txts(struct dp83640_private *dp83640, static void decode_txts(struct dp83640_private *dp83640,
...@@ -1425,7 +1427,6 @@ static bool dp83640_rxtstamp(struct phy_device *phydev, ...@@ -1425,7 +1427,6 @@ static bool dp83640_rxtstamp(struct phy_device *phydev,
shhwtstamps = skb_hwtstamps(skb); shhwtstamps = skb_hwtstamps(skb);
memset(shhwtstamps, 0, sizeof(*shhwtstamps)); memset(shhwtstamps, 0, sizeof(*shhwtstamps));
shhwtstamps->hwtstamp = ns_to_ktime(rxts->ns); shhwtstamps->hwtstamp = ns_to_ktime(rxts->ns);
netif_rx_ni(skb);
list_del_init(&rxts->list); list_del_init(&rxts->list);
list_add(&rxts->list, &dp83640->rxpool); list_add(&rxts->list, &dp83640->rxpool);
break; break;
...@@ -1438,6 +1439,8 @@ static bool dp83640_rxtstamp(struct phy_device *phydev, ...@@ -1438,6 +1439,8 @@ static bool dp83640_rxtstamp(struct phy_device *phydev,
skb_info->tmo = jiffies + SKB_TIMESTAMP_TIMEOUT; skb_info->tmo = jiffies + SKB_TIMESTAMP_TIMEOUT;
skb_queue_tail(&dp83640->rx_queue, skb); skb_queue_tail(&dp83640->rx_queue, skb);
schedule_delayed_work(&dp83640->ts_work, SKB_TIMESTAMP_TIMEOUT); schedule_delayed_work(&dp83640->ts_work, SKB_TIMESTAMP_TIMEOUT);
} else {
netif_rx_ni(skb);
} }
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment