git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
sched
/
sch_api.c
diff --git
a/net/sched/sch_api.c
b/net/sched/sch_api.c
index
31570b9
..
0b64892
100644
(file)
--- a/
net/sched/sch_api.c
+++ b/
net/sched/sch_api.c
@@
-15,7
+15,6
@@
* Jamal Hadi Salim <hadi@nortelnetworks.com>: 990601: ingress support
*/
* Jamal Hadi Salim <hadi@nortelnetworks.com>: 990601: ingress support
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
@@
-196,14
+195,14
@@
struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle)
{
struct Qdisc *q;
{
struct Qdisc *q;
- read_lock
_bh
(&qdisc_tree_lock);
+ read_lock(&qdisc_tree_lock);
list_for_each_entry(q, &dev->qdisc_list, list) {
if (q->handle == handle) {
list_for_each_entry(q, &dev->qdisc_list, list) {
if (q->handle == handle) {
- read_unlock
_bh
(&qdisc_tree_lock);
+ read_unlock(&qdisc_tree_lock);
return q;
}
}
return q;
}
}
- read_unlock
_bh
(&qdisc_tree_lock);
+ read_unlock(&qdisc_tree_lock);
return NULL;
}
return NULL;
}
@@
-431,7
+430,7
@@
qdisc_create(struct net_device *dev, u32 handle, struct rtattr **tca, int *errp)
}
#endif
}
#endif
- err = -E
INVAL
;
+ err = -E
NOENT
;
if (ops == NULL)
goto err_out;
if (ops == NULL)
goto err_out;
@@
-838,7
+837,7
@@
static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
continue;
if (idx > s_idx)
s_q_idx = 0;
continue;
if (idx > s_idx)
s_q_idx = 0;
- read_lock
_bh
(&qdisc_tree_lock);
+ read_lock(&qdisc_tree_lock);
q_idx = 0;
list_for_each_entry(q, &dev->qdisc_list, list) {
if (q_idx < s_q_idx) {
q_idx = 0;
list_for_each_entry(q, &dev->qdisc_list, list) {
if (q_idx < s_q_idx) {
@@
-847,12
+846,12
@@
static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb)
}
if (tc_fill_qdisc(skb, q, q->parent, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWQDISC) <= 0) {
}
if (tc_fill_qdisc(skb, q, q->parent, NETLINK_CB(cb->skb).pid,
cb->nlh->nlmsg_seq, NLM_F_MULTI, RTM_NEWQDISC) <= 0) {
- read_unlock
_bh
(&qdisc_tree_lock);
+ read_unlock(&qdisc_tree_lock);
goto done;
}
q_idx++;
}
goto done;
}
q_idx++;
}
- read_unlock
_bh
(&qdisc_tree_lock);
+ read_unlock(&qdisc_tree_lock);
}
done:
}
done:
@@
-1075,7
+1074,7
@@
static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)
s_t = cb->args[0];
t = 0;
s_t = cb->args[0];
t = 0;
- read_lock
_bh
(&qdisc_tree_lock);
+ read_lock(&qdisc_tree_lock);
list_for_each_entry(q, &dev->qdisc_list, list) {
if (t < s_t || !q->ops->cl_ops ||
(tcm->tcm_parent &&
list_for_each_entry(q, &dev->qdisc_list, list) {
if (t < s_t || !q->ops->cl_ops ||
(tcm->tcm_parent &&
@@
-1097,7
+1096,7
@@
static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb)
break;
t++;
}
break;
t++;
}
- read_unlock
_bh
(&qdisc_tree_lock);
+ read_unlock(&qdisc_tree_lock);
cb->args[0] = t;
cb->args[0] = t;