1. 18 Dec, 2013 7 commits
    • Timo Teräs's avatar
      ip_gre: fix msg_name parsing for recvfrom/recvmsg · 0e3da5bb
      Timo Teräs authored
      ipgre_header_parse() needs to parse the tunnel's ip header and it
      uses mac_header to locate the iphdr. This got broken when gre tunneling
      was refactored as mac_header is no longer updated to point to iphdr.
      Introduce skb_pop_mac_header() helper to do the mac_header assignment
      and use it in ipgre_rcv() to fix msg_name parsing.
      
      Bug introduced in commit c5441932 (GRE: Refactor GRE tunneling code.)
      
      Cc: Pravin B Shelar <pshelar@nicira.com>
      Signed-off-by: default avatarTimo Teräs <timo.teras@iki.fi>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0e3da5bb
    • Mugunthan V N's avatar
      drivers: net cpsw: Enable In Band mode in cpsw for 10 mbps · a81d8762
      Mugunthan V N authored
      This patch adds support for enabling In Band mode in 10 mbps speed.
      RGMII supports 1 Gig and 100 mbps mode for Forced mode of operation.
      For 10mbps mode it should be configured to in band mode so that link
      status, duplexity and speed are determined from the RGMII input data
      stream
      Signed-off-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a81d8762
    • David S. Miller's avatar
      Merge branch 'bond_locking' · 405a96d6
      David S. Miller authored
      Ding Tianhong says:
      
      ====================
      Jay Vosburgh said that the bond_3ad_adapter_speed_changed and
      bond_3ad_adapter_duplex_changed is called with RTNL only, and
      the functions will modify the port's information with no further
      locking, they will not mutex against bond state machine and
      incoming LACPDU which do not hold RTNL, So I add port lock to
      protect the port information.
      
      But they are not critical bugs, they exist since day one, and till
      now they have never been hit and reported, because change for speed
      and duplex is very rare, and will not occur critical problem.
      
      The comments in the function is very old, cleanup the comments together.
      ====================
      Signed-off-by: default avatarJay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      405a96d6
    • dingtianhong's avatar
      bonding: protect port for bond_3ad_handle_link_change() · 108db736
      dingtianhong authored
      The bond_3ad_handle_link_change is called with RTNL only,
      and the function will modify the port's information with
      no further locking, it will not mutex against bond state
      machine and incoming LACPDU which do not hold RTNL, So I
      add __get_state_machine_lock to protect the port.
      
      But it is not a critical bug, it exist since day one, and till
      now it has never been hit and reported, because changes to
      speed is very rare, and will not occur critical problem.
      
      The comments in the function is very old, cleanup it and
      add a new pr_debug to debug the port message.
      Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      108db736
    • dingtianhong's avatar
      bonding: protect port for bond_3ad_adapter_duplex_changed() · bca44a73
      dingtianhong authored
      Jay Vosburgh said that the bond_3ad_adapter_duplex_changed is
      called with RTNL only, and the function will modify the port's
      information with no further locking, it will not mutex against
      bond state machine and incoming LACPDU which do not hold RTNL,
      So I add __get_state_machine_lock to protect the port.
      
      But it is not a critical bug, it exist since day one, and till
      now it has never been hit and reported, because changes to
      speed is very rare, and will not occur critical problem.
      
      The comments in the function is very old, cleanup it.
      Suggested-by: default avatarJay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      bca44a73
    • dingtianhong's avatar
      bonding: protect port for bond_3ad_adapter_speed_changed() · 71a06c59
      dingtianhong authored
      Jay Vosburgh said that the bond_3ad_adapter_speed_changed is
      called with RTNL only, and the function will modify the port's
      information with no further locking, it will not mutex against
      bond state machine and incoming LACPDU which do not hold RTNL,
      So I add __get_state_machine_lock to protect the port.
      
      But it is not a critical bug, it exist since day one, and till
      now it has never been hit and reported, because changes to
      speed is very rare, and will not occur critical problem.
      
      The comment in the function is very old, cleanup it.
      Suggested-by: default avatarJay Vosburgh <fubar@us.ibm.com>
      Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      71a06c59
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 35eecf05
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Definitely seems quieter this week,
      
        Radeon, intel, intel broadwell, vmwgfx, ttm, armada, and a couple of
        core fixes, one revert in radeon
      
        Most of these are either going to stable or fixes for things
        introduced in the merge window"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (30 commits)
        drm/edid: add quirk for BPC in Samsung NP700G7A-S01PL notebook
        drm/ttm: Fix accesses through vmas with only partial coverage
        drm/nouveau: only runtime suspend by default in optimus configuration
        drm: don't double-free on driver load error
        Revert "drm/radeon: Implement radeon_pci_shutdown"
        drm/radeon: add missing display tiling setup for oland
        drm/radeon: fix typo in cik_copy_dma
        drm/radeon/cik: plug in missing blit callback
        drm/radeon/dpm: Fix hwmon crash
        drm/radeon: Fix sideport problems on certain RS690 boards
        drm/i915: don't update the dri1 breadcrumb with modesetting
        DRM: Armada: prime refcounting bug fix
        DRM: Armada: fix printing of phys_addr_t/dma_addr_t
        DRM: Armada: destroy framebuffer after helper
        DRM: Armada: implement lastclose() for fbhelper
        drm/i915: Repeat eviction search after idling the GPU
        drm/vmwgfx: Add max surface memory param
        drm/i915: Fix use-after-free in do_switch
        drm/i915: fix pm init ordering
        drm/i915: Hold mutex across i915_gem_release
        ...
      35eecf05
  2. 17 Dec, 2013 31 commits
  3. 16 Dec, 2013 2 commits