From 1f7a41e9a0268849a981e6cc9791995dbc2ee76e Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Sat, 26 Jan 2013 02:08:14 +0000 Subject: [PATCH] --- yaml --- r: 352513 b: refs/heads/master c: 990a3158002ff19b2d665334bc7a21a8887a123d h: refs/heads/master i: 352511: b38dfb9b2fd0a58f80af963c13211da48413a680 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb5c137d58c1..ceb256ee8ace 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 67da097e1295071da700862e7faa8a294b182b42 +refs/heads/master: 990a3158002ff19b2d665334bc7a21a8887a123d diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 196002ba031c..a8e10cff7a89 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe.h @@ -156,7 +156,7 @@ struct vf_macvlans { /* Tx Descriptors needed, worst case */ #define TXD_USE_COUNT(S) DIV_ROUND_UP((S), IXGBE_MAX_DATA_PER_TXD) -#define DESC_NEEDED ((MAX_SKB_FRAGS * TXD_USE_COUNT(PAGE_SIZE)) + 4) +#define DESC_NEEDED (MAX_SKB_FRAGS + 4) /* wrapper around a pointer to a socket buffer, * so a DMA handle can be stored along with the buffer */