matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in fix for loss of MQ 

Fix up conflict with earlier attempt at resolving build
issues with MQ
This commit is contained in:
Stephen Hemminger 2008-09-17 21:51:40 -07:00
parent 19ecc16d72 f0b34d2d98
commit dbef36b6f1
6 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/linux/pkt_sched.h
View File

@ -123,16 +123,6 @@ struct tc_prio_qopt
__u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */ __u8 priomap[TC_PRIO_MAX+1]; /* Map: logical priority -> PRIO band */
}; };
/* Obsolete option from original multiqueue */
enum
{
TCA_PRIO_UNSPEC,
TCA_PRIO_MQ,
__TCA_PRIO_MAX
};
#define TCA_PRIO_MAX (__TCA_PRIO_MAX - 1)
/* TBF section */ /* TBF section */
struct tc_tbf_qopt struct tc_tbf_qopt

10
ip/ipaddress.c
View File

@ -697,10 +697,12 @@ static int ipaddr_list_or_flush(int argc, char **argv, int flush)
exit(1); exit(1);
} }
if (filter.flushed == 0) { if (filter.flushed == 0) {
if (round == 0) { if (show_stats) {
fprintf(stderr, "Nothing to flush.\n"); if (round == 0)
} else if (show_stats) printf("Nothing to flush.\n");
printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":""); else
printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":"");
}
fflush(stdout); fflush(stdout);
return 0; return 0;
} }

10
ip/ipneigh.c
View File

@ -402,10 +402,12 @@ int do_show_or_flush(int argc, char **argv, int flush)
exit(1); exit(1);
} }
if (filter.flushed == 0) { if (filter.flushed == 0) {
if (round == 0) { if (show_stats) {
fprintf(stderr, "Nothing to flush.\n"); if (round == 0)
} else if (show_stats) printf("Nothing to flush.\n");
printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":""); else
printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":"");
}
fflush(stdout); fflush(stdout);
return 0; return 0;
} }

11
ip/iproute.c
View File

@ -1209,11 +1209,12 @@ static int iproute_list_or_flush(int argc, char **argv, int flush)
exit(1); exit(1);
} }
if (filter.flushed == 0) { if (filter.flushed == 0) {
if (round == 0) { if (show_stats) {
if (!filter.cloned || do_ipv6 == AF_INET6) if (round == 0 && (!filter.cloned || do_ipv6 == AF_INET6))
fprintf(stderr, "Nothing to flush.\n"); printf("Nothing to flush.\n");
} else if (show_stats) else
printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":""); printf("*** Flush is complete after %d round%s ***\n", round, round>1?"s":"");
}
fflush(stdout); fflush(stdout);
return 0; return 0;
} }

2
lib/utils.c
View File

@ -284,7 +284,7 @@ int get_addr_1(inet_prefix *addr, const char *name, int family)
addr->family = AF_INET; addr->family = AF_INET;
if (family != AF_UNSPEC && family != AF_INET) if (family != AF_UNSPEC && family != AF_INET)
return -1; return -1;
if (inet_pton(AF_INET, name, addr->data) <= 0) if (inet_aton(name, addr->data) <= 0)
return -1; return -1;
addr->bytelen = 4; addr->bytelen = 4;
addr->bitlen = -1; addr->bitlen = -1;

12
tc/tc_util.h
View File

@ -7,6 +7,18 @@
#include <linux/gen_stats.h> #include <linux/gen_stats.h>
#include "tc_core.h" #include "tc_core.h"
/* This is the deprecated multiqueue interface */
#ifndef TCA_PRIO_MAX
enum
{
TCA_PRIO_UNSPEC,
TCA_PRIO_MQ,
__TCA_PRIO_MAX
};
#define TCA_PRIO_MAX (__TCA_PRIO_MAX - 1)
#endif
struct qdisc_util struct qdisc_util
{ {
struct qdisc_util *next; struct qdisc_util *next;