[Xen-changelog] [linux-2.6.18-xen] netfront: Bug fixes to support arp link monitoring for bonding module

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1207825557 -3600
# Node ID 7c844e8c3485de8ad8cf89eb5c6c6dc6cc2881a8
# Parent  cf150ce22d4312278b237c2705114a8311bda01f
netfront: Bug fixes to support arp link monitoring for bonding module

Signed-off-by: Masroor Vettuparambil <masroor.vettuparambil@xxxxxxxxxxxx>
---
 drivers/xen/netfront/netfront.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)

diff -r cf150ce22d43 -r 7c844e8c3485 drivers/xen/netfront/netfront.c
--- a/drivers/xen/netfront/netfront.c   Tue Apr 08 11:30:38 2008 +0100
+++ b/drivers/xen/netfront/netfront.c   Thu Apr 10 12:05:57 2008 +0100
@@ -1031,6 +1031,7 @@ static int network_start_xmit(struct sk_
 
        np->stats.tx_bytes += skb->len;
        np->stats.tx_packets++;
+       dev->trans_start = jiffies;
 
        /* Note: It is not safe to access skb after network_tx_buf_gc()! */
        network_tx_buf_gc(dev);
@@ -1063,6 +1064,7 @@ static irqreturn_t netif_int(int irq, vo
                        netfront_accelerator_call_stop_napi_irq(np, dev);
 
                        netif_rx_schedule(dev);
+                       dev->last_rx = jiffies;
                }
        }
 
@@ -1697,9 +1699,12 @@ static int xennet_set_mac_address(struct
        struct netfront_info *np = netdev_priv(dev);
        struct sockaddr *addr = p;
 
+       if (netif_running(dev))
+               return -EBUSY;
+
        if (!is_valid_ether_addr(addr->sa_data))
                return -EADDRNOTAVAIL;
-       
+
        memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
        memcpy(np->mac, addr->sa_data, ETH_ALEN);
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog