1. 26 6月, 2013 17 次提交
  2. 25 6月, 2013 16 次提交
  3. 24 6月, 2013 7 次提交
    • Y
      bnx2x: Fix compilation with no IOV support · 37173488
      Yuval Mintz 提交于
      This fixes an issue caused by submit 78c3bcc5
      `bnx2x: Improve PF behaviour toward VF', which made the bnx2x driver fail
      compilation when PCI_IOV is not set.
      Signed-off-by: NYuval Mintz <yuvalmin@broadcom.com>
      Signed-off-by: NAriel Elior <ariele@broadcom.com>
      Signed-off-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      37173488
    • W
      net: Unmap fragment page once iterator is done · aeb193ea
      Wedson Almeida Filho 提交于
      Callers of skb_seq_read() are currently forced to call skb_abort_seq_read()
      even when consuming all the data because the last call to skb_seq_read (the
      one that returns 0 to indicate the end) fails to unmap the last fragment page.
      
      With this patch callers will be allowed to traverse the SKB data by calling
      skb_prepare_seq_read() once and repeatedly calling skb_seq_read() as originally
      intended (and documented in the original commit 677e90ed), that is, only call
      skb_abort_seq_read() if the sequential read is actually aborted.
      Signed-off-by: NWedson Almeida Filho <wedsonaf@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      aeb193ea
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next · 7e2f934d
      David S. Miller 提交于
      John W. Linville says:
      
      ====================
      I would guess that this is the last big wireless pull request before
      the 3.11 merge window...
      
      Regarding the mac80211 bits, Johannes says:
      
      "I have a number of mesh fixes and improvements from Colleen, Jacob,
      Ashok and Thomas, powersave fixes in mac80211 from Alex, improved
      management-TX from Antonio, and a few various things, including locking
      fixes, from others and myself. Overall though, nothing really stands
      out."
      
      As for the iwlwifi bits, Johannes says:
      
      "Emmanuel contributed two AP mode fixes, removed an unused field, fixed a
      comment and added a warning for something that shouldn't happen in
      practice, and I removed the declaration of a function that doesn't even
      exist and cleaned up a small include."
      
      "This time I have a number of cleanups, a small fix from Emmanuel and two
      performance improvements that combined reduce our driver's CPU
      utilisation as much as 75% in high TX-throughput scenarios."
      
      "These two patches fix two issues with using rfkill randomly during
      traffic, which would then cause our driver to stop working and not be
      able to recover at all."
      
      Regarding the ath6kl bits, Kalle says:
      
      "Here are few simple patches for ath6kl. We have a suspend crash fix for
      USB from Shafi, use of mac_pton(), a compiler warning fix and a fix for
      module initialisation error path."
      
      Kalle also sends the biggest single item of note, the new ath10k
      driver for Qualcomm Atheros 802.11ac CQA98xx devices.
      
      Included is an NFC pull, of which Samuel says:
      
      "These are the pending NFC patches for the 3.11 merge window.
      
      It contains the pending fixes that were on nfc-fixes (nfc-fixes-3.10-2),
      along with a few more for the pn544 and pn533 drivers, the LLCP
      disconnection path and an LLCP memory leak.
      
      Highlights for this one are:
      
      - An initial secure element API. NFC chipsets can carry an embedded
        secure element or get access to the SIM one. In both cases they
        control the secure elements and this API provides a way to discover,
        enable and disable the available SEs. It also exports that to
        userspace in order for SE focused middleware to actually do something
        with them (e.g. payments).
      
      - NCI over SPI support. SPI is the most complex NCI specified transport
        layer and we now have support for it in the kernel. The next step will
        be to implement drivers for NCI chipsets using this transport like
        e.g. bcm2079x.
      
      - NFC p2p hardware simulation driver. We now have an nfcsim driver that
        is mostly a loopback device between 2 NFC interfaces. It also
        implements the rest of the NFC core API like polling and target
        detection. This driver, with neard running on top of it, allows us to
        completely test the LLCP, SNEP and Handover implementation without
        physical hardware.
      
      - A Firmware update netlink API. Most (All ?) HCI chipsets have a
        special firmware update mode where applications can push a new
        firmware that will be flashed. We now have a netlink API for providing
        that mode to e.g. nfctool."
      
      On top of all that, there are a variety of updates to brcmfmac,
      iwlegacy, rtlwifi, wil6210, and the TI wl12xx drivers.  As usual,
      the bcma and ssb busses get a little love as well, as do a handful
      of others here and there.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7e2f934d
    • D
      xen-netback: double free on unload · 07cc61bf
      Dan Carpenter 提交于
      There is a typo here, "i" vs "j", so we would crash on module_exit().
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      07cc61bf
    • J
      ip_tunnel: Protect tunnel functions with CONFIG_INET guard. · 5243b6ac
      Jesse Gross 提交于
      Tunnel constants can be used in generic code but in these cases
      the inline functions in ip_tunnels.h cause compilation problems
      if CONFIG_INET is not set.
      
      CC: Pravin Shelar <pshelar@nicira.com>
      Reported-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NJesse Gross <jesse@nicira.com>
      Acked-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5243b6ac
    • P
      openvswitch: Use correct config guard. · 479b1a58
      Pravin B Shelar 提交于
      This bug was introduced by commit aa310701
      (openvswitch: Add gre tunnel support.)
      Signed-off-by: NPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      479b1a58
    • C
      bridge: fix a typo in comments · 7c77602f
      Cong Wang 提交于
      Cc: Stephen Hemminger <stephen@networkplumber.org>
      Cc: "David S. Miller" <davem@davemloft.net>
      Signed-off-by: NCong Wang <amwang@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7c77602f