Skip to content

Commit

Permalink
ltq-ptm: fix build with kernel 4.9
Browse files Browse the repository at this point in the history
Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
hauke committed Feb 11, 2017
1 parent d61a799 commit c7ce990
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
8 changes: 8 additions & 0 deletions package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,11 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* allocate descriptor */
desc_base = get_tx_desc(ndev, &f_full);
if ( f_full ) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
netif_trans_update(dev);
#else
dev->trans_start = jiffies;
#endif
netif_stop_queue(dev);

IFX_REG_W32_MASK(0, 1 << (ndev + 16), MBOX_IGU1_ISRC);
Expand Down Expand Up @@ -439,7 +443,11 @@ 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_bytes += reg_desc.datalen;

#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
netif_trans_update(dev);
#else
dev->trans_start = jiffies;
#endif
mailbox_signal(ndev, 1);

adsl_led_flash();
Expand Down
8 changes: 8 additions & 0 deletions package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,11 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* allocate descriptor */
desc_base = get_tx_desc(0, &f_full);
if ( f_full ) {
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
netif_trans_update(dev);
#else
dev->trans_start = jiffies;
#endif
netif_stop_queue(dev);

IFX_REG_W32_MASK(0, 1 << 17, MBOX_IGU1_ISRC);
Expand Down Expand Up @@ -348,7 +352,11 @@ static int ptm_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
wmb();
*(volatile unsigned int *)desc = *(unsigned int *)&reg_desc;

#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0)
netif_trans_update(dev);
#else
dev->trans_start = jiffies;
#endif

return 0;

Expand Down

0 comments on commit c7ce990

Please sign in to comment.