2 files changed, 5 insertions, 0 deletions

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 56c823c175fe..39575d764974 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4564,6 +4564,8 @@ static int bond_init(struct net_device *bond_dev, struct bond_params *params)
         bond_dev->tx_queue_len = 0;
         bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;
         bond_dev->priv_flags |= IFF_BONDING;
+        if (bond->params.arp_interval)
+                bond_dev->priv_flags |= IFF_MASTER_ARPMON;
 
         /* At first, we block adding VLANs. That's the only way to
          * prevent problems that occur when adding VLANs over an
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 296a865b75d2..e400d7dfdfc8 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -620,6 +620,8 @@ static ssize_t bonding_store_arp_interval(struct device *d,
                ": %s: Setting ARP monitoring interval to %d.\n",
                bond->dev->name, new_value);
         bond->params.arp_interval = new_value;
+        if (bond->params.arp_interval)
+                bond->dev->priv_flags |= IFF_MASTER_ARPMON;
         if (bond->params.miimon) {
                 printk(KERN_INFO DRV_NAME
                        ": %s: ARP monitoring cannot be used with MII monitoring. "
@@ -1039,6 +1041,7 @@ static ssize_t bonding_store_miimon(struct device *d,
                                "ARP monitoring. Disabling ARP monitoring...\n",
                                bond->dev->name);
                         bond->params.arp_interval = 0;
+                        bond->dev->priv_flags &= ~IFF_MASTER_ARPMON;
                         if (bond->params.arp_validate) {
                                 bond_unregister_arp(bond);
                                 bond->params.arp_validate =