D2552.diff
No OneTemporary
Actions

Size

936 B

Referenced Files

None

Subscribers

None

D2552.diff
View Options

	Index: head/sys/dev/sfxge/sfxge_tx.c
	===================================================================
	--- head/sys/dev/sfxge/sfxge_tx.c
	+++ head/sys/dev/sfxge/sfxge_tx.c
	@@ -605,9 +605,8 @@
	int rc;

	if (!SFXGE_LINK_UP(txq->sc)) {
	- rc = ENETDOWN;
	atomic_add_long(&txq->netdown_drops, 1);
	- goto fail;
	+ return (ENETDOWN);
	}

	/*
	@@ -622,7 +621,7 @@
	rc = sfxge_tx_qdpl_put_locked(txq, m);
	if (rc != 0) {
	SFXGE_TXQ_UNLOCK(txq);
	- goto fail;
	+ return (rc);
	}

	/* Try to service the list. */
	@@ -631,7 +630,7 @@
	} else {
	rc = sfxge_tx_qdpl_put_unlocked(txq, m);
	if (rc != 0)
	- goto fail;
	+ return (rc);

	/*
	* Try to grab the lock again.
	@@ -649,10 +648,6 @@
	SFXGE_TXQ_LOCK_ASSERT_NOTOWNED(txq);

	return (0);
	-
	-fail:
	- m_freem(m);
	- return (rc);
	}

	static void
	@@ -730,6 +725,8 @@
	}

	rc = sfxge_tx_packet_add(txq, m);
	+ if (rc != 0)
	+ m_freem(m);

	return (rc);
	}