diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-25 17:19:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-25 17:19:11 -0700 |
| commit | 86df4d2e234dd80cd9e31daeaf1198b38e8382c5 (patch) | |
| tree | c29005492c635e72d8d93f611c4f18c57dcc0a9c /include | |
| parent | 7d8697afae5c61a9495fff54a1c5d053dea4505f (diff) | |
| parent | 3cd904ecbb5d0bcf36dfca7e726bdfd6d3644334 (diff) | |
Merge branch 'net_sched-clean-up-tc-classes-and-u32-filter'
Cong Wang says:
====================
net_sched: clean up tc classes and u32 filter
Patch 1 and patch 2 prepare for patch 3. Major changes
are in patch 3 and patch 4, details are there too.
v2: Add patch 1 and 2, group all into a patchset
Fix a coding style issue in patch 4
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/sch_generic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 1688f0f6c7ba..c30b634c5f82 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -75,7 +75,6 @@ struct Qdisc { struct hlist_node hash; u32 handle; u32 parent; - void *u32_node; struct netdev_queue *dev_queue; @@ -147,8 +146,7 @@ struct Qdisc_class_ops { void (*qlen_notify)(struct Qdisc *, unsigned long); /* Class manipulation routines */ - unsigned long (*get)(struct Qdisc *, u32 classid); - void (*put)(struct Qdisc *, unsigned long); + unsigned long (*find)(struct Qdisc *, u32 classid); int (*change)(struct Qdisc *, u32, u32, struct nlattr **, unsigned long *); int (*delete)(struct Qdisc *, unsigned long); |