← Back to branch summary

~ubuntu-branches/ubuntu/precise/iproute/precise

« back to all changes in this revision

Viewing changes to tc/tc_util.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Wirt, Andreas Henriksson, Justin B Rye, Alexander Wirt
  • Date: 2008-05-11 11:18:29 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20080511111829-rfewew7s6kiev0bh
Tags: 20080417-1
http://bugs.debian.org/467557
http://bugs.debian.org/480173
http://bugs.debian.org/464521
[ Andreas Henriksson ]
* New upstream release, v2.6.25 a.k.a. snapshot 20080417.
  - Initial documentation for xfrm (Partially fixes #451337)
  - Fixes manpage error caught by lintian!
* Fix typos (syntax error) in ip(8) manpage.
  - Introduced by upstream, caught by lintian yet again!
* Don't ship useless headers in iproute-dev (Closes: #467557)
* Cherry-pick "Fix bad hash calculation because of signed address" from
  upstream. (Closes: #480173)

[ Justin B Rye ]
* Update package description (Closes: #464521)

[ Alexander Wirt ]
* Fix typo in short package description.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tc/tc_util.c
435
435
        return 0;
436
436
}
437
437
 
 
438
int get_linklayer(unsigned int *val, const char *arg)
 
439
{
 
440
        int res;
 
441
 
 
442
        if (matches(arg, "ethernet") == 0)
 
443
                res = LINKLAYER_ETHERNET;
 
444
        else if (matches(arg, "atm") == 0)
 
445
                res = LINKLAYER_ATM;
 
446
        else if (matches(arg, "adsl") == 0)
 
447
                res = LINKLAYER_ATM;
 
448
        else
 
449
                return -1; /* Indicate error */
 
450
 
 
451
        *val = res;
 
452
        return 0;
 
453
}
 
454
 
438
455
void print_tm(FILE * f, const struct tcf_t *tm)
439
456
{
440
457
        int hz = get_user_hz();