From: Alexander Duyck Date: Fri, 10 Feb 2012 02:08:32 +0000 (+0000) Subject: ixgbe: Fix comments that are out of date or formatted incorrectly X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~109 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=821bde11c092fe7c98839e095bd2ef0976beb410;p=users%2Fjedix%2Flinux-maple.git ixgbe: Fix comments that are out of date or formatted incorrectly This patch corrects several comments that are either incorrect or formatted incorrectly for multiline comments. (cherry picked from commit 24ddd967806a5f0a7915721b7d60cac6f2cf5db9) Signed-off-by: Alexander Duyck Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher Signed-off-by: Joe Jin --- diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 564fbe11435a..f46e41244076 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -2357,7 +2357,7 @@ static irqreturn_t ixgbe_intr(int irq, void *data) u32 eicr; /* - * Workaround for silicon errata on 82598. Mask the interrupts + * Workaround for silicon errata #26 on 82598. Mask the interrupt * before the read of EICR. */ IXGBE_WRITE_REG(hw, IXGBE_EIMC, IXGBE_IRQ_CLEAR_MASK); @@ -4370,7 +4370,11 @@ static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter) f_fdir->indices = min((int)num_online_cpus(), f_fdir->indices); f_fdir->mask = 0; - /* Flow Director must have RSS enabled */ + /* + * Use RSS in addition to Flow Director to ensure the best + * distribution of flows across cores, even when an FDIR flow + * isn't matched. + */ if ((adapter->flags & IXGBE_FLAG_RSS_ENABLED) && (adapter->flags & IXGBE_FLAG_FDIR_HASH_CAPABLE)) { adapter->num_tx_queues = f_fdir->indices; @@ -4547,7 +4551,8 @@ static void ixgbe_acquire_msix_vectors(struct ixgbe_adapter *adapter, */ vector_threshold = MIN_MSIX_COUNT; - /* The more we get, the more we will assign to Tx/Rx Cleanup + /* + * The more we get, the more we will assign to Tx/Rx Cleanup * for the separate queues...where Rx Cleanup >= Tx Cleanup. * Right now, we simply care about how many we'll get; we'll * set them up later while requesting irq's. @@ -6985,7 +6990,7 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, /* * need: 1 descriptor per page * PAGE_SIZE/IXGBE_MAX_DATA_PER_TXD, - * + 1 desc for skb_head_len/IXGBE_MAX_DATA_PER_TXD, + * + 1 desc for skb_headlen/IXGBE_MAX_DATA_PER_TXD, * + 2 desc gap to keep tail from touching head, * + 1 desc for context descriptor, * otherwise try next time