@@ -42,6 +42,11 @@ struct l2tp_eth {
4242 struct sock * tunnel_sock ;
4343 struct l2tp_session * session ;
4444 struct list_head list ;
45+ atomic_long_t tx_bytes ;
46+ atomic_long_t tx_packets ;
47+ atomic_long_t rx_bytes ;
48+ atomic_long_t rx_packets ;
49+ atomic_long_t rx_errors ;
4550};
4651
4752/* via l2tp_session_priv() */
@@ -88,24 +93,40 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
8893 struct l2tp_eth * priv = netdev_priv (dev );
8994 struct l2tp_session * session = priv -> session ;
9095
91- dev -> stats . tx_bytes += skb -> len ;
92- dev -> stats . tx_packets ++ ;
96+ atomic_long_add ( skb -> len , & priv -> tx_bytes ) ;
97+ atomic_long_inc ( & priv -> tx_packets ) ;
9398
9499 l2tp_xmit_skb (session , skb , session -> hdr_len );
95100
96101 return NETDEV_TX_OK ;
97102}
98103
104+ static struct rtnl_link_stats64 * l2tp_eth_get_stats64 (struct net_device * dev ,
105+ struct rtnl_link_stats64 * stats )
106+ {
107+ struct l2tp_eth * priv = netdev_priv (dev );
108+
109+ stats -> tx_bytes = atomic_long_read (& priv -> tx_bytes );
110+ stats -> tx_packets = atomic_long_read (& priv -> tx_packets );
111+ stats -> rx_bytes = atomic_long_read (& priv -> rx_bytes );
112+ stats -> rx_packets = atomic_long_read (& priv -> rx_packets );
113+ stats -> rx_errors = atomic_long_read (& priv -> rx_errors );
114+ return stats ;
115+ }
116+
117+
99118static struct net_device_ops l2tp_eth_netdev_ops = {
100119 .ndo_init = l2tp_eth_dev_init ,
101120 .ndo_uninit = l2tp_eth_dev_uninit ,
102121 .ndo_start_xmit = l2tp_eth_dev_xmit ,
122+ .ndo_get_stats64 = l2tp_eth_get_stats64 ,
103123};
104124
105125static void l2tp_eth_dev_setup (struct net_device * dev )
106126{
107127 ether_setup (dev );
108- dev -> priv_flags &= ~IFF_TX_SKB_SHARING ;
128+ dev -> priv_flags &= ~IFF_TX_SKB_SHARING ;
129+ dev -> features |= NETIF_F_LLTX ;
109130 dev -> netdev_ops = & l2tp_eth_netdev_ops ;
110131 dev -> destructor = free_netdev ;
111132}
@@ -114,17 +135,17 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
114135{
115136 struct l2tp_eth_sess * spriv = l2tp_session_priv (session );
116137 struct net_device * dev = spriv -> dev ;
138+ struct l2tp_eth * priv = netdev_priv (dev );
117139
118140 if (session -> debug & L2TP_MSG_DATA ) {
119141 unsigned int length ;
120- u8 * ptr = skb -> data ;
121142
122143 length = min (32u , skb -> len );
123144 if (!pskb_may_pull (skb , length ))
124145 goto error ;
125146
126147 pr_debug ("%s: eth recv\n" , session -> name );
127- print_hex_dump_bytes ("" , DUMP_PREFIX_OFFSET , ptr , length );
148+ print_hex_dump_bytes ("" , DUMP_PREFIX_OFFSET , skb -> data , length );
128149 }
129150
130151 if (!pskb_may_pull (skb , sizeof (ETH_HLEN )))
@@ -139,15 +160,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
139160 nf_reset (skb );
140161
141162 if (dev_forward_skb (dev , skb ) == NET_RX_SUCCESS ) {
142- dev -> stats . rx_packets ++ ;
143- dev -> stats . rx_bytes += data_len ;
144- } else
145- dev -> stats . rx_errors ++ ;
146-
163+ atomic_long_inc ( & priv -> rx_packets ) ;
164+ atomic_long_add ( data_len , & priv -> rx_bytes ) ;
165+ } else {
166+ atomic_long_inc ( & priv -> rx_errors ) ;
167+ }
147168 return ;
148169
149170error :
150- dev -> stats . rx_errors ++ ;
171+ atomic_long_inc ( & priv -> rx_errors ) ;
151172 kfree_skb (skb );
152173}
153174
0 commit comments