Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
6303710d
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
156
Star
36
Fork
7
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
10
列表
看板
标记
里程碑
合并请求
2
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
cloud-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
10
Issue
10
列表
看板
标记
里程碑
合并请求
2
合并请求
2
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6303710d
编写于
1月 05, 2011
作者:
J
John W. Linville
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
上级
db98a6cf
d2460f4b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
20 addition
and
5 deletion
+20
-5
drivers/net/wireless/hostap/hostap_main.c
drivers/net/wireless/hostap/hostap_main.c
+0
-1
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-agn.c
+5
-4
drivers/net/wireless/iwlwifi/iwl-helpers.h
drivers/net/wireless/iwlwifi/iwl-helpers.h
+6
-0
net/mac80211/key.c
net/mac80211/key.c
+6
-0
net/mac80211/rx.c
net/mac80211/rx.c
+3
-0
未找到文件。
drivers/net/wireless/hostap/hostap_main.c
浏览文件 @
6303710d
...
...
@@ -891,7 +891,6 @@ void hostap_setup_dev(struct net_device *dev, local_info_t *local,
SET_ETHTOOL_OPS
(
dev
,
&
prism2_ethtool_ops
);
netif_stop_queue
(
dev
);
}
static
int
hostap_enable_hostapd
(
local_info_t
*
local
,
int
rtnl_locked
)
...
...
drivers/net/wireless/iwlwifi/iwl-agn.c
浏览文件 @
6303710d
...
...
@@ -3280,9 +3280,10 @@ void iwlagn_mac_stop(struct ieee80211_hw *hw)
flush_workqueue
(
priv
->
workqueue
);
/* enable interrupts again in order to receive rfkill changes */
/* User space software may expect getting rfkill changes
* even if interface is down */
iwl_write32
(
priv
,
CSR_INT
,
0xFFFFFFFF
);
iwl_enable_
interrupts
(
priv
);
iwl_enable_
rfkill_int
(
priv
);
IWL_DEBUG_MAC80211
(
priv
,
"leave
\n
"
);
}
...
...
@@ -4191,14 +4192,14 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
* 8. Enable interrupts and read RFKILL state
*********************************************/
/* enable
interrupts if needed
: hw bug w/a */
/* enable
rfkill interrupt
: hw bug w/a */
pci_read_config_word
(
priv
->
pci_dev
,
PCI_COMMAND
,
&
pci_cmd
);
if
(
pci_cmd
&
PCI_COMMAND_INTX_DISABLE
)
{
pci_cmd
&=
~
PCI_COMMAND_INTX_DISABLE
;
pci_write_config_word
(
priv
->
pci_dev
,
PCI_COMMAND
,
pci_cmd
);
}
iwl_enable_
interrupts
(
priv
);
iwl_enable_
rfkill_int
(
priv
);
/* If platform's RF_KILL switch is NOT set to KILL */
if
(
iwl_read32
(
priv
,
CSR_GP_CNTRL
)
&
CSR_GP_CNTRL_REG_FLAG_HW_RF_KILL_SW
)
...
...
drivers/net/wireless/iwlwifi/iwl-helpers.h
浏览文件 @
6303710d
...
...
@@ -148,6 +148,12 @@ static inline void iwl_disable_interrupts(struct iwl_priv *priv)
IWL_DEBUG_ISR
(
priv
,
"Disabled interrupts
\n
"
);
}
static
inline
void
iwl_enable_rfkill_int
(
struct
iwl_priv
*
priv
)
{
IWL_DEBUG_ISR
(
priv
,
"Enabling rfkill interrupt
\n
"
);
iwl_write32
(
priv
,
CSR_INT_MASK
,
CSR_INT_BIT_RF_KILL
);
}
static
inline
void
iwl_enable_interrupts
(
struct
iwl_priv
*
priv
)
{
IWL_DEBUG_ISR
(
priv
,
"Enabling interrupts
\n
"
);
...
...
net/mac80211/key.c
浏览文件 @
6303710d
...
...
@@ -375,6 +375,12 @@ static void __ieee80211_key_destroy(struct ieee80211_key *key)
if
(
!
key
)
return
;
/*
* Synchronize so the TX path can no longer be using
* this key before we free/remove it.
*/
synchronize_rcu
();
if
(
key
->
local
)
ieee80211_key_disable_hw_accel
(
key
);
...
...
net/mac80211/rx.c
浏览文件 @
6303710d
...
...
@@ -1808,6 +1808,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
if
(
!
fwd_skb
&&
net_ratelimit
())
printk
(
KERN_DEBUG
"%s: failed to clone mesh frame
\n
"
,
sdata
->
name
);
if
(
!
fwd_skb
)
goto
out
;
fwd_hdr
=
(
struct
ieee80211_hdr
*
)
fwd_skb
->
data
;
memcpy
(
fwd_hdr
->
addr2
,
sdata
->
vif
.
addr
,
ETH_ALEN
);
...
...
@@ -1845,6 +1847,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx)
}
}
out:
if
(
is_multicast_ether_addr
(
hdr
->
addr1
)
||
sdata
->
dev
->
flags
&
IFF_PROMISC
)
return
RX_CONTINUE
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录