diff --git a/[refs] b/[refs]
index 65b584da15b9..301bd45cd175 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 232e7d68d50c9ac3a55d716e5ae215ecd1e043b9
+refs/heads/master: 17e78b0655da20f2fc2bbde3b8252dac07c82914
diff --git a/trunk/drivers/net/ixgbe/ixgbe_fcoe.c b/trunk/drivers/net/ixgbe/ixgbe_fcoe.c
index fa9f24e23683..28cf104e36cc 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -336,7 +336,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
 		/* return 0 to bypass going to ULD for DDPed data */
 		if (fcstat == IXGBE_RXDADV_STAT_FCSTAT_DDP)
 			rc = 0;
-		else
+		else if (ddp->len)
 			rc = ddp->len;
 	}