diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-11-10 23:42:00 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-16 11:15:08 -0800 |
| commit | 4af429d29b341bb1735f04c2fb960178ed5d52e7 (patch) | |
| tree | b5179224883dc56cde57058014480e4bcf22b75b /net/8021q/vlan.h | |
| parent | 8ffab51b3dfc54876f145f15b351c41f3f703195 (diff) | |
| download | linux-rpi-4af429d29b341bb1735f04c2fb960178ed5d52e7.tar.gz linux-rpi-4af429d29b341bb1735f04c2fb960178ed5d52e7.tar.bz2 linux-rpi-4af429d29b341bb1735f04c2fb960178ed5d52e7.zip | |
vlan: lockless transmit path
vlan is a stacked device, like tunnels. We should use the lockless
mechanism we are using in tunnels and loopback.
This patch completely removes locking in TX path.
tx stat counters are added into existing percpu stat structure, renamed
from vlan_rx_stats to vlan_pcpu_stats.
Note : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan
device)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q/vlan.h')
| -rw-r--r-- | net/8021q/vlan.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h index 4625ba64dfdc..5687c9b95f33 100644 --- a/net/8021q/vlan.h +++ b/net/8021q/vlan.h @@ -19,19 +19,25 @@ struct vlan_priority_tci_mapping { /** - * struct vlan_rx_stats - VLAN percpu rx stats + * struct vlan_pcpu_stats - VLAN percpu rx/tx stats * @rx_packets: number of received packets * @rx_bytes: number of received bytes * @rx_multicast: number of received multicast packets + * @tx_packets: number of transmitted packets + * @tx_bytes: number of transmitted bytes * @syncp: synchronization point for 64bit counters - * @rx_errors: number of errors + * @rx_errors: number of rx errors + * @tx_dropped: number of tx drops */ -struct vlan_rx_stats { +struct vlan_pcpu_stats { u64 rx_packets; u64 rx_bytes; u64 rx_multicast; + u64 tx_packets; + u64 tx_bytes; struct u64_stats_sync syncp; - unsigned long rx_errors; + u32 rx_errors; + u32 tx_dropped; }; /** @@ -45,7 +51,7 @@ struct vlan_rx_stats { * @real_dev: underlying netdevice * @real_dev_addr: address of underlying netdevice * @dent: proc dir entry - * @vlan_rx_stats: ptr to percpu rx stats + * @vlan_pcpu_stats: ptr to percpu rx stats */ struct vlan_dev_info { unsigned int nr_ingress_mappings; @@ -60,7 +66,7 @@ struct vlan_dev_info { unsigned char real_dev_addr[ETH_ALEN]; struct proc_dir_entry *dent; - struct vlan_rx_stats __percpu *vlan_rx_stats; + struct vlan_pcpu_stats __percpu *vlan_pcpu_stats; }; static inline struct vlan_dev_info *vlan_dev_info(const struct net_device *dev) |