On Tue, Apr 02, 2013 at 03:34:53PM -0700, Eric Dumazet wrote:
> Really I don't understand why people use u16 instead of u32.
>
> u16 is slower most of the time, and more prone to overflows.
>
> diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> index 7e0a822..48ac487 100644
> --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
> @@ -1569,18 +1569,17 @@ static u16 atl1e_cal_tdp_req(const struct sk_buff
> *skb)
> {
> int i = 0;
> u16 tpd_req = 1;
> - u16 fg_size = 0;
> - u16 proto_hdr_len = 0;
>
> for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
> - fg_size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
> + u32 fg_size = skb_frag_size(&skb_shinfo(skb)->frags[i]);
> +
> tpd_req += ((fg_size + MAX_TX_BUF_LEN - 1) >> MAX_TX_BUF_SHIFT);
> }
>
> if (skb_is_gso(skb)) {
> if (skb->protocol == htons(ETH_P_IP) ||
> (skb_shinfo(skb)->gso_type == SKB_GSO_TCPV6)) {
> - proto_hdr_len = skb_transport_offset(skb) +
> + u32 proto_hdr_len = skb_transport_offset(skb) +
> tcp_hdrlen(skb);
> if (proto_hdr_len < skb_headlen(skb)) {
> tpd_req += ((skb_headlen(skb) - proto_hdr_len +
> @@ -1670,7 +1669,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
> {
> struct atl1e_tpd_desc *use_tpd = NULL;
> struct atl1e_tx_buffer *tx_buffer = NULL;
> - u16 buf_len = skb_headlen(skb);
> + u32 buf_len = skb_headlen(skb);
> u16 map_len = 0;
> u16 mapped_len = 0;
> u16 hdr_len = 0;
>
I tested this patch ontop of the patch which reduces gso max size to 0x3c00.
If you want to submit the patch you could add my acked-by.
Thanks,
Hannes
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
