Skip to content
  1. May 06, 2015
  2. May 05, 2015
  3. Apr 24, 2015
  4. Apr 23, 2015
  5. Apr 22, 2015
  6. Apr 20, 2015
    • Jonathan Corbet's avatar
      mac80211: Fix mac80211.h docbook comments · a839e463
      Jonathan Corbet authored
      
      
      A couple of enums in mac80211.h became structures recently, but the
      comments didn't follow suit, leading to errors like:
      
        Error(.//include/net/mac80211.h:367): Cannot parse enum!
        Documentation/DocBook/Makefile:93: recipe for target 'Documentation/DocBook/80211.xml' failed
        make[1]: *** [Documentation/DocBook/80211.xml] Error 1
        Makefile:1361: recipe for target 'mandocs' failed
        make: *** [mandocs] Error 2
      
      Fix the comments comments accordingly.  Added a couple of other small
      comment fixes while I was there to silence other recently-added docbook
      warnings.
      
      Reported-by: default avatarJim Davis <jim.epost@gmail.com>
      Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      a839e463
    • Johannes Berg's avatar
      mac80211: lock rate control · 35c347ac
      Johannes Berg authored
      
      
      Both minstrel (reported by Sven Eckelmann) and the iwlwifi rate
      control aren't properly taking concurrency into account. It's
      likely that the same is true for other rate control algorithms.
      
      In the case of minstrel this manifests itself in crashes when an
      update and other data access are run concurrently, for example
      when the stations change bandwidth or similar. In iwlwifi, this
      can cause firmware crashes.
      
      Since fixing all rate control algorithms will be very difficult,
      just provide locking for invocations. This protects the internal
      data structures the algorithms maintain.
      
      I've manipulated hostapd to test this, by having it change its
      advertised bandwidth roughly ever 150ms. At the same time, I'm
      running a flood ping between the client and the AP, which causes
      this race of update vs. get_rate/status to easily happen on the
      client. With this change, the system survives this test.
      
      Reported-by: default avatarSven Eckelmann <sven@open-mesh.com>
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      35c347ac
    • Bob Copeland's avatar
      mac80211: introduce plink lock for plink fields · 48bf6bed
      Bob Copeland authored
      
      
      The mesh plink code uses sta->lock to serialize access to the
      plink state fields between the peer link state machine and the
      peer link timer.  Some paths (e.g. those involving
      mps_qos_null_tx()) unfortunately hold this spinlock across
      frame tx, which is soon to be disallowed.  Add a new spinlock
      just for plink access.
      
      Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
      Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
      48bf6bed
  7. Apr 18, 2015
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 388f9976
      Linus Torvalds authored
      Pull networking fixes from David Miller:
      
       1) Fix verifier memory corruption and other bugs in BPF layer, from
          Alexei Starovoitov.
      
       2) Add a conservative fix for doing BPF properly in the BPF classifier
          of the packet scheduler on ingress.  Also from Alexei.
      
       3) The SKB scrubber should not clear out the packet MARK and security
          label, from Herbert Xu.
      
       4) Fix oops on rmmod in stmmac driver, from Bryan O'Donoghue.
      
       5) Pause handling is not correct in the stmmac driver because it
          doesn't take into consideration the RX and TX fifo sizes.  From
          Vince Bridgers.
      
       6) Failure path missing unlock in FOU driver, from Wang Cong.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
        net: dsa: use DEVICE_ATTR_RW to declare temp1_max
        netns: remove BUG_ONs from net_generic()
        IB/ipoib: Fix ndo_get_iflink
        sfc: Fix memcpy() with const destination compiler warning.
        altera tse: Fix network-delays and -retransmissions after high throughput.
        net: remove unused 'dev' argument from netif_needs_gso()
        act_mirred: Fix bogus header when redirecting from VLAN
        inet_diag: fix access to tcp cc information
        tcp: tcp_get_info() should fetch socket fields once
        net: dsa: mv88e6xxx: Add missing initialization in mv88e6xxx_set_port_state()
        skbuff: Do not scrub skb mark within the same name space
        Revert "net: Reset secmark when scrubbing packet"
        bpf: fix two bugs in verification logic when accessing 'ctx' pointer
        bpf: fix bpf helpers to use skb->mac_header relative offsets
        stmmac: Configure Flow Control to work correctly based on rxfifo size
        stmmac: Enable unicast pause frame detect in GMAC Register 6
        stmmac: Read tx-fifo-depth and rx-fifo-depth from the devicetree
        stmmac: Add defines and documentation for enabling flow control
        stmmac: Add properties for transmit and receive fifo sizes
        stmmac: fix oops on rmmod after assigning ip addr
        ...
      388f9976
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · e2fdae7e
      Linus Torvalds authored
      Pull sparc updates from David Miller:
       "The PowerPC folks have a really nice scalable IOMMU pool allocator
        that we wanted to make use of for sparc.  So here we have a series
        that abstracts out their code into a common layer that anyone can make
        use of.
      
        Sparc is converted, and the PowerPC folks have reviewed and ACK'd this
        series and plan to convert PowerPC over as well"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        iommu-common: Fix PARISC compile-time warnings
        sparc: Make LDC use common iommu poll management functions
        sparc: Make sparc64 use scalable lib/iommu-common.c functions
        sparc: Break up monolithic iommu table/lock into finer graularity pools and lock
      e2fdae7e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 6b6e177d
      Linus Torvalds authored
      Pull arch/tile updates from Chris Metcalf:
       "These are mostly nohz_full changes, plus a smattering of minor fixes
        (notably a couple for ftrace)"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: nohz: warn if nohz_full uses hypervisor shared cores
        tile: ftrace: fix function_graph tracer issues
        tile: map data region shadow of kernel as R/W
        tile: support CONTEXT_TRACKING and thus NOHZ_FULL
        tile: support arch_irq_work_raise
        arch: tile: fix null pointer dereference on pt_regs pointer
        tile/elf: reorganize notify_exec()
        tile: use si_int instead of si_ptr for compat_siginfo
      6b6e177d
    • Vivien Didelot's avatar
      net: dsa: use DEVICE_ATTR_RW to declare temp1_max · e3122b7f
      Vivien Didelot authored
      
      
      Since commit da4759c7 (sysfs: Use only return value from is_visible for
      the file mode), it is possible to reduce the permissions of a file.
      
      So declare temp1_max with the DEVICE_ATTR_RW macro and remove the write
      permission in dsa_hwmon_attrs_visible if set_temp_limit isn't provided.
      
      Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e3122b7f