Skip to content

W
White Rabbit Switch - Software
Commit 7c818539 authored by Tomasz Wlostowski's avatar Tomasz Wlostowski
Browse files
Options

kernel/wr_nic: fixes to build on 4.14

parent 4ac12f3e
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
kernel/wr_nic/endpoint.c
View file @ 7c818539
......@@ -23,6 +23,7 @@ static char *macaddr = "00:00:00:00:00:00";
module_param(macaddr, charp, 0444);
/* Copied from kernel 3.6 net/utils.c, it converts from MAC string to u8 array */
#if 0
__weak int mac_pton(const char *s, u8 *mac)
{
int i;
......@@ -45,6 +46,7 @@ __weak int mac_pton(const char *s, u8 *mac)
}
return 1;
}
#endif
/*
* Phy access: used by link status, enable, calibration ioctl etc.
......
kernel/wr_nic/nic-core.c
View file @ 7c818539
......@@ -221,7 +221,7 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* We are done, this is trivial maiintainance*/
ep->stats.tx_packets++;
ep->stats.tx_bytes += len;
dev->trans_start = jiffies;
//dev->trans_start = jiffies;
//spin_unlock_irqrestore(&ep->lock, flags);
return 0;
......@@ -440,7 +440,7 @@ static void __wrn_rx_descriptor(struct wrn_dev *wrn, int desc)
skb->protocol = eth_type_trans(skb, dev);
skb->ip_summed = CHECKSUM_UNNECESSARY;
dev->last_rx = jiffies;
//dev->last_rx = jiffies;
ep->stats.rx_packets++;
ep->stats.rx_bytes += len;
netif_receive_skb(skb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment