From fa82985d52cac34a8bfeb0e01a21ac5a61c2146b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 13 Mar 2025 17:21:39 +0000 Subject: [PATCH] Revert "net: usb: rtl8150: use new tasklet API" This reverts commit 88892dabacd54b0e6bb85a1d9309f73fcd6bf342 which is commit 1999ad32d4ff00581007543adffc465694b2e77b upstream. It breaks the Android kernel abi and can be brought back in the future in an abi-safe way if it is really needed. Bug: 161946584 Change-Id: I69c9fbd5fada4d468c2d2f4713f36b0ff230a013 Signed-off-by: Greg Kroah-Hartman --- drivers/net/usb/rtl8150.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c index cbadb53bac44..387091cb9134 100644 --- a/drivers/net/usb/rtl8150.c +++ b/drivers/net/usb/rtl8150.c @@ -597,9 +597,9 @@ static void free_skb_pool(rtl8150_t *dev) dev_kfree_skb(dev->rx_skb_pool[i]); } -static void rx_fixup(struct tasklet_struct *t) +static void rx_fixup(unsigned long data) { - struct rtl8150 *dev = from_tasklet(dev, t, tl); + struct rtl8150 *dev = (struct rtl8150 *)data; struct sk_buff *skb; int status; @@ -899,7 +899,7 @@ static int rtl8150_probe(struct usb_interface *intf, return -ENOMEM; } - tasklet_setup(&dev->tl, rx_fixup); + tasklet_init(&dev->tl, rx_fixup, (unsigned long)dev); spin_lock_init(&dev->rx_pool_lock); dev->udev = udev;