diff options
Diffstat (limited to 'net/sched/sch_api.c')
-rw-r--r-- | net/sched/sch_api.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 65825f4409d9..4158127bc202 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c | |||
@@ -389,7 +389,7 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, | |||
389 | struct Qdisc *q = *old; | 389 | struct Qdisc *q = *old; |
390 | 390 | ||
391 | 391 | ||
392 | if (parent == NULL) { | 392 | if (parent == NULL) { |
393 | if (q && q->flags&TCQ_F_INGRESS) { | 393 | if (q && q->flags&TCQ_F_INGRESS) { |
394 | *old = dev_graft_qdisc(dev, q); | 394 | *old = dev_graft_qdisc(dev, q); |
395 | } else { | 395 | } else { |
@@ -596,7 +596,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
596 | q = qdisc_leaf(p, clid); | 596 | q = qdisc_leaf(p, clid); |
597 | } else { /* ingress */ | 597 | } else { /* ingress */ |
598 | q = dev->qdisc_ingress; | 598 | q = dev->qdisc_ingress; |
599 | } | 599 | } |
600 | } else { | 600 | } else { |
601 | q = dev->qdisc_sleeping; | 601 | q = dev->qdisc_sleeping; |
602 | } | 602 | } |
@@ -743,7 +743,7 @@ create_n_graft: | |||
743 | return -ENOENT; | 743 | return -ENOENT; |
744 | if (clid == TC_H_INGRESS) | 744 | if (clid == TC_H_INGRESS) |
745 | q = qdisc_create(dev, tcm->tcm_parent, tca, &err); | 745 | q = qdisc_create(dev, tcm->tcm_parent, tca, &err); |
746 | else | 746 | else |
747 | q = qdisc_create(dev, tcm->tcm_handle, tca, &err); | 747 | q = qdisc_create(dev, tcm->tcm_handle, tca, &err); |
748 | if (q == NULL) { | 748 | if (q == NULL) { |
749 | if (err == -EAGAIN) | 749 | if (err == -EAGAIN) |
@@ -808,10 +808,10 @@ static int tc_fill_qdisc(struct sk_buff *skb, struct Qdisc *q, u32 clid, | |||
808 | #endif | 808 | #endif |
809 | gnet_stats_copy_queue(&d, &q->qstats) < 0) | 809 | gnet_stats_copy_queue(&d, &q->qstats) < 0) |
810 | goto rtattr_failure; | 810 | goto rtattr_failure; |
811 | 811 | ||
812 | if (gnet_stats_finish_copy(&d) < 0) | 812 | if (gnet_stats_finish_copy(&d) < 0) |
813 | goto rtattr_failure; | 813 | goto rtattr_failure; |
814 | 814 | ||
815 | nlh->nlmsg_len = skb->tail - b; | 815 | nlh->nlmsg_len = skb->tail - b; |
816 | return skb->len; | 816 | return skb->len; |
817 | 817 | ||
@@ -954,7 +954,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
954 | } | 954 | } |
955 | 955 | ||
956 | /* OK. Locate qdisc */ | 956 | /* OK. Locate qdisc */ |
957 | if ((q = qdisc_lookup(dev, qid)) == NULL) | 957 | if ((q = qdisc_lookup(dev, qid)) == NULL) |
958 | return -ENOENT; | 958 | return -ENOENT; |
959 | 959 | ||
960 | /* An check that it supports classes */ | 960 | /* An check that it supports classes */ |
@@ -978,7 +978,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, void *arg) | |||
978 | goto out; | 978 | goto out; |
979 | } else { | 979 | } else { |
980 | switch (n->nlmsg_type) { | 980 | switch (n->nlmsg_type) { |
981 | case RTM_NEWTCLASS: | 981 | case RTM_NEWTCLASS: |
982 | err = -EEXIST; | 982 | err = -EEXIST; |
983 | if (n->nlmsg_flags&NLM_F_EXCL) | 983 | if (n->nlmsg_flags&NLM_F_EXCL) |
984 | goto out; | 984 | goto out; |
@@ -1162,7 +1162,7 @@ reclassify: | |||
1162 | skb->tc_verd = SET_TC_VERD(skb->tc_verd,verd); | 1162 | skb->tc_verd = SET_TC_VERD(skb->tc_verd,verd); |
1163 | goto reclassify; | 1163 | goto reclassify; |
1164 | } else { | 1164 | } else { |
1165 | if (skb->tc_verd) | 1165 | if (skb->tc_verd) |
1166 | skb->tc_verd = SET_TC_VERD(skb->tc_verd,0); | 1166 | skb->tc_verd = SET_TC_VERD(skb->tc_verd,0); |
1167 | return err; | 1167 | return err; |
1168 | } | 1168 | } |
@@ -1194,13 +1194,13 @@ static int psched_open(struct inode *inode, struct file *file) | |||
1194 | return single_open(file, psched_show, PDE(inode)->data); | 1194 | return single_open(file, psched_show, PDE(inode)->data); |
1195 | } | 1195 | } |
1196 | 1196 | ||
1197 | static struct file_operations psched_fops = { | 1197 | static const struct file_operations psched_fops = { |
1198 | .owner = THIS_MODULE, | 1198 | .owner = THIS_MODULE, |
1199 | .open = psched_open, | 1199 | .open = psched_open, |
1200 | .read = seq_read, | 1200 | .read = seq_read, |
1201 | .llseek = seq_lseek, | 1201 | .llseek = seq_lseek, |
1202 | .release = single_release, | 1202 | .release = single_release, |
1203 | }; | 1203 | }; |
1204 | #endif | 1204 | #endif |
1205 | 1205 | ||
1206 | #ifdef CONFIG_NET_SCH_CLK_CPU | 1206 | #ifdef CONFIG_NET_SCH_CLK_CPU |