projects
/
cascardo
/
ovs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79e745c
)
netdev-linux: Remove dead assignments.
author
Ethan Jackson
<ethan@nicira.com>
Tue, 29 Mar 2011 19:25:17 +0000
(12:25 -0700)
committer
Ethan Jackson
<ethan@nicira.com>
Thu, 31 Mar 2011 23:40:36 +0000
(16:40 -0700)
lib/netdev-linux.c
patch
|
blob
|
history
diff --git
a/lib/netdev-linux.c
b/lib/netdev-linux.c
index
02d8a4d
..
35b5dea
100644
(file)
--- a/
lib/netdev-linux.c
+++ b/
lib/netdev-linux.c
@@
-2301,7
+2301,7
@@
htb_get__(const struct netdev *netdev)
return CONTAINER_OF(netdev_dev->tc, struct htb, tc);
}
return CONTAINER_OF(netdev_dev->tc, struct htb, tc);
}
-static
struct htb *
+static
void
htb_install__(struct netdev *netdev, uint64_t max_rate)
{
struct netdev_dev_linux *netdev_dev =
htb_install__(struct netdev *netdev, uint64_t max_rate)
{
struct netdev_dev_linux *netdev_dev =
@@
-2313,8
+2313,6
@@
htb_install__(struct netdev *netdev, uint64_t max_rate)
htb->max_rate = max_rate;
netdev_dev->tc = &htb->tc;
htb->max_rate = max_rate;
netdev_dev->tc = &htb->tc;
-
- return htb;
}
/* Create an HTB qdisc.
}
/* Create an HTB qdisc.
@@
-2600,12
+2598,11
@@
htb_tc_load(struct netdev *netdev, struct ofpbuf *nlmsg OVS_UNUSED)
struct ofpbuf msg;
struct nl_dump dump;
struct htb_class hc;
struct ofpbuf msg;
struct nl_dump dump;
struct htb_class hc;
- struct htb *htb;
/* Get qdisc options. */
hc.max_rate = 0;
htb_query_class__(netdev, tc_make_handle(1, 0xfffe), 0, &hc, NULL);
/* Get qdisc options. */
hc.max_rate = 0;
htb_query_class__(netdev, tc_make_handle(1, 0xfffe), 0, &hc, NULL);
- htb
= htb
_install__(netdev, hc.max_rate);
+ htb_install__(netdev, hc.max_rate);
/* Get queues. */
if (!start_queue_dump(netdev, &dump)) {
/* Get queues. */
if (!start_queue_dump(netdev, &dump)) {
@@
-2789,7
+2786,7
@@
hfsc_class_cast__(const struct tc_queue *queue)
return CONTAINER_OF(queue, struct hfsc_class, tc_queue);
}
return CONTAINER_OF(queue, struct hfsc_class, tc_queue);
}
-static
struct hfsc *
+static
void
hfsc_install__(struct netdev *netdev, uint32_t max_rate)
{
struct netdev_dev_linux * netdev_dev;
hfsc_install__(struct netdev *netdev, uint32_t max_rate)
{
struct netdev_dev_linux * netdev_dev;
@@
-2800,8
+2797,6
@@
hfsc_install__(struct netdev *netdev, uint32_t max_rate)
tc_init(&hfsc->tc, &tc_ops_hfsc);
hfsc->max_rate = max_rate;
netdev_dev->tc = &hfsc->tc;
tc_init(&hfsc->tc, &tc_ops_hfsc);
hfsc->max_rate = max_rate;
netdev_dev->tc = &hfsc->tc;
-
- return hfsc;
}
static void
}
static void
@@
-3100,13
+3095,12
@@
static int
hfsc_tc_load(struct netdev *netdev, struct ofpbuf *nlmsg OVS_UNUSED)
{
struct ofpbuf msg;
hfsc_tc_load(struct netdev *netdev, struct ofpbuf *nlmsg OVS_UNUSED)
{
struct ofpbuf msg;
- struct hfsc *hfsc;
struct nl_dump dump;
struct hfsc_class hc;
hc.max_rate = 0;
hfsc_query_class__(netdev, tc_make_handle(1, 0xfffe), 0, &hc, NULL);
struct nl_dump dump;
struct hfsc_class hc;
hc.max_rate = 0;
hfsc_query_class__(netdev, tc_make_handle(1, 0xfffe), 0, &hc, NULL);
- hfsc
= hfsc
_install__(netdev, hc.max_rate);
+ hfsc_install__(netdev, hc.max_rate);
if (!start_queue_dump(netdev, &dump)) {
return ENODEV;
if (!start_queue_dump(netdev, &dump)) {
return ENODEV;