1. 01 6月, 2013 7 次提交
  2. 31 5月, 2013 4 次提交
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · fb68e2f4
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      Please pull this batch of fixes intended for the 3.10 stream...
      
      Regarding the NFC bits, Samuel says:
      
      "This is the first batch of NFC fixes for 3.10, and it contains:
      
      - 3 fixes for the NFC MEI support:
              * We now depend on the correct Kconfig symbol.
              * We register an MEI event callback whenever we enable an NFC device,
                otherwise we fail to read anything after an enable/disable cycle.
              * We only disable an MEI device from its disable mey_phy_ops,
                preventing useless consecutive disable calls.
      
      - An NFC Makefile cleanup, as I forgot to remove a commented out line when
        moving the LLCP code to the NFC top level directory."
      
      As for the mac80211 bits, Johannes says:
      
      "This time I have a fix from Stanislaw for a stupid mistake I made in the
      auth/assoc timeout changes, a fix from Felix for 64-bit traffic counters
      and one from Helmut for address mask handling in mac80211. I also have a
      few fixes myself for four different crashes reported by a few people."
      
      And Johannes says this about the iwlwifi bit:
      
      "This fixes a brown paper-bag bug that we really should've caught in
      review. More details in the changelog for the fix."
      
      On top of that...
      
      Arend van Spriel and Hante Meuleman cooperate to send a series of AP
      and P2P mode fixes for brcmfmac.
      
      Gabor Juhos corrects a register offset for AR9550, avoiding a bus
      error.
      
      Dan Carpenter provides a fixup to some dmesg output in the atmel
      driver.
      
      And, finally...
      
      Felix Fietkau not only gives us a trio of small AR934x fixes, but
      also refactors the ath9k aggregation session start/stop handling
      (using the generic mac80211 support) in order to avoid a deadlock.
      
      Please let me know if there are problems!
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fb68e2f4
    • S
      be2net: Fix crash on 2nd invocation of PCI AER/EEH error_detected hook · 01e5b2c4
      Somnath Kotur 提交于
      During a PCI EEH/AER error recovery flow, if the device did not successfully
      restart, the error_detected() hook may be called a second time with a
      "perm_failure" state. This patch skips over driver cleanup for the second
      invocation of the callback.
      
      Also, Lancer error recovery code is fixed-up to handle these changes.
      Signed-off-by: NKalesh AP <kalesh.purayil@emulex.com>
      Signed-off-by: NSomnath kotur <somnath.kotur@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      01e5b2c4
    • S
      be2net: Mark checksum fail for IP fragmented packets · e38b1706
      Somnath Kotur 提交于
      HW does not compute L4 checksum for IP Fragmented packets.
      Signed-off-by: NKalesh AP <kalesh.purayil@emulex.com>
      Signed-off-by: NSomnath Kotur <somnath.kotur@emulex.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e38b1706
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · 73ce00d4
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      The following patchset contains Netfilter/IPVS fixes for 3.10-rc3,
      they are:
      
      * fix xt_addrtype with IPv6, from Florian Westphal. This required
        a new hook for IPv6 functions in the netfilter core to avoid
        hard dependencies with the ipv6 subsystem when this match is
        only used for IPv4.
      
      * fix connection reuse case in IPVS. Currently, if an reused
        connection are directed to the same server. If that server is
        down, those connection would fail. Therefore, clear the
        connection and choose a new server among the available ones.
      
      * fix possible non-nul terminated string sent to user-space if
        ipt_ULOG is used as the default netfilter logging stub, from
        Chen Gang.
      
      * fix mark logging of IPv6 packets in xt_LOG, from Michal Kubecek.
        This bug has been there since 2.6.26.
      
      * Fix breakage ip_vs_sh due to incorrect structure layout for
        RCU, from Jan Beulich.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      73ce00d4
  3. 29 5月, 2013 16 次提交
  4. 28 5月, 2013 2 次提交
  5. 27 5月, 2013 5 次提交
  6. 26 5月, 2013 3 次提交
  7. 25 5月, 2013 3 次提交