From 17daee647c71b9031153722ecbdfa136f1a91225 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sun, 27 Dec 2020 19:42:24 +0100 Subject: [PATCH] ltq-atm/ltq-ptm: add kernel 5.10 compatiblity The callback handling of the tasklet API was redesigned and the macros using the old syntax renamed to _OLD. The stuck queue is now passed to ndo_tx_timeout callback but not used so far. Signed-off-by: Mathias Kresin Signed-off-by: Tianling Shen --- package/kernel/lantiq/ltq-atm/src/ltq_atm.c | 2 +- package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c | 4 ++-- package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c index 55362a5c7b..0d20ba2ea9 100644 --- a/package/kernel/lantiq/ltq-atm/src/ltq_atm.c +++ b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c @@ -199,7 +199,7 @@ static inline void mailbox_aal_rx_handler(void); static irqreturn_t mailbox_irq_handler(int, void *); static inline void mailbox_signal(unsigned int, int); static void do_ppe_tasklet(unsigned long); -DECLARE_TASKLET(g_dma_tasklet, do_ppe_tasklet, 0); +DECLARE_TASKLET_OLD(g_dma_tasklet, do_ppe_tasklet); /* * QSB & HTU setting functions diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c index 18c715a290..b544a00267 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c @@ -127,7 +127,7 @@ static int ptm_stop(struct net_device *); static int ptm_napi_poll(struct napi_struct *, int); static int ptm_hard_start_xmit(struct sk_buff *, struct net_device *); static int ptm_ioctl(struct net_device *, struct ifreq *, int); -static void ptm_tx_timeout(struct net_device *); +static void ptm_tx_timeout(struct net_device *, unsigned int txqueue); /* * DSL Data LED @@ -511,7 +511,7 @@ static int ptm_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return 0; } -static void ptm_tx_timeout(struct net_device *dev) +static void ptm_tx_timeout(struct net_device *dev, unsigned int txqueue) { int ndev; diff --git a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c index 44d805049b..497c15694b 100644 --- a/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c +++ b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c @@ -77,7 +77,7 @@ static int ptm_stop(struct net_device *); static int ptm_napi_poll(struct napi_struct *, int); static int ptm_hard_start_xmit(struct sk_buff *, struct net_device *); static int ptm_ioctl(struct net_device *, struct ifreq *, int); -static void ptm_tx_timeout(struct net_device *); +static void ptm_tx_timeout(struct net_device *, unsigned int txqueue); static inline struct sk_buff* alloc_skb_rx(void); static inline struct sk_buff* alloc_skb_tx(unsigned int); @@ -125,7 +125,7 @@ static char *g_net_dev_name[1] = {"dsl0"}; static int g_ptm_prio_queue_map[8]; -static DECLARE_TASKLET(g_swap_desc_tasklet, do_swap_desc_tasklet, 0); +static DECLARE_TASKLET_OLD(g_swap_desc_tasklet, do_swap_desc_tasklet); unsigned int ifx_ptm_dbg_enable = DBG_ENABLE_MASK_ERR; @@ -451,7 +451,7 @@ static int ptm_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return 0; } -static void ptm_tx_timeout(struct net_device *dev) +static void ptm_tx_timeout(struct net_device *dev, unsigned int txqueue) { ASSERT(dev == g_net_dev[0], "incorrect device");