lkml.org 
[lkml]   [2012]   [Jun]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: Deadlock, L2TP over IP are not working, 3.4.1
From
Date
On Sun, 2012-06-10 at 15:31 +0200, Eric Dumazet wrote:

> include/linux/netdevice.h | 40 ++++++++++++++++++++++++++++--------
> net/l2tp/l2tp_eth.c | 29 +++++++++++++-------------
> 2 files changed, 47 insertions(+), 22 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index d94cb14..1dee75a 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -171,14 +171,38 @@ static inline bool dev_xmit_complete(int rc)
> */
>
> struct net_device_stats {
> - unsigned long rx_packets;
> - unsigned long tx_packets;
> - unsigned long rx_bytes;
> - unsigned long tx_bytes;
> - unsigned long rx_errors;
> - unsigned long tx_errors;
> - unsigned long rx_dropped;
> - unsigned long tx_dropped;
> + union {
> + unsigned long rx_packets;
> + atomic_long_t rx_packets_atomic;
> + };
> + union {
> + unsigned long tx_packets;
> + atomic_long_t tx_packets_atomic;
> + };
> + union {
> + unsigned long rx_bytes;
> + atomic_long_t rx_bytes_atomic;
> + };
> + union {
> + unsigned long tx_bytes;
> + atomic_long_t tx_bytes_atomic;
> + };
> + union {
> + unsigned long rx_errors;
> + atomic_long_t rx_errors_atomic;
> + };
> + union {
> + unsigned long tx_errors;
> + atomic_long_t tx_errors_atomic;
> + };
> + union {
> + unsigned long rx_dropped;
> + atomic_long_t rx_dropped_atomic;
> + };
> + union {
> + unsigned long tx_dropped;
> + atomic_long_t tx_dropped_atomic;
> + };

Other choice would be to have a new structure

struct net_device_atomic_stats {
atomic_long_t rx_packets;
atomic_long_t tx_packets;
atomic_long_t rx_bytes;
atomic_long_t tx_bytes;
atomic_long_t rx_errors;
atomic_long_t tx_errors;
atomic_long_t rx_dropped;
atomic_long_t tx_dropped;
...
};

and to union it in :

struct net_device {
...
union {
struct net_device_stats stats;
struct net_device_atomic_stats atom_stats;
};
...
};




\
 
 \ /
  Last update: 2012-06-10 16:01    [W:0.176 / U:0.308 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site