KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ltq-ptm: use netif_trans_update() only for kernel >= 4.7

Browse source 
This fixes a bug introduced in commit c7ce9908bd
"ltq-ptm: fix build with kernel 4.9"

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2017-02-12 01:03:18 +01:00
parent 863e79f8d5
commit 2eed1179be
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -405,7 +405,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* allocate descriptor */ /* allocate descriptor */
desc_base = get_tx_desc(ndev, &f_full); desc_base = get_tx_desc(ndev, &f_full);
if ( f_full ) { if ( f_full ) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;
@ -443,7 +443,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
g_ptm_priv_data.itf[ndev].stats.tx_packets++; g_ptm_priv_data.itf[ndev].stats.tx_packets++;
g_ptm_priv_data.itf[ndev].stats.tx_bytes += reg_desc.datalen; g_ptm_priv_data.itf[ndev].stats.tx_bytes += reg_desc.datalen;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;

4
package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
View file

@ -289,7 +289,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* allocate descriptor */ /* allocate descriptor */
desc_base = get_tx_desc(0, &f_full); desc_base = get_tx_desc(0, &f_full);
if ( f_full ) { if ( f_full ) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;
@ -352,7 +352,7 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
wmb(); wmb();
*(volatile unsigned int *)desc = *(unsigned int *)&reg_desc; *(volatile unsigned int *)desc = *(unsigned int *)&reg_desc;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0)
netif_trans_update(dev); netif_trans_update(dev);
#else #else
dev->trans_start = jiffies; dev->trans_start = jiffies;