Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
xenomai
ipipe
Commits
209f6c37
Commit
209f6c37
authored
May 13, 2014
by
John W. Linville
Browse files
Merge branch 'for-john' of
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
parents
03e5da15
b538b8ce
Changes
4
Hide whitespace changes
Inline
Side-by-side
drivers/net/wireless/iwlwifi/mvm/mac80211.c
View file @
209f6c37
...
...
@@ -1007,7 +1007,7 @@ static void iwl_mvm_mc_iface_iterator(void *_data, u8 *mac,
memcpy
(
cmd
->
bssid
,
vif
->
bss_conf
.
bssid
,
ETH_ALEN
);
len
=
roundup
(
sizeof
(
*
cmd
)
+
cmd
->
count
*
ETH_ALEN
,
4
);
ret
=
iwl_mvm_send_cmd_pdu
(
mvm
,
MCAST_FILTER_CMD
,
CMD_SYNC
,
len
,
cmd
);
ret
=
iwl_mvm_send_cmd_pdu
(
mvm
,
MCAST_FILTER_CMD
,
CMD_
A
SYNC
,
len
,
cmd
);
if
(
ret
)
IWL_ERR
(
mvm
,
"mcast filter cmd error. ret=%d
\n
"
,
ret
);
}
...
...
@@ -1023,7 +1023,7 @@ static void iwl_mvm_recalc_multicast(struct iwl_mvm *mvm)
if
(
WARN_ON_ONCE
(
!
mvm
->
mcast_filter_cmd
))
return
;
ieee80211_iterate_active_interfaces
(
ieee80211_iterate_active_interfaces
_atomic
(
mvm
->
hw
,
IEEE80211_IFACE_ITER_NORMAL
,
iwl_mvm_mc_iface_iterator
,
&
iter_data
);
}
...
...
@@ -1807,7 +1807,7 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,
mutex_lock
(
&
mvm
->
mutex
);
if
(
iwl_mvm_is_
associated
(
mvm
))
{
if
(
!
iwl_mvm_is_
idle
(
mvm
))
{
ret
=
-
EBUSY
;
goto
out
;
}
...
...
drivers/net/wireless/iwlwifi/mvm/mvm.h
View file @
209f6c37
...
...
@@ -1004,7 +1004,7 @@ static inline bool iwl_mvm_vif_low_latency(struct iwl_mvm_vif *mvmvif)
}
/* Assoc status */
bool
iwl_mvm_is_
associated
(
struct
iwl_mvm
*
mvm
);
bool
iwl_mvm_is_
idle
(
struct
iwl_mvm
*
mvm
);
/* Thermal management and CT-kill */
void
iwl_mvm_tt_tx_backoff
(
struct
iwl_mvm
*
mvm
,
u32
backoff
);
...
...
drivers/net/wireless/iwlwifi/mvm/scan.c
View file @
209f6c37
...
...
@@ -732,7 +732,7 @@ int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
int
band_2ghz
=
mvm
->
nvm_data
->
bands
[
IEEE80211_BAND_2GHZ
].
n_channels
;
int
band_5ghz
=
mvm
->
nvm_data
->
bands
[
IEEE80211_BAND_5GHZ
].
n_channels
;
int
head
=
0
;
int
tail
=
band_2ghz
+
band_5ghz
;
int
tail
=
band_2ghz
+
band_5ghz
-
1
;
u32
ssid_bitmap
;
int
cmd_len
;
int
ret
;
...
...
drivers/net/wireless/iwlwifi/mvm/utils.c
View file @
209f6c37
...
...
@@ -645,21 +645,21 @@ bool iwl_mvm_low_latency(struct iwl_mvm *mvm)
return
result
;
}
static
void
iwl_mvm_
assoc
_iter
(
void
*
_data
,
u8
*
mac
,
struct
ieee80211_vif
*
vif
)
static
void
iwl_mvm_
idle
_iter
(
void
*
_data
,
u8
*
mac
,
struct
ieee80211_vif
*
vif
)
{
bool
*
assoc
=
_data
;
bool
*
idle
=
_data
;
if
(
vif
->
bss_conf
.
assoc
)
*
assoc
=
tru
e
;
if
(
!
vif
->
bss_conf
.
idle
)
*
idle
=
fals
e
;
}
bool
iwl_mvm_is_
associated
(
struct
iwl_mvm
*
mvm
)
bool
iwl_mvm_is_
idle
(
struct
iwl_mvm
*
mvm
)
{
bool
assoc
=
fals
e
;
bool
idle
=
tru
e
;
ieee80211_iterate_active_interfaces_atomic
(
mvm
->
hw
,
IEEE80211_IFACE_ITER_NORMAL
,
iwl_mvm_
assoc
_iter
,
&
assoc
);
iwl_mvm_
idle
_iter
,
&
idle
);
return
assoc
;
return
idle
;
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment