1. 04 12月, 2015 6 次提交
  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 2 次提交
    • G
      net/ipv4/ipconfig: Rejoin broken lines in console output · 6c1c36b0
      Geert Uytterhoeven 提交于
      Commit 09605cc1 ("net ipv4: use preferred log methods") replaced
      a few calls of pr_cont() after a console print without a trailing
      newline by pr_info(), causing lines to be split during IP
      autoconfiguration, like:
      
          .
          ,
           OK
          IP-Config: Got DHCP answer from 192.168.97.254,
          my address is 192.168.97.44
      
      Convert these back to using pr_cont(), so it prints again:
      
          ., OK
          IP-Config: Got DHCP answer from 192.168.97.254, my address is 192.168.97.44
      
      Absorb the printing of "my address ..." into the previous call to
      pr_info(), as there's no reason to use a continuation there.
      
      Convert one more pr_info() to print nameservers while we're at it.
      
      Fixes: 09605cc1 ("net ipv4: use preferred log methods")
      Signed-off-by: NGeert Uytterhoeven <geert+renesas@glider.be>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6c1c36b0
    • A
      net: dsa: include gpio consumer header file · 85beabfe
      Arnd Bergmann 提交于
      After the introduction of the switch gpio reset API, I'm getting
      build errors in configurations that disable CONFIG_GPIOLIB:
      
      net/dsa/dsa.c:783:16: error: implicit declaration of function 'gpio_to_desc' [-Werror=implicit-function-declaration]
      
      The reason is that linux/gpio/consumer.h is not automatically
      included without gpiolib support. This adds an explicit #include
      statement to make it compile in all configurations. The reset
      functionality will not work without gpiolib, which is what you
      get when disabling the feature.
      
      As far as I can tell, gpiolib is supported on all architectures
      on which you can have DSA at the moment.
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Fixes: cc30c163 ("net: dsa: Add support for a switch reset gpio")
      Acked-by: NAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      85beabfe
  4. 24 11月, 2015 12 次提交
  5. 23 11月, 2015 4 次提交
  6. 22 11月, 2015 3 次提交
  7. 21 11月, 2015 9 次提交
  8. 20 11月, 2015 1 次提交