aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/bonding/bond_main.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 9ea2f21443e..2065cb4002b 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1500,6 +1500,8 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
1500 struct sk_buff *skb = *pskb; 1500 struct sk_buff *skb = *pskb;
1501 struct slave *slave; 1501 struct slave *slave;
1502 struct bonding *bond; 1502 struct bonding *bond;
1503 void (*recv_probe)(struct sk_buff *, struct bonding *,
1504 struct slave *);
1503 1505
1504 skb = skb_share_check(skb, GFP_ATOMIC); 1506 skb = skb_share_check(skb, GFP_ATOMIC);
1505 if (unlikely(!skb)) 1507 if (unlikely(!skb))
@@ -1513,11 +1515,12 @@ static rx_handler_result_t bond_handle_frame(struct sk_buff **pskb)
1513 if (bond->params.arp_interval) 1515 if (bond->params.arp_interval)
1514 slave->dev->last_rx = jiffies; 1516 slave->dev->last_rx = jiffies;
1515 1517
1516 if (bond->recv_probe) { 1518 recv_probe = ACCESS_ONCE(bond->recv_probe);
1519 if (recv_probe) {
1517 struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC); 1520 struct sk_buff *nskb = skb_clone(skb, GFP_ATOMIC);
1518 1521
1519 if (likely(nskb)) { 1522 if (likely(nskb)) {
1520 bond->recv_probe(nskb, bond, slave); 1523 recv_probe(nskb, bond, slave);
1521 dev_kfree_skb(nskb); 1524 dev_kfree_skb(nskb);
1522 } 1525 }
1523 } 1526 }