diff options
author | Li RongQing <lirongqing@baidu.com> | 2018-09-14 16:00:51 +0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-14 08:32:23 -0700 |
commit | 52bb6677d530d37055092d86b4eab69dce6c166a (patch) | |
tree | 9701036db4955aa531c835ca07e186aaf3662601 /drivers/net/vsockmon.c | |
parent | ee4fccbee7d397c4d937e20d8c76212ffc23a7e3 (diff) | |
download | linux-stable-52bb6677d530d37055092d86b4eab69dce6c166a.tar.gz linux-stable-52bb6677d530d37055092d86b4eab69dce6c166a.tar.bz2 linux-stable-52bb6677d530d37055092d86b4eab69dce6c166a.zip |
net: move definition of pcpu_lstats to header file
pcpu_lstats is defined in several files, so unify them as one
and move to header file
Signed-off-by: Zhang Yu <zhangyu31@baidu.com>
Signed-off-by: Li RongQing <lirongqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vsockmon.c')
-rw-r--r-- | drivers/net/vsockmon.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/vsockmon.c b/drivers/net/vsockmon.c index c28bdce14fd5..7bad5c95551f 100644 --- a/drivers/net/vsockmon.c +++ b/drivers/net/vsockmon.c @@ -11,12 +11,6 @@ #define DEFAULT_MTU (VIRTIO_VSOCK_MAX_PKT_BUF_SIZE + \ sizeof(struct af_vsockmon_hdr)) -struct pcpu_lstats { - u64 rx_packets; - u64 rx_bytes; - struct u64_stats_sync syncp; -}; - static int vsockmon_dev_init(struct net_device *dev) { dev->lstats = netdev_alloc_pcpu_stats(struct pcpu_lstats); @@ -56,8 +50,8 @@ static netdev_tx_t vsockmon_xmit(struct sk_buff *skb, struct net_device *dev) struct pcpu_lstats *stats = this_cpu_ptr(dev->lstats); u64_stats_update_begin(&stats->syncp); - stats->rx_bytes += len; - stats->rx_packets++; + stats->bytes += len; + stats->packets++; u64_stats_update_end(&stats->syncp); dev_kfree_skb(skb); @@ -80,8 +74,8 @@ vsockmon_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats) do { start = u64_stats_fetch_begin_irq(&vstats->syncp); - tbytes = vstats->rx_bytes; - tpackets = vstats->rx_packets; + tbytes = vstats->bytes; + tpackets = vstats->packets; } while (u64_stats_fetch_retry_irq(&vstats->syncp, start)); packets += tpackets; |