ixgbe truesize underestimation fix missing?

[Christian Brunner]

Back in Oktober, there was a patch by Eric Dumazet for the ixgbe
driver to fix the skb truesize underestimation (commit
98130646770db42cd14c44ba0d7f2d0eb8078820). It changed only one line in
ixgbe_main.c:

--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -1326,7 +1326,7 @@ static bool ixgbe_clean_rx_irq(struct
ixgbe_q_vector *q_vector,
                        skb->len += upper_len;
                        skb->data_len += upper_len;
-                       skb->truesize += upper_len;
+                       skb->truesize += PAGE_SIZE / 2;
                }                 i++;


But when I look at the current code (3.2.5 or 3.3rc), skb->truesize is
still increased by the same value as skb->data_len.

1228         skb->data_len += frag_list_size;
1229         skb->truesize += frag_list_size;

Is it posible that there was a merge conflict, or am I missing something here?

Thanks,
Christian
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/