Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
d1388dac
Commit
d1388dac
authored
Dec 19, 2011
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-davem' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
parents
ed4a5184
42a3b63b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
12 deletions
+18
-12
drivers/net/wireless/ath/ath9k/rc.c
drivers/net/wireless/ath/ath9k/rc.c
+3
-1
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+2
-2
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+4
-1
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+6
-0
drivers/net/wireless/mwifiex/cmdevt.c
drivers/net/wireless/mwifiex/cmdevt.c
+2
-7
net/nfc/nci/core.c
net/nfc/nci/core.c
+1
-1
No files found.
drivers/net/wireless/ath/ath9k/rc.c
View file @
d1388dac
...
@@ -1271,7 +1271,9 @@ static void ath_rc_init(struct ath_softc *sc,
...
@@ -1271,7 +1271,9 @@ static void ath_rc_init(struct ath_softc *sc,
ath_rc_priv
->
max_valid_rate
=
k
;
ath_rc_priv
->
max_valid_rate
=
k
;
ath_rc_sort_validrates
(
rate_table
,
ath_rc_priv
);
ath_rc_sort_validrates
(
rate_table
,
ath_rc_priv
);
ath_rc_priv
->
rate_max_phy
=
ath_rc_priv
->
valid_rate_index
[
k
-
4
];
ath_rc_priv
->
rate_max_phy
=
(
k
>
4
)
?
ath_rc_priv
->
valid_rate_index
[
k
-
4
]
:
ath_rc_priv
->
valid_rate_index
[
k
-
1
];
ath_rc_priv
->
rate_table
=
rate_table
;
ath_rc_priv
->
rate_table
=
rate_table
;
ath_dbg
(
common
,
ATH_DBG_CONFIG
,
ath_dbg
(
common
,
ATH_DBG_CONFIG
,
...
...
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
View file @
d1388dac
...
@@ -606,8 +606,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
...
@@ -606,8 +606,8 @@ int iwlagn_mac_config(struct ieee80211_hw *hw, u32 changed)
if
(
ctx
->
ht
.
enabled
)
{
if
(
ctx
->
ht
.
enabled
)
{
/* if HT40 is used, it should not change
/* if HT40 is used, it should not change
* after associated except channel switch */
* after associated except channel switch */
if
(
iwl_is_associated_ctx
(
ctx
)
&&
if
(
!
ctx
->
ht
.
is_40mhz
||
!
ctx
->
ht
.
is_40mhz
)
!
iwl_is_associated_ctx
(
ctx
)
)
iwlagn_config_ht40
(
conf
,
ctx
);
iwlagn_config_ht40
(
conf
,
ctx
);
}
else
}
else
ctx
->
ht
.
is_40mhz
=
false
;
ctx
->
ht
.
is_40mhz
=
false
;
...
...
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
View file @
d1388dac
...
@@ -91,7 +91,10 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,
...
@@ -91,7 +91,10 @@ static void iwlagn_tx_cmd_build_basic(struct iwl_priv *priv,
tx_cmd
->
tid_tspec
=
qc
[
0
]
&
0xf
;
tx_cmd
->
tid_tspec
=
qc
[
0
]
&
0xf
;
tx_flags
&=
~
TX_CMD_FLG_SEQ_CTL_MSK
;
tx_flags
&=
~
TX_CMD_FLG_SEQ_CTL_MSK
;
}
else
{
}
else
{
tx_flags
|=
TX_CMD_FLG_SEQ_CTL_MSK
;
if
(
info
->
flags
&
IEEE80211_TX_CTL_ASSIGN_SEQ
)
tx_flags
|=
TX_CMD_FLG_SEQ_CTL_MSK
;
else
tx_flags
&=
~
TX_CMD_FLG_SEQ_CTL_MSK
;
}
}
iwlagn_tx_cmd_protection
(
priv
,
info
,
fc
,
&
tx_flags
);
iwlagn_tx_cmd_protection
(
priv
,
info
,
fc
,
&
tx_flags
);
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
View file @
d1388dac
...
@@ -2850,6 +2850,9 @@ static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw,
...
@@ -2850,6 +2850,9 @@ static int iwlagn_mac_tx_sync(struct ieee80211_hw *hw,
int
ret
;
int
ret
;
u8
sta_id
;
u8
sta_id
;
if
(
ctx
->
ctxid
!=
IWL_RXON_CTX_PAN
)
return
0
;
IWL_DEBUG_MAC80211
(
priv
,
"enter
\n
"
);
IWL_DEBUG_MAC80211
(
priv
,
"enter
\n
"
);
mutex_lock
(
&
priv
->
shrd
->
mutex
);
mutex_lock
(
&
priv
->
shrd
->
mutex
);
...
@@ -2898,6 +2901,9 @@ static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw,
...
@@ -2898,6 +2901,9 @@ static void iwlagn_mac_finish_tx_sync(struct ieee80211_hw *hw,
struct
iwl_vif_priv
*
vif_priv
=
(
void
*
)
vif
->
drv_priv
;
struct
iwl_vif_priv
*
vif_priv
=
(
void
*
)
vif
->
drv_priv
;
struct
iwl_rxon_context
*
ctx
=
vif_priv
->
ctx
;
struct
iwl_rxon_context
*
ctx
=
vif_priv
->
ctx
;
if
(
ctx
->
ctxid
!=
IWL_RXON_CTX_PAN
)
return
;
IWL_DEBUG_MAC80211
(
priv
,
"enter
\n
"
);
IWL_DEBUG_MAC80211
(
priv
,
"enter
\n
"
);
mutex_lock
(
&
priv
->
shrd
->
mutex
);
mutex_lock
(
&
priv
->
shrd
->
mutex
);
...
...
drivers/net/wireless/mwifiex/cmdevt.c
View file @
d1388dac
...
@@ -939,7 +939,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
...
@@ -939,7 +939,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
{
{
struct
cmd_ctrl_node
*
cmd_node
=
NULL
,
*
tmp_node
=
NULL
;
struct
cmd_ctrl_node
*
cmd_node
=
NULL
,
*
tmp_node
=
NULL
;
unsigned
long
cmd_flags
;
unsigned
long
cmd_flags
;
unsigned
long
cmd_pending_q_flags
;
unsigned
long
scan_pending_q_flags
;
unsigned
long
scan_pending_q_flags
;
uint16_t
cancel_scan_cmd
=
false
;
uint16_t
cancel_scan_cmd
=
false
;
...
@@ -949,12 +948,9 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
...
@@ -949,12 +948,9 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
cmd_node
=
adapter
->
curr_cmd
;
cmd_node
=
adapter
->
curr_cmd
;
cmd_node
->
wait_q_enabled
=
false
;
cmd_node
->
wait_q_enabled
=
false
;
cmd_node
->
cmd_flag
|=
CMD_F_CANCELED
;
cmd_node
->
cmd_flag
|=
CMD_F_CANCELED
;
spin_lock_irqsave
(
&
adapter
->
cmd_pending_q_lock
,
cmd_pending_q_flags
);
list_del
(
&
cmd_node
->
list
);
spin_unlock_irqrestore
(
&
adapter
->
cmd_pending_q_lock
,
cmd_pending_q_flags
);
mwifiex_insert_cmd_to_free_q
(
adapter
,
cmd_node
);
mwifiex_insert_cmd_to_free_q
(
adapter
,
cmd_node
);
mwifiex_complete_cmd
(
adapter
,
adapter
->
curr_cmd
);
adapter
->
curr_cmd
=
NULL
;
spin_unlock_irqrestore
(
&
adapter
->
mwifiex_cmd_lock
,
cmd_flags
);
spin_unlock_irqrestore
(
&
adapter
->
mwifiex_cmd_lock
,
cmd_flags
);
}
}
...
@@ -981,7 +977,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
...
@@ -981,7 +977,6 @@ mwifiex_cancel_pending_ioctl(struct mwifiex_adapter *adapter)
spin_unlock_irqrestore
(
&
adapter
->
mwifiex_cmd_lock
,
cmd_flags
);
spin_unlock_irqrestore
(
&
adapter
->
mwifiex_cmd_lock
,
cmd_flags
);
}
}
adapter
->
cmd_wait_q
.
status
=
-
1
;
adapter
->
cmd_wait_q
.
status
=
-
1
;
mwifiex_complete_cmd
(
adapter
,
adapter
->
curr_cmd
);
}
}
/*
/*
...
...
net/nfc/nci/core.c
View file @
d1388dac
...
@@ -69,7 +69,7 @@ static int __nci_request(struct nci_dev *ndev,
...
@@ -69,7 +69,7 @@ static int __nci_request(struct nci_dev *ndev,
__u32
timeout
)
__u32
timeout
)
{
{
int
rc
=
0
;
int
rc
=
0
;
unsigned
long
completion_rc
;
long
completion_rc
;
ndev
->
req_status
=
NCI_REQ_PEND
;
ndev
->
req_status
=
NCI_REQ_PEND
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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