Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[mirror_ubuntu-disco-kernel.git] / drivers / net / bonding / bond_main.c

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 99a3b0cd5bd690e04cec718739920f76890f3a8f..c669554d70bb7c7ba2fe3091ed1c58bd3026229f 100644 (file)
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1167,7 +1167,7 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
        slave = bond_slave_get_rcu(skb->dev);
        bond = slave->bond;
 
-       recv_probe = ACCESS_ONCE(bond->recv_probe);
+       recv_probe = READ_ONCE(bond->recv_probe);
        if (recv_probe) {
                ret = recv_probe(skb, bond, slave);
                if (ret == RX_HANDLER_CONSUMED) {
@@ -3825,7 +3825,7 @@ static int bond_xmit_roundrobin(struct sk_buff *skb, struct net_device *bond_dev
                else
                        bond_xmit_slave_id(bond, skb, 0);
        } else {
-               int slave_cnt = ACCESS_ONCE(bond->slave_cnt);
+               int slave_cnt = READ_ONCE(bond->slave_cnt);
 
                if (likely(slave_cnt)) {
                        slave_id = bond_rr_gen_slave_id(bond);
@@ -3987,7 +3987,7 @@ static int bond_3ad_xor_xmit(struct sk_buff *skb, struct net_device *dev)
        unsigned int count;
 
        slaves = rcu_dereference(bond->slave_arr);
-       count = slaves ? ACCESS_ONCE(slaves->count) : 0;
+       count = slaves ? READ_ONCE(slaves->count) : 0;
        if (likely(count)) {
                slave = slaves->arr[bond_xmit_hash(bond, skb) % count];
                bond_dev_queue_xmit(bond, skb, slave->dev);