.37 patches

diff --git a/queue-2.6.37/arp_notify-unconditionally-send-gratuitous-arp-for-netdev_notify_peers.patch b/queue-2.6.37/arp_notify-unconditionally-send-gratuitous-arp-for-netdev_notify_peers.patch
new file mode 100644 (file)
index 0000000..5707cd0
--- /dev/null
+++ b/queue-2.6.37/arp_notify-unconditionally-send-gratuitous-arp-for-netdev_notify_peers.patch
@@ -0,0 +1,84 @@
+From d11327ad6695db8117c78d70611e71102ceec2ac Mon Sep 17 00:00:00 2001
+From: Ian Campbell <Ian.Campbell@citrix.com>
+Date: Fri, 11 Feb 2011 07:44:16 +0000
+Subject: arp_notify: unconditionally send gratuitous ARP for NETDEV_NOTIFY_PEERS.
+
+From: Ian Campbell <Ian.Campbell@citrix.com>
+
+commit d11327ad6695db8117c78d70611e71102ceec2ac upstream.
+
+NETDEV_NOTIFY_PEER is an explicit request by the driver to send a link
+notification while NETDEV_UP/NETDEV_CHANGEADDR generate link
+notifications as a sort of side effect.
+
+In the later cases the sysctl option is present because link
+notification events can have undesired effects e.g. if the link is
+flapping. I don't think this applies in the case of an explicit
+request from a driver.
+
+This patch makes NETDEV_NOTIFY_PEER unconditional, if preferred we
+could add a new sysctl for this case which defaults to on.
+
+This change causes Xen post-migration ARP notifications (which cause
+switches to relearn their MAC tables etc) to be sent by default.
+
+Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+[reported to solve hyperv live migration problem - gkh]
+Cc: Haiyang Zhang <haiyangz@microsoft.com>
+Cc: Mike Surcouf <mike@surcouf.co.uk>
+Cc: Hank Janssen <hjanssen@microsoft.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ net/ipv4/devinet.c |   30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+--- a/net/ipv4/devinet.c
++++ b/net/ipv4/devinet.c
+@@ -1030,6 +1030,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,
+@@ -1082,18 +1097,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);

diff --git a/queue-2.6.37/series b/queue-2.6.37/series
index a3581c81a06f3d0a91201364867441104a9ab74a..088b87c9c762d79afba80ba32852935a14add58b 100644 (file)
--- a/queue-2.6.37/series
+++ b/queue-2.6.37/series
@@ -70,3 +70,4 @@ r8169-disable-aspm.patch
 dccp-fix-oops-on-reset-after-close.patch
 e1000e-disable-broken-phy-wakeup-for-ich10-loms-use-mac-wakeup-instead.patch
 dns-fix-a-null-pointer-deref-when-trying-to-read-an-error-key.patch
+arp_notify-unconditionally-send-gratuitous-arp-for-netdev_notify_peers.patch