fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ltq-atm/ltq-ptm: add kernel 5.10 compatiblity

Browse Source 
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 <dev@kresin.me>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Mathias Kresin 2020-12-27 19:42:24 +01:00 committed by Tianling Shen
parent 0982198339
commit 17daee647c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/lantiq/ltq-atm/src/ltq_atm.c
View File

@ -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

4
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
View File

@ -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;

6
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
View File

@ -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");