Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
badb0295
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
badb0295
编写于
5月 02, 2011
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
7cfd2609
16b345d8
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
47 addition
and
17 deletion
+47
-17
drivers/net/wireless/b43/main.c
drivers/net/wireless/b43/main.c
+1
-0
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
+12
-6
drivers/net/wireless/iwlegacy/iwl-led.c
drivers/net/wireless/iwlegacy/iwl-led.c
+19
-1
drivers/net/wireless/iwlegacy/iwl4965-base.c
drivers/net/wireless/iwlegacy/iwl4965-base.c
+4
-4
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+11
-6
未找到文件。
drivers/net/wireless/b43/main.c
浏览文件 @
badb0295
...
@@ -72,6 +72,7 @@ MODULE_FIRMWARE("b43/ucode11.fw");
...
@@ -72,6 +72,7 @@ MODULE_FIRMWARE("b43/ucode11.fw");
MODULE_FIRMWARE
(
"b43/ucode13.fw"
);
MODULE_FIRMWARE
(
"b43/ucode13.fw"
);
MODULE_FIRMWARE
(
"b43/ucode14.fw"
);
MODULE_FIRMWARE
(
"b43/ucode14.fw"
);
MODULE_FIRMWARE
(
"b43/ucode15.fw"
);
MODULE_FIRMWARE
(
"b43/ucode15.fw"
);
MODULE_FIRMWARE
(
"b43/ucode16_mimo.fw"
);
MODULE_FIRMWARE
(
"b43/ucode5.fw"
);
MODULE_FIRMWARE
(
"b43/ucode5.fw"
);
MODULE_FIRMWARE
(
"b43/ucode9.fw"
);
MODULE_FIRMWARE
(
"b43/ucode9.fw"
);
...
...
drivers/net/wireless/iwlegacy/iwl-4965-tx.c
浏览文件 @
badb0295
...
@@ -316,12 +316,18 @@ int iwl4965_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
...
@@ -316,12 +316,18 @@ int iwl4965_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
hdr_len
=
ieee80211_hdrlen
(
fc
);
hdr_len
=
ieee80211_hdrlen
(
fc
);
/* Find index into station table for destination station */
/* For management frames use broadcast id to do not break aggregation */
sta_id
=
iwl_legacy_sta_id_or_broadcast
(
priv
,
ctx
,
info
->
control
.
sta
);
if
(
!
ieee80211_is_data
(
fc
))
if
(
sta_id
==
IWL_INVALID_STATION
)
{
sta_id
=
ctx
->
bcast_sta_id
;
IWL_DEBUG_DROP
(
priv
,
"Dropping - INVALID STATION: %pM
\n
"
,
else
{
hdr
->
addr1
);
/* Find index into station table for destination station */
goto
drop_unlock
;
sta_id
=
iwl_legacy_sta_id_or_broadcast
(
priv
,
ctx
,
info
->
control
.
sta
);
if
(
sta_id
==
IWL_INVALID_STATION
)
{
IWL_DEBUG_DROP
(
priv
,
"Dropping - INVALID STATION: %pM
\n
"
,
hdr
->
addr1
);
goto
drop_unlock
;
}
}
}
IWL_DEBUG_TX
(
priv
,
"station Id %d
\n
"
,
sta_id
);
IWL_DEBUG_TX
(
priv
,
"station Id %d
\n
"
,
sta_id
);
...
...
drivers/net/wireless/iwlegacy/iwl-led.c
浏览文件 @
badb0295
...
@@ -48,8 +48,21 @@ module_param(led_mode, int, S_IRUGO);
...
@@ -48,8 +48,21 @@ module_param(led_mode, int, S_IRUGO);
MODULE_PARM_DESC
(
led_mode
,
"0=system default, "
MODULE_PARM_DESC
(
led_mode
,
"0=system default, "
"1=On(RF On)/Off(RF Off), 2=blinking"
);
"1=On(RF On)/Off(RF Off), 2=blinking"
);
/* Throughput OFF time(ms) ON time (ms)
* >300 25 25
* >200 to 300 40 40
* >100 to 200 55 55
* >70 to 100 65 65
* >50 to 70 75 75
* >20 to 50 85 85
* >10 to 20 95 95
* >5 to 10 110 110
* >1 to 5 130 130
* >0 to 1 167 167
* <=0 SOLID ON
*/
static
const
struct
ieee80211_tpt_blink
iwl_blink
[]
=
{
static
const
struct
ieee80211_tpt_blink
iwl_blink
[]
=
{
{
.
throughput
=
0
*
1024
-
1
,
.
blink_time
=
334
},
{
.
throughput
=
0
,
.
blink_time
=
334
},
{
.
throughput
=
1
*
1024
-
1
,
.
blink_time
=
260
},
{
.
throughput
=
1
*
1024
-
1
,
.
blink_time
=
260
},
{
.
throughput
=
5
*
1024
-
1
,
.
blink_time
=
220
},
{
.
throughput
=
5
*
1024
-
1
,
.
blink_time
=
220
},
{
.
throughput
=
10
*
1024
-
1
,
.
blink_time
=
190
},
{
.
throughput
=
10
*
1024
-
1
,
.
blink_time
=
190
},
...
@@ -101,6 +114,11 @@ static int iwl_legacy_led_cmd(struct iwl_priv *priv,
...
@@ -101,6 +114,11 @@ static int iwl_legacy_led_cmd(struct iwl_priv *priv,
if
(
priv
->
blink_on
==
on
&&
priv
->
blink_off
==
off
)
if
(
priv
->
blink_on
==
on
&&
priv
->
blink_off
==
off
)
return
0
;
return
0
;
if
(
off
==
0
)
{
/* led is SOLID_ON */
on
=
IWL_LED_SOLID
;
}
IWL_DEBUG_LED
(
priv
,
"Led blink time compensation=%u
\n
"
,
IWL_DEBUG_LED
(
priv
,
"Led blink time compensation=%u
\n
"
,
priv
->
cfg
->
base_params
->
led_compensation
);
priv
->
cfg
->
base_params
->
led_compensation
);
led_cmd
.
on
=
iwl_legacy_blink_compensation
(
priv
,
on
,
led_cmd
.
on
=
iwl_legacy_blink_compensation
(
priv
,
on
,
...
...
drivers/net/wireless/iwlegacy/iwl4965-base.c
浏览文件 @
badb0295
...
@@ -2984,15 +2984,15 @@ static void iwl4965_bg_txpower_work(struct work_struct *work)
...
@@ -2984,15 +2984,15 @@ static void iwl4965_bg_txpower_work(struct work_struct *work)
struct
iwl_priv
*
priv
=
container_of
(
work
,
struct
iwl_priv
,
struct
iwl_priv
*
priv
=
container_of
(
work
,
struct
iwl_priv
,
txpower_work
);
txpower_work
);
mutex_lock
(
&
priv
->
mutex
);
/* If a scan happened to start before we got here
/* If a scan happened to start before we got here
* then just return; the statistics notification will
* then just return; the statistics notification will
* kick off another scheduled work to compensate for
* kick off another scheduled work to compensate for
* any temperature delta we missed here. */
* any temperature delta we missed here. */
if
(
test_bit
(
STATUS_EXIT_PENDING
,
&
priv
->
status
)
||
if
(
test_bit
(
STATUS_EXIT_PENDING
,
&
priv
->
status
)
||
test_bit
(
STATUS_SCANNING
,
&
priv
->
status
))
test_bit
(
STATUS_SCANNING
,
&
priv
->
status
))
return
;
goto
out
;
mutex_lock
(
&
priv
->
mutex
);
/* Regardless of if we are associated, we must reconfigure the
/* Regardless of if we are associated, we must reconfigure the
* TX power since frames can be sent on non-radar channels while
* TX power since frames can be sent on non-radar channels while
...
@@ -3002,7 +3002,7 @@ static void iwl4965_bg_txpower_work(struct work_struct *work)
...
@@ -3002,7 +3002,7 @@ static void iwl4965_bg_txpower_work(struct work_struct *work)
/* Update last_temperature to keep is_calib_needed from running
/* Update last_temperature to keep is_calib_needed from running
* when it isn't needed... */
* when it isn't needed... */
priv
->
last_temperature
=
priv
->
temperature
;
priv
->
last_temperature
=
priv
->
temperature
;
out:
mutex_unlock
(
&
priv
->
mutex
);
mutex_unlock
(
&
priv
->
mutex
);
}
}
...
...
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
浏览文件 @
badb0295
...
@@ -568,12 +568,17 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
...
@@ -568,12 +568,17 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
hdr_len
=
ieee80211_hdrlen
(
fc
);
hdr_len
=
ieee80211_hdrlen
(
fc
);
/* Find index into station table for destination station */
/* For management frames use broadcast id to do not break aggregation */
sta_id
=
iwl_sta_id_or_broadcast
(
priv
,
ctx
,
info
->
control
.
sta
);
if
(
!
ieee80211_is_data
(
fc
))
if
(
sta_id
==
IWL_INVALID_STATION
)
{
sta_id
=
ctx
->
bcast_sta_id
;
IWL_DEBUG_DROP
(
priv
,
"Dropping - INVALID STATION: %pM
\n
"
,
else
{
hdr
->
addr1
);
/* Find index into station table for destination station */
goto
drop_unlock
;
sta_id
=
iwl_sta_id_or_broadcast
(
priv
,
ctx
,
info
->
control
.
sta
);
if
(
sta_id
==
IWL_INVALID_STATION
)
{
IWL_DEBUG_DROP
(
priv
,
"Dropping - INVALID STATION: %pM
\n
"
,
hdr
->
addr1
);
goto
drop_unlock
;
}
}
}
IWL_DEBUG_TX
(
priv
,
"station Id %d
\n
"
,
sta_id
);
IWL_DEBUG_TX
(
priv
,
"station Id %d
\n
"
,
sta_id
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录