12 Jul, 2012

32 commits


11 Jul, 2012

8 commits

  • Fixes build when ipv6 is disabled.

    Reported-by: Fengguang Wu
    Signed-off-by: David S. Miller

    David S. Miller
     
  • mld->mld_maxdelay is net endian, so we should use ntohs, not htons

    CC: YOSHIFUJI Hideaki
    Signed-off-by: Li RongQing
    Signed-off-by: David S. Miller

    Li RongQing
     
  • commit 6d29b1ef introduces a bug, ntohs is __be16_to_cpu,
    not cpu_to_be16.

    We always use htons on IP_OFFSET and IP_MF, then compare
    with network package.

    Signed-off-by: Li RongQing
    Signed-off-by: David S. Miller

    Li RongQing
     
  • ETH_P_IP is host Endian, skb->protocol is big Endian, when
    compare them, Using htons on skb->protocol is wrong.

    And fix two code style issues: indentation and remove
    unnecessary parentheses.

    CC: Tristram Ha
    CC: Ben Hutchings
    CC: Joe Perches
    Signed-off-by: Li RongQing
    Signed-off-by: David S. Miller

    Li RongQing
     
  • David S. Miller
     
  • Conflicts:
    net/batman-adv/bridge_loop_avoidance.c
    net/batman-adv/bridge_loop_avoidance.h
    net/batman-adv/soft-interface.c
    net/mac80211/mlme.c

    With merge help from Antonio Quartulli (batman-adv) and
    Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

    The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
    conversion to some new tracing macros.

    Signed-off-by: David S. Miller

    David S. Miller
     
  • In rare cases, bnx2x_free_tx_skbs() can unmap the wrong DMA address
    when it gets to the last entry of the tx ring. We were not using
    the proper macro to skip the last entry when advancing the tx index.

    Reported-by: Zongyun Lai
    Reviewed-by: Jeffrey Huang
    Signed-off-by: Michael Chan
    Signed-off-by: David S. Miller

    Michael Chan
     
  • Or Gerlitz reported triggering of WARN_ON_ONCE(delta < len); in
    skb_try_coalesce()
    This warning tracks drivers that incorrectly set skb->truesize

    IPoIB indeed allocates a full page to store a fragment, but only
    accounts in skb->truesize the used part of the page (frame length)

    This patch fixes skb truesize underestimation, and
    also fixes a performance issue, because RX skbs have not enough tailroom
    to allow IP and TCP stacks to pull their header in skb linear part
    without an expensive call to pskb_expand_head()

    Signed-off-by: Eric Dumazet
    Reported-by: Or Gerlitz
    Cc: Erez Shitrit
    Cc: Shlomo Pongartz
    Cc: Roland Dreier
    Signed-off-by: David S. Miller

    Eric Dumazet