← Back to branch summary

~ubuntu-branches/ubuntu/trusty/iproute/trusty-proposed

« back to all changes in this revision

Viewing changes to ip/iplink_vlan.c

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Henriksson
  • Date: 2010-04-18 18:51:12 UTC
  • mfrom: (1.1.10 upstream) (3.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100418185112-mjxyjdcszu5g0lcg
Tags: 20100224-5
http://bugs.debian.org/576953
* Add patch (applied upstream): build m_xt as a tc module
* Install /usr/lib/tc/m_ipt.so symlink (to m_xt.so)
* Exclude m_ipt.so / m_xt.so from dh_shlibdeps
* Add note about tc filter action ipt needs iptables installed
  to README.Debian.
  (the above changes closes: #576953)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ip/iplink_vlan.c
27
27
                "VLANID := 0-4095\n"
28
28
                "FLAG-LIST := [ FLAG-LIST ] FLAG\n"
29
29
                "FLAG := [ reorder_hdr { on | off } ] [ gvrp { on | off } ]\n"
 
30
                "        [ loose_binding { on | off } ]\n"
30
31
                "QOS-MAP := [ QOS-MAP ] QOS-MAPPING\n"
31
32
                "QOS-MAPPING := FROM:TO\n"
32
33
        );
102
103
                                flags.flags &= ~VLAN_FLAG_GVRP;
103
104
                        else
104
105
                                return on_off("gvrp");
 
106
                } else if (matches(*argv, "loose_binding") == 0) {
 
107
                        NEXT_ARG();
 
108
                        flags.mask |= VLAN_FLAG_LOOSE_BINDING;
 
109
                        if (strcmp(*argv, "on") == 0)
 
110
                                flags.flags |= VLAN_FLAG_LOOSE_BINDING;
 
111
                        else if (strcmp(*argv, "off") == 0)
 
112
                                flags.flags &= ~VLAN_FLAG_LOOSE_BINDING;
 
113
                        else
 
114
                                return on_off("loose_binding");
105
115
                } else if (matches(*argv, "ingress-qos-map") == 0) {
106
116
                        NEXT_ARG();
107
117
                        if (vlan_parse_qos_map(&argc, &argv, n,
156
166
                }
157
167
        _PF(REORDER_HDR);
158
168
        _PF(GVRP);
 
169
        _PF(LOOSE_BINDING);
159
170
#undef _PF
160
171
        if (flags)
161
172
                fprintf(fp, "%x", flags);