diff options
Diffstat (limited to 'net/sched/sch_ingress.c')
-rw-r--r-- | net/sched/sch_ingress.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/sched/sch_ingress.c b/net/sched/sch_ingress.c index 72525710b66f..f6decbb56645 100644 --- a/net/sched/sch_ingress.c +++ b/net/sched/sch_ingress.c | |||
@@ -57,7 +57,7 @@ static void ingress_put(struct Qdisc *sch, unsigned long cl) | |||
57 | } | 57 | } |
58 | 58 | ||
59 | static int ingress_change(struct Qdisc *sch, u32 classid, u32 parent, | 59 | static int ingress_change(struct Qdisc *sch, u32 classid, u32 parent, |
60 | struct rtattr **tca, unsigned long *arg) | 60 | struct nlattr **tca, unsigned long *arg) |
61 | { | 61 | { |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
@@ -156,7 +156,7 @@ static struct nf_hook_ops ing_ops[] __read_mostly = { | |||
156 | }; | 156 | }; |
157 | #endif | 157 | #endif |
158 | 158 | ||
159 | static int ingress_init(struct Qdisc *sch, struct rtattr *opt) | 159 | static int ingress_init(struct Qdisc *sch, struct nlattr *opt) |
160 | { | 160 | { |
161 | #if !defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NETFILTER) | 161 | #if !defined(CONFIG_NET_CLS_ACT) && defined(CONFIG_NETFILTER) |
162 | printk("Ingress scheduler: Classifier actions prefered over netfilter\n"); | 162 | printk("Ingress scheduler: Classifier actions prefered over netfilter\n"); |
@@ -184,14 +184,14 @@ static void ingress_destroy(struct Qdisc *sch) | |||
184 | static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb) | 184 | static int ingress_dump(struct Qdisc *sch, struct sk_buff *skb) |
185 | { | 185 | { |
186 | unsigned char *b = skb_tail_pointer(skb); | 186 | unsigned char *b = skb_tail_pointer(skb); |
187 | struct rtattr *rta; | 187 | struct nlattr *nla; |
188 | 188 | ||
189 | rta = (struct rtattr *)b; | 189 | nla = (struct nlattr *)b; |
190 | RTA_PUT(skb, TCA_OPTIONS, 0, NULL); | 190 | NLA_PUT(skb, TCA_OPTIONS, 0, NULL); |
191 | rta->rta_len = skb_tail_pointer(skb) - b; | 191 | nla->nla_len = skb_tail_pointer(skb) - b; |
192 | return skb->len; | 192 | return skb->len; |
193 | 193 | ||
194 | rtattr_failure: | 194 | nla_put_failure: |
195 | nlmsg_trim(skb, b); | 195 | nlmsg_trim(skb, b); |
196 | return -1; | 196 | return -1; |
197 | } | 197 | } |