Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
cloud-kernel
提交
070825b3
cloud-kernel
项目概览
openanolis
/
cloud-kernel
大约 1 年 前同步成功
通知
153
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,发现更多精彩内容 >>
提交
070825b3
编写于
7月 17, 2008
作者:
D
David S. Miller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
igb: Kill CONFIG_NETDEVICES_MULTIQUEUE references, no longer exists.
Signed-off-by:
N
David S. Miller
<
davem@davemloft.net
>
上级
51ce7ec9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
0 addition
and
53 deletion
+0
-53
drivers/net/igb/igb.h
drivers/net/igb/igb.h
+0
-2
drivers/net/igb/igb_main.c
drivers/net/igb/igb_main.c
+0
-51
未找到文件。
drivers/net/igb/igb.h
浏览文件 @
070825b3
...
...
@@ -287,9 +287,7 @@ struct igb_adapter {
int
bars
;
int
need_ioport
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
struct
igb_ring
*
multi_tx_table
[
IGB_MAX_TX_QUEUES
];
#endif
/* CONFIG_NETDEVICES_MULTIQUEUE */
#ifdef CONFIG_IGB_LRO
unsigned
int
lro_max_aggr
;
unsigned
int
lro_aggregated
;
...
...
drivers/net/igb/igb_main.c
浏览文件 @
070825b3
...
...
@@ -532,10 +532,8 @@ static void igb_set_interrupt_capability(struct igb_adapter *adapter)
if
(
!
pci_enable_msi
(
adapter
->
pdev
))
adapter
->
flags
|=
IGB_FLAG_HAS_MSI
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
/* Notify the stack of the (possibly) reduced Tx Queue count. */
adapter
->
netdev
->
egress_subqueue_count
=
adapter
->
num_tx_queues
;
#endif
return
;
}
...
...
@@ -824,10 +822,8 @@ void igb_down(struct igb_adapter *adapter)
/* flush and sleep below */
netif_stop_queue
(
netdev
);
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
for
(
i
=
0
;
i
<
adapter
->
num_tx_queues
;
i
++
)
netif_stop_subqueue
(
netdev
,
i
);
#endif
/* disable transmits in the hardware */
tctl
=
rd32
(
E1000_TCTL
);
...
...
@@ -1042,11 +1038,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
pci_save_state
(
pdev
);
err
=
-
ENOMEM
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
netdev
=
alloc_etherdev_mq
(
sizeof
(
struct
igb_adapter
),
IGB_MAX_TX_QUEUES
);
#else
netdev
=
alloc_etherdev
(
sizeof
(
struct
igb_adapter
));
#endif
/* CONFIG_NETDEVICES_MULTIQUEUE */
if
(
!
netdev
)
goto
err_alloc_etherdev
;
...
...
@@ -1163,9 +1155,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,
if
(
pci_using_dac
)
netdev
->
features
|=
NETIF_F_HIGHDMA
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
netdev
->
features
|=
NETIF_F_MULTI_QUEUE
;
#endif
netdev
->
features
|=
NETIF_F_LLTX
;
adapter
->
en_mng_pt
=
igb_enable_mng_pass_thru
(
&
adapter
->
hw
);
...
...
@@ -1279,10 +1269,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,
/* tell the stack to leave us alone until igb_open() is called */
netif_carrier_off
(
netdev
);
netif_stop_queue
(
netdev
);
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
for
(
i
=
0
;
i
<
adapter
->
num_tx_queues
;
i
++
)
netif_stop_subqueue
(
netdev
,
i
);
#endif
strcpy
(
netdev
->
name
,
"eth%d"
);
err
=
register_netdev
(
netdev
);
...
...
@@ -1432,11 +1420,7 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter)
/* Number of supported queues. */
/* Having more queues than CPUs doesn't make sense. */
adapter
->
num_rx_queues
=
min
((
u32
)
IGB_MAX_RX_QUEUES
,
(
u32
)
num_online_cpus
());
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
adapter
->
num_tx_queues
=
min
(
IGB_MAX_TX_QUEUES
,
num_online_cpus
());
#else
adapter
->
num_tx_queues
=
1
;
#endif
/* CONFIG_NET_MULTI_QUEUE_DEVICE */
/* This call may decrease the number of queues depending on
* interrupt mode. */
...
...
@@ -1619,9 +1603,7 @@ int igb_setup_tx_resources(struct igb_adapter *adapter,
static
int
igb_setup_all_tx_resources
(
struct
igb_adapter
*
adapter
)
{
int
i
,
err
=
0
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
int
r_idx
;
#endif
for
(
i
=
0
;
i
<
adapter
->
num_tx_queues
;
i
++
)
{
err
=
igb_setup_tx_resources
(
adapter
,
&
adapter
->
tx_ring
[
i
]);
...
...
@@ -1634,12 +1616,10 @@ static int igb_setup_all_tx_resources(struct igb_adapter *adapter)
}
}
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
for
(
i
=
0
;
i
<
IGB_MAX_TX_QUEUES
;
i
++
)
{
r_idx
=
i
%
adapter
->
num_tx_queues
;
adapter
->
multi_tx_table
[
i
]
=
&
adapter
->
tx_ring
[
r_idx
];
}
#endif
return
err
;
}
...
...
@@ -2337,9 +2317,7 @@ static void igb_watchdog_task(struct work_struct *work)
struct
e1000_mac_info
*
mac
=
&
adapter
->
hw
.
mac
;
u32
link
;
s32
ret_val
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
int
i
;
#endif
if
((
netif_carrier_ok
(
netdev
))
&&
(
rd32
(
E1000_STATUS
)
&
E1000_STATUS_LU
))
...
...
@@ -2396,10 +2374,8 @@ static void igb_watchdog_task(struct work_struct *work)
netif_carrier_on
(
netdev
);
netif_wake_queue
(
netdev
);
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
for
(
i
=
0
;
i
<
adapter
->
num_tx_queues
;
i
++
)
netif_wake_subqueue
(
netdev
,
i
);
#endif
if
(
!
test_bit
(
__IGB_DOWN
,
&
adapter
->
state
))
mod_timer
(
&
adapter
->
phy_info_timer
,
...
...
@@ -2412,10 +2388,8 @@ static void igb_watchdog_task(struct work_struct *work)
dev_info
(
&
adapter
->
pdev
->
dev
,
"NIC Link is Down
\n
"
);
netif_carrier_off
(
netdev
);
netif_stop_queue
(
netdev
);
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
for
(
i
=
0
;
i
<
adapter
->
num_tx_queues
;
i
++
)
netif_stop_subqueue
(
netdev
,
i
);
#endif
if
(
!
test_bit
(
__IGB_DOWN
,
&
adapter
->
state
))
mod_timer
(
&
adapter
->
phy_info_timer
,
round_jiffies
(
jiffies
+
2
*
HZ
));
...
...
@@ -2943,11 +2917,7 @@ static int __igb_maybe_stop_tx(struct net_device *netdev,
{
struct
igb_adapter
*
adapter
=
netdev_priv
(
netdev
);
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
netif_stop_subqueue
(
netdev
,
tx_ring
->
queue_index
);
#else
netif_stop_queue
(
netdev
);
#endif
/* Herbert's original patch had:
* smp_mb__after_netif_stop_queue();
...
...
@@ -2960,11 +2930,7 @@ static int __igb_maybe_stop_tx(struct net_device *netdev,
return
-
EBUSY
;
/* A reprieve! */
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
netif_wake_subqueue
(
netdev
,
tx_ring
->
queue_index
);
#else
netif_wake_queue
(
netdev
);
#endif
++
adapter
->
restart_queue
;
return
0
;
}
...
...
@@ -3051,14 +3017,9 @@ static int igb_xmit_frame_adv(struct sk_buff *skb, struct net_device *netdev)
struct
igb_adapter
*
adapter
=
netdev_priv
(
netdev
);
struct
igb_ring
*
tx_ring
;
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
int
r_idx
=
0
;
r_idx
=
skb
->
queue_mapping
&
(
IGB_MAX_TX_QUEUES
-
1
);
tx_ring
=
adapter
->
multi_tx_table
[
r_idx
];
#else
tx_ring
=
&
adapter
->
tx_ring
[
0
];
#endif
/* This goes back to the question of how to logically map a tx queue
* to a flow. Right now, performance is impacted slightly negatively
...
...
@@ -3745,19 +3706,11 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)
* sees the new next_to_clean.
*/
smp_mb
();
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
if
(
__netif_subqueue_stopped
(
netdev
,
tx_ring
->
queue_index
)
&&
!
(
test_bit
(
__IGB_DOWN
,
&
adapter
->
state
)))
{
netif_wake_subqueue
(
netdev
,
tx_ring
->
queue_index
);
++
adapter
->
restart_queue
;
}
#else
if
(
netif_queue_stopped
(
netdev
)
&&
!
(
test_bit
(
__IGB_DOWN
,
&
adapter
->
state
)))
{
netif_wake_queue
(
netdev
);
++
adapter
->
restart_queue
;
}
#endif
}
if
(
tx_ring
->
detect_tx_hung
)
{
...
...
@@ -3793,11 +3746,7 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)
tx_ring
->
buffer_info
[
i
].
time_stamp
,
jiffies
,
tx_desc
->
upper
.
fields
.
status
);
#ifdef CONFIG_NETDEVICES_MULTIQUEUE
netif_stop_subqueue
(
netdev
,
tx_ring
->
queue_index
);
#else
netif_stop_queue
(
netdev
);
#endif
}
}
tx_ring
->
total_bytes
+=
total_bytes
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录