1. 04 12月, 2015 19 次提交
  2. 03 12月, 2015 3 次提交
    • J
      mac80211: fix off-channel mgmt-tx uninitialized variable usage · c1df932c
      Johannes Berg 提交于
      In the last change here, I neglected to update the cookie in one code
      path: when a mgmt-tx has no real cookie sent to userspace as it doesn't
      wait for a response, but is off-channel. The original code used the SKB
      pointer as the cookie and always assigned the cookie to the TX SKB in
      ieee80211_start_roc_work(), but my change turned this around and made
      the code rely on a valid cookie being passed in.
      
      Unfortunately, the off-channel no-wait TX path wasn't assigning one at
      all, resulting in an uninitialized stack value being used. This wasn't
      handed back to userspace as a cookie (since in the no-wait case there
      isn't a cookie), but it was tested for non-zero to distinguish between
      mgmt-tx and off-channel.
      
      Fix this by assigning a dummy non-zero cookie unconditionally, and get
      rid of a misleading comment and some dead code while at it. I'll clean
      up the ACK SKB handling separately later.
      
      Fixes: 3b79af97 ("mac80211: stop using pointers as userspace cookies")
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      c1df932c
    • A
      mac80211: do not actively scan DFS channels · 4e39ccac
      Antonio Quartulli 提交于
      DFS channels should not be actively scanned as we can't be sure
      if we are allowed or not.
      
      If the current channel is in the DFS band, active scan might be
      performed after CSA, but we have no guarantee about other channels,
      therefore it is safer to prevent active scanning at all.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NAntonio Quartulli <antonio@open-mesh.com>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      4e39ccac
    • E
      mac80211: don't teardown sdata on sdata stop · 835112b2
      Eliad Peller 提交于
      Interfaces are being initialized (setup) on addition,
      and torn down on removal.
      
      However, p2p device is being torn down when stopped,
      resulting in the next p2p start operation being done
      on uninitialized interface.
      
      Solve it by calling ieee80211_teardown_sdata() only
      on interface removal (for the non-netdev case).
      Signed-off-by: NEliad Peller <eliadx.peller@intel.com>
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      [squashed in fix to call teardown after unregister]
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      835112b2
  3. 25 11月, 2015 12 次提交
  4. 24 11月, 2015 6 次提交
    • D
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 57ef5527
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2015-11-23
      
      This series contains updates to ixgbe, ixgbevf, fm10k, i40e and i40evf.
      
      Jacob fixes an issue where VF could attempt to read queues it does not own,
      so prevent this we check queue 0 before we continue.
      
      Matthew fixes the MTU for jumbo frames for fm10k.
      
      Julia Lawall cleans up a unneeded NULL test in ixgbe.
      
      Mark cleans up a redundant header inclusion.  Adds KR mode support for
      CS4227 chip.  Cleaned up diagnostic code, which is no longer needed, for
      the CS4227 chip.
      
      Jean Sacren fixes kernel documentation for ixgbe.
      
      Alex Duyck fixes an fm10k and ixgbe issue in which the polling routine would
      increase the budget for receive to at least 1 per queue if multiple queues were
      present.  This would result in receive packets being processed when the budget
      was 0 which is meant to indicate that no receive can be handled.  Also fixes
      an ixgbevf performance issue where netperf test will starve for memory in the
      time form one transmit interrupt to the next, so limit lowest interrupt rate
      for adaptive interrupt moderation to 12K.  Fixed up ixgbe and ixgbevf to
      use napi_schedule_irqoff() where the drivers were run from hard interrupt
      context or with interrupts already disabled in netpoll.
      
      Jesse fixes a compiler warning about an unused variable for i40evf.
      
      John Greene fixes an issue with ixgbevf, where if the VF driver is loaded
      while the corresponding PH interface is down, the driver assigns a random
      MAC address, can be overwritten with the value of hw->mac.perm_addr which
      is 0 at that point.  So avoid this case by initializing hw->mac.perm_addr
      to the randomly generated address and do not set it unless we receive an
      ACK from ixgbe.
      
      Rasmus Villemoes cleans up some confusing code in i40e debugfs code.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      57ef5527
    • J
      VSOCK: constify vmci_transport_notify_ops structures · 3b22dae3
      Julia Lawall 提交于
      The vmci_transport_notify_ops structures are never modified, so declare
      them as const.
      
      Done with the help of Coccinelle.
      Signed-off-by: NJulia Lawall <Julia.Lawall@lip6.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3b22dae3
    • J
      net: atm: constify in_cache_ops and eg_cache_ops structures · 4dd191bb
      Julia Lawall 提交于
      The in_cache_ops and eg_cache_ops structures are never modified, so declare
      them as const.
      
      Done with the help of Coccinelle.
      Signed-off-by: NJulia Lawall <Julia.Lawall@lip6.fr>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      4dd191bb
    • D
      Merge branch 'ipmr-cleanups' · 901fb38d
      David S. Miller 提交于
      Nikolay Aleksandrov says:
      
      ====================
      net: ipmr: cleanups and minor improvements
      
      Since I'll have to work with ipmr, I decided to clean it up and do some
      minor improvements. Functionally there're almost no changes except the
      SLAB_PANIC removal. Most of the patches just re-design some functions to
      be clearer and more concise and try to remove the ifdef web that was
      inside. There's more information in each commit. This is the first set,
      the end goal is to introduce complete netlink support and control over
      the mfc and vif devices.
      I've tried to test all of the setsockopt/getsockopt options, and also
      made builds with various ipmr kconfig options turned on and off.
      
      v2: change patch 7 to keep SLAB_PANIC and just drop the unnecessary null
      check
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      901fb38d
    • N
      net: ipmr: factor out common vif init code · a0b47736
      Nikolay Aleksandrov 提交于
      Factor out common vif init code used in both tunnel and pimreg
      initialization and create ipmr_init_vif_indev() function.
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a0b47736
    • N
      net: ipmr: rearrange and cleanup setsockopt · 29e97d21
      Nikolay Aleksandrov 提交于
      Take rtnl in the beginning unconditionally as most options already need
      it (one exception - MRT_DONE, see the comment inside), make the
      lock/unlock places central and move out the switch() local variables.
      Signed-off-by: NNikolay Aleksandrov <nikolay@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      29e97d21