renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
Code

net: loopback driver cleanup

Browse Source 
loopback driver uses dev->ml_priv to store its percpu stats pointer.
It uses ugly casts "(void __percpu __force *)" to shut up sparse
complains.

Define an union to better document we use ml_priv in loopback driver and
define a lstats field with appropriate types.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2010-09-23 23:51:51 +00:00 committed by David S. Miller
parent 83180af0b0
commit a7855c78a2
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/loopback.c
View File

@ -74,7 +74,6 @@ struct pcpu_lstats {
static netdev_tx_t loopback_xmit(struct sk_buff *skb, static netdev_tx_t loopback_xmit(struct sk_buff *skb,
struct net_device *dev) struct net_device *dev)
{ {
struct pcpu_lstats __percpu *pcpu_lstats;
struct pcpu_lstats *lb_stats; struct pcpu_lstats *lb_stats;
int len; int len;
@ -83,8 +82,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
/* it's OK to use per_cpu_ptr() because BHs are off */ /* it's OK to use per_cpu_ptr() because BHs are off */
pcpu_lstats = (void __percpu __force *)dev->ml_priv; lb_stats = this_cpu_ptr(dev->lstats);
lb_stats = this_cpu_ptr(pcpu_lstats);
len = skb->len; len = skb->len;
if (likely(netif_rx(skb) == NET_RX_SUCCESS)) { if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {
@ -101,19 +99,17 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev, static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev,
struct rtnl_link_stats64 *stats) struct rtnl_link_stats64 *stats)
{ {
const struct pcpu_lstats __percpu *pcpu_lstats;
u64 bytes = 0; u64 bytes = 0;
u64 packets = 0; u64 packets = 0;
u64 drops = 0; u64 drops = 0;
int i; int i;
pcpu_lstats = (void __percpu __force *)dev->ml_priv;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
const struct pcpu_lstats *lb_stats; const struct pcpu_lstats *lb_stats;
u64 tbytes, tpackets; u64 tbytes, tpackets;
unsigned int start; unsigned int start;
lb_stats = per_cpu_ptr(pcpu_lstats, i); lb_stats = per_cpu_ptr(dev->lstats, i);
do { do {
start = u64_stats_fetch_begin(&lb_stats->syncp); start = u64_stats_fetch_begin(&lb_stats->syncp);
tbytes = lb_stats->bytes; tbytes = lb_stats->bytes;
@ -147,22 +143,16 @@ static const struct ethtool_ops loopback_ethtool_ops = {
static int loopback_dev_init(struct net_device *dev) static int loopback_dev_init(struct net_device *dev)
{ {
struct pcpu_lstats __percpu *lstats; dev->lstats = alloc_percpu(struct pcpu_lstats);
if (!dev->lstats)
lstats = alloc_percpu(struct pcpu_lstats);
if (!lstats)
return -ENOMEM; return -ENOMEM;
dev->ml_priv = (void __force *)lstats;
return 0; return 0;
} }
static void loopback_dev_free(struct net_device *dev) static void loopback_dev_free(struct net_device *dev)
{ {
struct pcpu_lstats __percpu *lstats = free_percpu(dev->lstats);
(void __percpu __force *)dev->ml_priv;
free_percpu(lstats);
free_netdev(dev); free_netdev(dev);
} }

6
include/linux/netdevice.h
View File

@ -1050,8 +1050,10 @@ struct net_device {
#endif #endif
/* mid-layer private */ /* mid-layer private */
void *ml_priv; union {
void *ml_priv;
struct pcpu_lstats __percpu *lstats; /* loopback stats */
};
/* GARP */ /* GARP */
struct garp_port *garp_port; struct garp_port *garp_port;