--- net/ipv4/devinet.c

+++ net/ipv4/devinet.c

@@ -1032,6 +1032,21 @@ static inline bool inetdev_valid_mtu(uns

return mtu >= 68;

}

+static void inetdev_send_gratuitous_arp(struct net_device *dev,

+ struct in_device *in_dev)

+

+{

+ struct in_ifaddr *ifa = in_dev->ifa_list;

+

+ if (!ifa)

+ return;

+

+ arp_send(ARPOP_REQUEST, ETH_P_ARP,

+ ifa->ifa_address, dev,

+ ifa->ifa_address, NULL,

+ dev->dev_addr, NULL);

+}

+

/* Called only under RTNL semaphore */

static int inetdev_event(struct notifier_block *this, unsigned long event,

@@ -1083,18 +1098,13 @@ static int inetdev_event(struct notifier

}

ip_mc_up(in_dev);

/* fall through */

- case NETDEV_NOTIFY_PEERS:

case NETDEV_CHANGEADDR:

+ if (!IN_DEV_ARP_NOTIFY(in_dev))

+ break;

+ /* fall through */

+ case NETDEV_NOTIFY_PEERS:

/* Send gratuitous ARP to notify of link change */

- if (IN_DEV_ARP_NOTIFY(in_dev)) {

- struct in_ifaddr *ifa = in_dev->ifa_list;

-

- if (ifa)

- arp_send(ARPOP_REQUEST, ETH_P_ARP,

- ifa->ifa_address, dev,

- ifa->ifa_address, NULL,

- dev->dev_addr, NULL);

- }

+ inetdev_send_gratuitous_arp(dev, in_dev);

break;

case NETDEV_DOWN:

ip_mc_down(in_dev);