| Message ID | 1326189135-27770-1-git-send-email-manfred.rudigier@omicron.at |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, Jan 10, 2012 at 10:52:15AM +0100, Manfred Rudigier wrote: > Similar problem as in 481a8199142c050b72bff8a1956a49fd0a75bbe0. This fix > replaces netif_rx() with netif_rx_ni() which has to be used from > process/softirq context. Thanks for spotting this. Can you post this once again with a Cc tag for the stable branch, too? Thanks, Richard > > Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at> > --- > drivers/net/phy/dp83640.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c > index 9663e0b..ba3c591 100644 > --- a/drivers/net/phy/dp83640.c > +++ b/drivers/net/phy/dp83640.c > @@ -1159,7 +1159,7 @@ static void rx_timestamp_work(struct work_struct *work) > } > } > spin_unlock_irqrestore(&dp83640->rx_lock, flags); > - netif_rx(skb); > + netif_rx_ni(skb); > } > > /* Clear out expired time stamps. */ > -- > 1.7.0.4 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Richard Cochran [mailto:richardcochran@gmail.com] Sent: Wednesday, January 11, 2012 20:03 >> fix replaces netif_rx() with netif_rx_ni() which has to be used from >> process/softirq context. > >Thanks for spotting this. Can you post this once again with a Cc tag for the >stable branch, too? > >Thanks, >Richard Okay. Manfred -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index 9663e0b..ba3c591 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -1159,7 +1159,7 @@ static void rx_timestamp_work(struct work_struct *work) } } spin_unlock_irqrestore(&dp83640->rx_lock, flags); - netif_rx(skb); + netif_rx_ni(skb); } /* Clear out expired time stamps. */
Similar problem as in 481a8199142c050b72bff8a1956a49fd0a75bbe0. This fix replaces netif_rx() with netif_rx_ni() which has to be used from process/softirq context. Signed-off-by: Manfred Rudigier <manfred.rudigier@omicron.at> --- drivers/net/phy/dp83640.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)