1. 02 2月, 2013 2 次提交
  2. 28 1月, 2013 1 次提交
  3. 26 1月, 2013 1 次提交
  4. 25 1月, 2013 1 次提交
    • A
      mac80211: avoid a build warning · fe80123d
      Arnd Bergmann 提交于
      gcc cannot prove that the value of sdata->vif.type does not
      change between the switch() statement and the second
      comparison to NL80211_IFTYPE_AP, causing a harmless
      warning.
      Slightly reordering the code makes the warning go away
      with no functional change.
      
      Without this patch, building ARM at91sam9g45_defconfig with
      gcc-4.6 results in:
      
      net/mac80211/tx.c: In function 'ieee80211_subif_start_xmit':
      net/mac80211/tx.c:1797:22: warning: 'chanctx_conf' may be used uninitialized in this function [-Wuninitialized]
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Cc: Johannes Berg <johannes@sipsolutions.net>
      Cc: "John W. Linville" <linville@tuxdriver.com>
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: linux-wireless@vger.kernel.org
      Cc: netdev@vger.kernel.org
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      fe80123d
  5. 24 1月, 2013 6 次提交
    • J
      mac80211: remove redundant check · 782d2673
      Johannes Berg 提交于
      There's no need to have two checks for "associated"
      in ieee80211_sta_restart(), make the first one locked
      to not race (unlikely at this point during resume)
      and remove the second check.
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      782d2673
    • S
      cfg80211: fix channel check in cfg80211_can_use_iftype_chan · 683d41ae
      Simon Wunderlich 提交于
      In commit "cfg80211: check radar interface combinations" a regression
      was introduced which might lead to NULL dereference if the argument
      chan = NULL, which might happen in IBSS/wext case (and probably
      others).
      Signed-off-by: NSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      683d41ae
    • T
      mac80211: support mesh rate updates · f68d776a
      Thomas Pedersen 提交于
      An existing mesh station entry may change its rate
      capabilities, so call rate_control_rate_update() to notify
      the rate control.
      Signed-off-by: NThomas Pedersen <thomas@cozybit.com>
      [fix compilation]
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      f68d776a
    • T
      mac80211: clean up mesh sta allocation warning · 296fcba3
      Thomas Pedersen 提交于
      This refactoring fixes a "scheduling while atomic" warning
      when allocating a mesh station entry while holding the RCU
      read lock. Fix this by creating a new function
      mesh_sta_info_get(), which correctly handles the locking
      and returns under RCU.
      
      Also move some unnecessarily #ifdefed mesh station init
      code from sta_info_alloc() to __mesh_sta_info_alloc().
      Signed-off-by: NThomas Pedersen <thomas@cozybit.com>
      [change code flow to make sparse happy]
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      296fcba3
    • J
      mac80211: fix aggregation state with current drivers · 8147dc7f
      Johannes Berg 提交于
      For drivers that don't actually flush their queues when
      aggregation stop with the IEEE80211_AMPDU_TX_STOP_FLUSH
      or IEEE80211_AMPDU_TX_STOP_FLUSH_CONT reasons is done,
      like iwlwifi or iwlegacy, mac80211 can then transmit on
      a TID that the driver still considers busy. This happens
      in the following way:
      
       - IEEE80211_AMPDU_TX_STOP_FLUSH requested
       - driver marks TID as emptying
       - mac80211 removes tid_tx data, this can copy packets
         to the TX pending queues and also let new packets
         through to the driver
       - driver gets unexpected TX as it wasn't completely
         converted to the new API
      
      In iwlwifi, this lead to the following warning:
      
      WARNING: at drivers/net/wireless/iwlwifi/dvm/tx.c:442 iwlagn_tx_skb+0xc47/0xce0
      Tx while agg.state = 4
      Modules linked in: [...]
      Pid: 0, comm: kworker/0:0 Tainted: G        W   3.1.0 #1
      Call Trace:
       [<c1046e42>] warn_slowpath_common+0x72/0xa0
       [<c1046f13>] warn_slowpath_fmt+0x33/0x40
       [<fddffa17>] iwlagn_tx_skb+0xc47/0xce0 [iwldvm]
       [<fddfcaa3>] iwlagn_mac_tx+0x23/0x40 [iwldvm]
       [<fd8c98b6>] __ieee80211_tx+0xf6/0x3c0 [mac80211]
       [<fd8cbe00>] ieee80211_tx+0xd0/0x100 [mac80211]
       [<fd8cc176>] ieee80211_xmit+0x96/0xe0 [mac80211]
       [<fd8cc578>] ieee80211_subif_start_xmit+0x348/0xc80 [mac80211]
       [<c1445207>] dev_hard_start_xmit+0x337/0x6d0
       [<c145eee9>] sch_direct_xmit+0xa9/0x210
       [<c14462c0>] dev_queue_xmit+0x1b0/0x8e0
      
      Fortunately, solving this problem is easy as the station
      is being destroyed, so such transmit packets can only
      happen due to races. Instead of trying to close the race
      just let the race not reach the drivers by making two
      changes:
       1) remove the explicit aggregation session teardown in
          the managed mode code, the same thing will be done
          when the station is removed, in __sta_info_destroy.
       2) When aggregation stop with AGG_STOP_DESTROY_STA is
          requested, leave the tid_tx data around as stopped.
          It will be cleared and freed in cleanup_single_sta
          later, but until then any racy packets will be put
          onto the tid_tx pending queue instead of transmitted
          which is fine since the station is being removed.
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      8147dc7f
    • E
      mac80211: provide the vif in rssi_callback · 887da917
      Emmanuel Grumbach 提交于
      Since drivers can support several BSS / P2P Client
      interfaces, the rssi callback needs to inform the driver
      about the interface teh rssi event relates to.
      Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      887da917
  6. 23 1月, 2013 14 次提交
  7. 19 1月, 2013 3 次提交
  8. 18 1月, 2013 4 次提交
  9. 17 1月, 2013 8 次提交
    • J
      mac80211: split out chandef tracing macros · 5a32aff3
      Johannes Berg 提交于
      Some new APIs will require tracing a chandef without
      it being part of a channel context, so separate out
      the tracing macros for that.
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      5a32aff3
    • S
      cfg80211: check radar interface combinations · 11c4a075
      Simon Wunderlich 提交于
      To ease further DFS development regarding interface combinations, use
      the interface combinations structure to test for radar capabilities.
      Drivers can specify which channel widths they support, and in which
      modes. Right now only a single AP interface is allowed, but as the
      DFS code evolves other combinations can be enabled.
      Signed-off-by: NSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      11c4a075
    • J
      cfg80211: Allow use_mfp to be specified with the connect command · cee00a95
      Jouni Malinen 提交于
      The NL80211_ATTR_USE_MFP attribute was originally added for
      NL80211_CMD_ASSOCIATE, but it is actually as useful (if not even more
      useful) with NL80211_CMD_CONNECT, so process that attribute with the
      connect command, too.
      Signed-off-by: NJouni Malinen <jouni@qca.qualcomm.com>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      cee00a95
    • B
      mac80211: add encrypt headroom to PERR frames · 8680451f
      Bob Copeland 提交于
      Mesh PERR action frames are robust and thus may be encrypted, so add
      proper head/tailroom to allow this.  Fixes this warning when operating
      a Mesh STA on ath5k:
      
      WARNING: at net/mac80211/wpa.c:427 ccmp_encrypt_skb.isra.5+0x7b/0x1a0 [mac80211]()
      Call Trace:
       [<c011c5e7>] warn_slowpath_common+0x63/0x78
       [<c011c60b>] warn_slowpath_null+0xf/0x13
       [<e090621d>] ccmp_encrypt_skb.isra.5+0x7b/0x1a0 [mac80211]
       [<e090685c>] ieee80211_crypto_ccmp_encrypt+0x1f/0x37 [mac80211]
       [<e0917113>] invoke_tx_handlers+0xcad/0x10bd [mac80211]
       [<e0917665>] ieee80211_tx+0x87/0xb3 [mac80211]
       [<e0918932>] ieee80211_tx_pending+0xcc/0x170 [mac80211]
       [<c0121c43>] tasklet_action+0x3e/0x65
      Signed-off-by: NBob Copeland <me@bobcopeland.com>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      8680451f
    • B
      mac80211: set NEED_TXPROCESSING for PERR frames · 9cbbffe2
      Bob Copeland 提交于
      A user reported warnings in ath5k due to transmitting frames with no
      rates set up.  The frames were Mesh PERR frames, and some debugging
      showed an empty control block with just the vif pointer:
      
      >  [  562.522682] XXX txinfo: 00000000: 00 00 00 00 00 00 00 00 00 00 00
      >  00 00 00 00 00  ................
      >  [  562.522688] XXX txinfo: 00000010: 00 00 00 00 00 00 00 00 54 b8 f2
      >  db 00 00 00 00  ........T.......
      >  [  562.522693] XXX txinfo: 00000020: 00 00 00 00 00 00 00 00 00 00 00
      >  00 00 00 00 00  ................
      
      Set the IEEE80211_TX_INTFL_NEED_TXPROCESSING flag to ensure that
      rate control gets run before the frame is sent.
      Signed-off-by: NBob Copeland <me@bobcopeland.com>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      9cbbffe2
    • A
      nl80211: allow user-space to set address for P2P_DEVICE · 1c18f145
      Arend van Spriel 提交于
      As per email discussion Jouni Malinen pointed out that:
      
      "P2P message exchanges can be executed on the current operating channel
      of any operation (both P2P and non-P2P station). These can be on 5 GHz
      and even on 60 GHz (so yes, you _can_ do GO Negotiation on 60 GHz).
      
      As an example, it would be possible to receive a GO Negotiation Request
      frame on a 5 GHz only radio and then to complete GO Negotiation on that
      band. This can happen both when connected to a P2P group (through client
      discoverability mechanism) and when connected to a legacy AP (assuming
      the station receive Probe Request frame from full scan in the beginning
      of P2P device discovery)."
      
      This means that P2P messages can be sent over different radio devices.
      However, these should use the same P2P device address so it should be
      able to provision this from user-space. This patch adds a parameter for
      this to struct vif_params which should only be used during creation of
      the P2P device interface.
      
      Cc: Jouni Malinen <j@w1.fi>
      Cc: Greg Goldman <ggoldman@broadcom.com>
      Cc: Jithu Jance <jithu@broadcom.com>
      Signed-off-by: NArend van Spriel <arend@broadcom.com>
      [add error checking]
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      1c18f145
    • M
      {cfg,nl}80211: mesh power mode primitives and userspace access · 3b1c5a53
      Marco Porsch 提交于
      Add the nl80211_mesh_power_mode enumeration which holds possible
      values for the mesh power mode. These modes are unknown, active,
      light sleep and deep sleep.
      
      Add power_mode entry to the mesh config structure to hold the
      user-configured default mesh power mode. This value will be used
      for new peer links.
      
      Add the dot11MeshAwakeWindowDuration value to the mesh config.
      The awake window is a duration in TU describing how long the STA
      will stay awake after transmitting its beacon in PS mode.
      
      Add access routines to:
       - get/set local link-specific power mode (STA)
       - get remote STA's link-specific power mode (STA)
       - get remote STA's non-peer power mode (STA)
       - get/set default mesh power mode (mesh config)
       - get/set mesh awake window duration (mesh config)
      
      All config changes may be done at mesh runtime and take effect
      immediately.
      Signed-off-by: NMarco Porsch <marco@cozybit.com>
      Signed-off-by: NIvan Bezyazychnyy <ivan.bezyazychnyy@gmail.com>
      Signed-off-by: NMike Krinkin <krinkin.m.u@gmail.com>
      [fix commit message line length, error handling in set station]
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      3b1c5a53
    • M
      {cfg,nl,mac}80211: set beacon interval and DTIM period on mesh join · 9bdbf04d
      Marco Porsch 提交于
      Move the default mesh beacon interval and DTIM period to cfg80211
      and make them accessible to nl80211. This enables setting both
      values when joining an MBSS.
      
      Previously the DTIM parameter was not set by mac80211 so the
      driver's default value was used.
      Signed-off-by: NMarco Porsch <marco@cozybit.com>
      Signed-off-by: NJohannes Berg <johannes.berg@intel.com>
      9bdbf04d