1. 06 Aug, 2014 3 commits
    • David R. Piegdon's avatar
      ARM: OMAP2+: Fix parser-bug in platform muxing code · d7a3e3ec
      David R. Piegdon authored
      commit c021f241 upstream.
      
      Fix a parser-bug in the omap2 muxing code where muxtable-entries will be
      wrongly selected if the requested muxname is a *prefix* of their
      m0-entry and they have a matching mN-entry. Fix by additionally checking
      that the length of the m0_entry is equal.
      
      For example muxing of "dss_data2.dss_data2" on omap32xx will fail
      because the prefix "dss_data2" will match the mux-entries "dss_data2" as
      well as "dss_data20", with the suffix "dss_data2" matching m0 (for
      dss_data2) and m4 (for dss_data20). Thus both are recognized as signal
      path candidates:
      
      Relevant muxentries from mux34xx.c:
              _OMAP3_MUXENTRY(DSS_DATA20, 90,
                      "dss_data20", NULL, "mcspi3_somi", "dss_data2",
                      "gpio_90", NULL, NULL, "safe_mode"),
              _OMAP3_MUXENTRY(DSS_DATA2, 72,
                      "dss_data2", NULL, NULL, NULL,
                      "gpio_72", NULL, NULL, "safe_mode"),
      
      This will result in a failure to mux the pin at all:
      
       _omap_mux_get_by_name: Multiple signal paths (2) for dss_data2.dss_data2
      
      Patch should apply to linus' latest master down to rather old linux-2.6
      trees.
      Signed-off-by: default avatarDavid R. Piegdon <lkml@p23q.org>
      [tony@atomide.com: updated description to include full description]
      Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
      d7a3e3ec
    • Ben Hutchings's avatar
      Revert "net: ip, ipv6: handle gso skbs in forwarding path" · 3d4a1eea
      Ben Hutchings authored
      This reverts commit caa53449, which
      was commit fe6cc55f upstream.  In 3.2,
      the transport header length is not calculated in the forwarding path,
      so skb_gso_network_seglen() returns an incorrect result.  We also have
      problems due to the local_df flag not being set correctly.
      Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
      3d4a1eea
    • Ben Hutchings's avatar
      Revert "net: ipv4: ip_forward: fix inverted local_df test" · 8bbfe822
      Ben Hutchings authored
      This reverts commit 59d9f389, which
      was commit ca6c5d4a upstream.  It is a
      valid fix, but depends on sk_buff::local_df being set in all the right
      cases, which it wasn't in 3.2.  We need to defer it unless and until
      the other fixes are also backported to 3.2.y.
      Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
      8bbfe822
  2. 11 Jul, 2014 37 commits