1. 23 12月, 2013 6 次提交
  2. 22 12月, 2013 2 次提交
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 6eb3c282
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      Please consider pulling this batch of fixes for the 3.13 stream...
      
      For the mac80211 bits, Johannes says:
      
      "Here's a fix for another potential radiotap parser buffer overrun thanks
      to Evan Huus, and a fix for a cfg80211 warning in a certain corner case
      (reconnecting to the same BSS)."
      
      For the bluetooth bits, Gustavo says:
      
      "Two patches in this pull request. An important fix from Marcel in the
      permission check for HCI User Channels, there was a extra check for
      CAP_NET_RAW, and it was now removed. These channels should only require
      CAP_NET_ADMIN. The other patch is a device id addition."
      
      On top of that...
      
      Sujith Manoharan provides a workaround for a hardware problem that
      can result in lost interrupts.
      
      Larry Finger fixes an oops when unloading the rtlwifi driver (Red
      Hat bug 852761).
      
      Mathy Vanhoef fixes a somewhat minor MAC address privacy issue
      (CVE-2013-4579).
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6eb3c282
    • H
      hyperv: Fix race between probe and open calls · a68f9614
      Haiyang Zhang 提交于
      Moving the register_netdev to the end of probe to prevent
      possible open call happens before NetVSP is connected.
      Signed-off-by: NHaiyang Zhang <haiyangz@microsoft.com>
      Reviewed-by: NK. Y. Srinivasan <kys@microsoft.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a68f9614
  3. 21 12月, 2013 1 次提交
  4. 20 12月, 2013 11 次提交
  5. 19 12月, 2013 13 次提交
  6. 18 12月, 2013 7 次提交
    • D
      ixgbe: fix for unused variable warning with certain config · 8f48f5bc
      Don Skidmore 提交于
      If CONFIG_PCI_IOV isn't defined we get an "unused variable" warining so
      now wrap the variable declaration like it's usage already was.
      Signed-off-by: NDon Skidmore <donald.c.skidmore@intel.com>
      Acked-by: NJohn Fastabend <john.r.fastabend@intel.com>
      Tested-by: NPhil Schmitt <phillip.j.schmitt@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      8f48f5bc
    • D
      e1000e: Fix a compile flag mis-match for suspend/resume · 7509963c
      David Ertman 提交于
      This patch addresses a mis-match between the declaration and usage of
      the e1000_suspend and e1000_resume functions.  Previously, these
      functions were declared in a CONFIG_PM_SLEEP wrapper, and then utilized
      within a CONFIG_PM wrapper.  Both the declaration and usage will now be
      contained within CONFIG_PM wrappers.
      Signed-off-by: NDave Ertman <davidx.m.ertman@intel.com>
      Tested-by: NAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      7509963c
    • D
      e1000e: fix compiler warning (maybe-unitialized variable) · 918a4308
      David Ertman 提交于
      This patch is to fix a compiler warning of maybe-uininitialized-variable
      that is generated from gcc when the -O3 flag is used.  In the function
      e1000_reset_hw_80003es2lan(), the variable krmn_reg_data is first given
      a value by being passed to a register read function as a
      pass-by-reference parameter.  But, the return value of that read
      function was never checked to see if the read failed and the variable
      not given an initial value.  The compiler was smart enough to spot
      this.  This patch is to check the return value for that read function
      and return it, if an error occurs, without trying to utilize the value
      in kmrn_reg_data.
      Signed-off-by: NDavid Ertman <davidx.m.ertman@intel.com>
      Tested-by: NAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      918a4308
    • D
      e1000e: fix compiler warnings · 9e6c3b63
      David Ertman 提交于
      This patch is to fix a compiler warning of __bad_udelay due to a value
      of >999 being passed as a parameter to udelay() in the function
      e1000e_phy_has_link_generic().  This affects the gcc compiler when
      it is given a flag of -O3 and the icc compiler.
      
      This patch is also making the change from mdelay() to msleep() in the
      same function, since it was determined though code inspection that this
      function is never called in atomic context.
      Signed-off-by: NDavid Ertman <davidx.m.ertman@intel.com>
      Acked-by: NBruce Allan <bruce.w.allan@intel.com>
      Tested-by: NAaron Brown <aaron.f.brown@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      9e6c3b63
    • J
      net: allow netdev_all_upper_get_next_dev_rcu with rtnl lock held · 85328240
      John Fastabend 提交于
      It is useful to be able to walk all upper devices when bringing
      a device online where the RTNL lock is held. In this case it
      is safe to walk the all_adj_list because the RTNL lock is used
      to protect the write side as well.
      
      This patch adds a check to see if the rtnl lock is held before
      throwing a warning in netdev_all_upper_get_next_dev_rcu().
      
      Also because we now have a call site for lockdep_rtnl_is_held()
      outside COFIG_LOCK_PROVING an inline definition returning 1 is
      needed. Similar to the rcu_read_lock_is_held().
      
      Fixes: 2a47fa45 ("ixgbe: enable l2 forwarding acceleration for macvlans")
      CC: Veaceslav Falico <vfalico@redhat.com>
      Reported-by: NYuanhan Liu <yuanhan.liu@linux.intel.com>
      Signed-off-by: NJohn Fastabend <john.r.fastabend@intel.com>
      Tested-by: NPhil Schmitt <phillip.j.schmitt@intel.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      85328240
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 35eecf05
      Linus Torvalds 提交于
      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
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 8b803841
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "A quick batch of fixes, including the annoying bad lock stack problem
        introduced by udp_sk_rx_dst_set() locking change:
      
         1) Use xchg() instead of sk_dst_lock() in udp_sk_rx_dst_set(), from
            Eric Dumazet.
      
         2) qlcnic bug fixes from Himanshu Madhani and Manish Chopra.
      
         3) Update IPSEC MAINTAINERS entry, from Steffen Klassert.
      
         4) Administrative neigh entry changes should generate netlink
            notifications the same as event generated ones.  From Bob
            Gilligan.
      
         5) Netfilter SYNPROXY fixes from Patrick McHardy.
      
         6) Netfilter nft_reject endianness fixes from Eric Leblond"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        qlcnic: Dump mailbox registers when mailbox command times out.
        qlcnic: Fix mailbox processing during diagnostic test
        qlcnic: Allow firmware dump collection when auto firmware recovery is disabled
        qlcnic: Fix memory allocation
        qlcnic: Fix TSS/RSS validation for 83xx/84xx series adapter.
        qlcnic: Fix TSS/RSS ring validation logic.
        qlcnic: Fix diagnostic test for all adapters.
        qlcnic: Fix usage of netif_tx_{wake, stop} api during link change.
        xen-netback: fix fragments error handling in checksum_setup_ip()
        neigh: Netlink notification for administrative NUD state change
        ipv4: improve documentation of ip_no_pmtu_disc
        net: unix: allow bind to fail on mutex lock
        MAINTAINERS: Update the IPsec maintainer entry
        udp: ipv4: do not use sk_dst_lock from softirq context
        netvsc: don't flush peers notifying work during setting mtu
        can: peak_usb: fix mem leak in pcan_usb_pro_init()
        can: ems_usb: fix urb leaks on failure paths
        sctp: loading sctp when load sctp_probe
        netfilter: nft_reject: fix endianness in dump function
        netfilter: SYNPROXY target: restrict to INPUT/FORWARD
      8b803841