← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/net-tools/oneiric

« back to all changes in this revision

Viewing changes to lib/interface.c

  • Committer: Bazaar Package Importer
  • Author(s): Scott James Remnant
  • Date: 2008-11-11 17:04:09 UTC
  • Revision ID: james.westby@ubuntu.com-20081111170409-v5djvvkgnm3ad1ko
Tags: 1.60-21ubuntu1
https://launchpad.net/bugs/240073
https://launchpad.net/bugs/66209
* Merge from debian unstable, remaining changes:
  - Ubuntu Policy: output using standard SI unit multiples:
    KB (10^3), MB (10^6), GB (10^9), TB (10^12) and PB (10^15).
    Includes manpage update to remove comment about IEC units.
    LP: #240073.
  - lib/ec_hw.c: #include <stddef.h to get definition of NULL.
  - lib/fddi.c: #include <linux/types.h> to get types.  LP: #66209.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/interface.c
718
718
    /* FIXME: should be integrated into interface.c.   */
719
719
 
720
720
    if ((f = fopen(_PATH_PROCNET_IFINET6, "r")) != NULL) {
721
 
        while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %02x %02x %02x %02x %20s\n",
 
721
        while (fscanf(f, "%4s%4s%4s%4s%4s%4s%4s%4s %08x %02x %02x %02x %20s\n",
722
722
                      addr6p[0], addr6p[1], addr6p[2], addr6p[3],
723
723
                      addr6p[4], addr6p[5], addr6p[6], addr6p[7],
724
724
                  &if_idx, &plen, &scope, &dad_status, devname) != EOF) {