[Xen-changelog] [linux-2.6.18-xen] merge with linux-2.6.18-xen.hg

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1206470274 21600
# Node ID bb2f8ba47833ad7798957bd64670ec5019127c8c
# Parent  17807457215a571270927aae3cea327a2de384ea
# Parent  14b9877742337506d1885d21763c31fe465b5512
merge with linux-2.6.18-xen.hg
---
 drivers/xen/sfc_netback/accel_fwd.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff -r 17807457215a -r bb2f8ba47833 drivers/xen/sfc_netback/accel_fwd.c
--- a/drivers/xen/sfc_netback/accel_fwd.c       Tue Mar 25 10:23:28 2008 -0600
+++ b/drivers/xen/sfc_netback/accel_fwd.c       Tue Mar 25 12:37:54 2008 -0600
@@ -196,8 +196,13 @@ int netback_accel_fwd_add(const __u8 *ma
        index = rc;
 
        /* Shouldn't already be in the table */
-       BUG_ON(cuckoo_hash_lookup(&fwd_set->fwd_hash_table,
-                                 (cuckoo_hash_key *)(&key), &rc) != 0);
+       if (cuckoo_hash_lookup(&fwd_set->fwd_hash_table,
+                              (cuckoo_hash_key *)(&key), &rc) != 0) {
+               spin_unlock_irqrestore(&fwd_set->fwd_lock, flags);
+               EPRINTK("MAC address " MAC_FMT " already accelerated.\n",
+                       MAC_ARG(mac));
+               return -EEXIST;
+       }
 
        if ((rc = cuckoo_hash_add(&fwd_set->fwd_hash_table,
                                  (cuckoo_hash_key *)(&key), index, 1)) == 0) {

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