Skip to content

W
White Rabbit Network Interface Card
Commit ca35fc55 authored by Adam Wujek's avatar Adam Wujek 💬 Committed by Miguel Jimenez Lopez
Browse files
Options

kernel/wr_nic: support variable number of counters in wr_nic 

Changes also in wr_pstats.
Wr_nic now calls callback function in wr_pstats to get counters
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 13520526
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 26 deletions
kernel/wr_nic/nic-core.c
View file @ ca35fc55
......@@ -228,10 +228,9 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
#if WR_IS_SWITCH
int (*wr_nic_pstats_callback)(int epnum,
unsigned int ctr[PSTATS_CNT_PP]);
struct net_device_stats *stats);
EXPORT_SYMBOL(wr_nic_pstats_callback);
static unsigned int nic_counters[PSTATS_CNT_PP];
static DEFINE_SPINLOCK(nic_counters_lock);
#endif
......@@ -241,31 +240,8 @@ struct net_device_stats *wrn_get_stats(struct net_device *dev)
#if WR_IS_SWITCH
if (wr_nic_pstats_callback) {
int i;
spin_lock(&nic_counters_lock);
wr_nic_pstats_callback(ep->ep_number, nic_counters);
if (0) {
/* A stupid diagnostics, happens oh so often... */
printk(KERN_INFO "counters for %i:", ep->ep_number);
for (i = 0; i < PSTATS_CNT_PP; i++)
printk(KERN_CONT " %u", nic_counters[i]);
printk(KERN_CONT "\n");
} else {
/* Recover values in the kernel structure */
ep->stats.rx_packets =
nic_counters[PSTATS_C_R_FRAME];
ep->stats.tx_packets =
nic_counters[PSTATS_C_T_FRAME];
ep->stats.rx_length_errors =
nic_counters[PSTATS_C_R_GIANT];
ep->stats.rx_crc_errors =
nic_counters[PSTATS_C_R_CRC_ERROR];
ep->stats.rx_fifo_errors =
nic_counters[PSTATS_C_R_OVERRUN];
ep->stats.tx_fifo_errors =
nic_counters[PSTATS_C_T_UNDERRUN];
}
wr_nic_pstats_callback(ep->ep_number, &(ep->stats));
spin_unlock(&nic_counters_lock);
}
#endif
......
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