svn commit: r231600 - stable/8/sys/dev/cxgbe

[Navdeep Parhar]

Author: np
Date: Mon Feb 13 19:25:58 2012
New Revision: 231600
URL: http://svn.freebsd.org/changeset/base/231600

Log:
  MFC r231120:
  Acquire the adapter lock before updating fields of the filter structure.

Modified:
  stable/8/sys/dev/cxgbe/t4_main.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/8/sys/dev/cxgbe/t4_main.c	Mon Feb 13 19:25:37 2012	(r231599)
+++ stable/8/sys/dev/cxgbe/t4_main.c	Mon Feb 13 19:25:58 2012	(r231600)
@@ -4839,22 +4839,22 @@ filter_rpl(struct sge_iq *iq, const stru
 		unsigned int rc = G_COOKIE(rpl->cookie);
 		struct filter_entry *f = &sc->tids.ftid_tab[idx];
 
+		ADAPTER_LOCK(sc);
 		if (rc == FW_FILTER_WR_FLT_ADDED) {
 			f->smtidx = (be64toh(rpl->oldval) >> 24) & 0xff;
 			f->pending = 0;  /* asynchronous setup completed */
 			f->valid = 1;
-			return (0);
-		}
+		} else {
+			if (rc != FW_FILTER_WR_FLT_DELETED) {
+				/* Add or delete failed, display an error */
+				log(LOG_ERR,
+				    "filter %u setup failed with error %u\n",
+				    idx, rc);
+			}
 
-		if (rc != FW_FILTER_WR_FLT_DELETED) {
-			/* Add or delete failed, need to display an error */
-			device_printf(sc->dev,
-			    "filter %u setup failed with error %u\n", idx, rc);
+			clear_filter(f);
+			sc->tids.ftids_in_use--;
 		}
-
-		clear_filter(f);
-		ADAPTER_LOCK(sc);
-		sc->tids.ftids_in_use--;
 		ADAPTER_UNLOCK(sc);
 	}