diff options
| author | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2015-01-30 10:16:33 +0100 |
| commit | 1cd6b7be92016538ea1f2a8e1f955e9b974d93ea (patch) | |
| tree | 77ca10be1da7aaf19cde95de0cb9c4bfcde636a0 /net/openvswitch/vport.c | |
| parent | a39427007e7ccd83dbb7cd81b18156cebeab4d1e (diff) | |
| parent | 14bf61ffe6ac54afcd1e888a4407fe16054483db (diff) | |
| download | op-kernel-dev-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.zip op-kernel-dev-1cd6b7be92016538ea1f2a8e1f955e9b974d93ea.tar.gz | |
Merge branch 'for_linus' into for_next
Diffstat (limited to 'net/openvswitch/vport.c')
| -rw-r--r-- | net/openvswitch/vport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/vport.c b/net/openvswitch/vport.c index 53f3ebb..2034c6d 100644 --- a/net/openvswitch/vport.c +++ b/net/openvswitch/vport.c @@ -480,7 +480,7 @@ void ovs_vport_receive(struct vport *vport, struct sk_buff *skb, stats = this_cpu_ptr(vport->percpu_stats); u64_stats_update_begin(&stats->syncp); stats->rx_packets++; - stats->rx_bytes += skb->len; + stats->rx_bytes += skb->len + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0); u64_stats_update_end(&stats->syncp); OVS_CB(skb)->input_vport = vport; |
