projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
[linux-2.6-microblaze.git]
/
drivers
/
net
/
macsec.c
diff --git
a/drivers/net/macsec.c
b/drivers/net/macsec.c
index
f354fad
..
f1683ce
100644
(file)
--- a/
drivers/net/macsec.c
+++ b/
drivers/net/macsec.c
@@
-524,8
+524,8
@@
static void count_tx(struct net_device *dev, int ret, int len)
struct pcpu_sw_netstats *stats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&stats->syncp);
struct pcpu_sw_netstats *stats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&stats->syncp);
-
stats->tx_packets++
;
-
stats->tx_bytes += len
;
+
u64_stats_inc(&stats->tx_packets)
;
+
u64_stats_add(&stats->tx_bytes, len)
;
u64_stats_update_end(&stats->syncp);
}
}
u64_stats_update_end(&stats->syncp);
}
}
@@
-826,8
+826,8
@@
static void count_rx(struct net_device *dev, int len)
struct pcpu_sw_netstats *stats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&stats->syncp);
struct pcpu_sw_netstats *stats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&stats->syncp);
-
stats->rx_packets++
;
-
stats->rx_bytes += len
;
+
u64_stats_inc(&stats->rx_packets)
;
+
u64_stats_add(&stats->rx_bytes, len)
;
u64_stats_update_end(&stats->syncp);
}
u64_stats_update_end(&stats->syncp);
}
@@
-3464,7
+3464,7
@@
static int macsec_dev_init(struct net_device *dev)
memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
/* Get macsec's reference to real_dev */
memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
/* Get macsec's reference to real_dev */
-
dev_hold_track
(real_dev, &macsec->dev_tracker, GFP_KERNEL);
+
netdev_hold
(real_dev, &macsec->dev_tracker, GFP_KERNEL);
return 0;
}
return 0;
}
@@
-3712,7
+3712,7
@@
static void macsec_free_netdev(struct net_device *dev)
free_percpu(macsec->secy.tx_sc.stats);
/* Get rid of the macsec's reference to real_dev */
free_percpu(macsec->secy.tx_sc.stats);
/* Get rid of the macsec's reference to real_dev */
-
dev_put_track
(macsec->real_dev, &macsec->dev_tracker);
+
netdev_put
(macsec->real_dev, &macsec->dev_tracker);
}
static void macsec_setup(struct net_device *dev)
}
static void macsec_setup(struct net_device *dev)