← Back to branch summary

~ubuntu-branches/ubuntu/raring/iproute/raring-proposed

« back to all changes in this revision

Viewing changes to include/linux/if_vlan.h

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-05-22 14:10:07 UTC
  • mfrom: (1.1.15) (23.1.9 sid)
  • Revision ID: package-import@ubuntu.com-20120522141007-uuwicj2cx2x71vfb
Tags: 20120319-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Mark iproute as Multi-Arch: foreign.
  - Add cross-building support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/if_vlan.h
54
54
                unsigned int skb_priority;
55
55
                unsigned int name_type;
56
56
                unsigned int bind_type;
57
 
                unsigned int flag; /* Matches vlan_dev_info flags */
 
57
                unsigned int flag; /* Matches vlan_dev_priv flags */
58
58
        } u;
59
59
 
60
60
        short vlan_qos;