← Back to branch summary

~ubuntu-branches/ubuntu/quantal/iproute/quantal-updates

« back to all changes in this revision

Viewing changes to tc/m_skbedit.c

  • Committer: Package Import Robot
  • Author(s): Andreas Henriksson, Alexander Wirt, Andreas Henriksson
  • Date: 2011-07-04 14:23:33 UTC
  • mfrom: (1.1.13 upstream) (23.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20110704142333-je1iwihg5qsbe743
Tags: 20110629-1
http://bugs.debian.org/627312
[ Alexander Wirt ]
* Install ss to /bin instead of /sbin.

[ Andreas Henriksson ]
* Imported Upstream version 2.6.39 (aka snapshot 20110629)
  - tc filter: fix dport/sport in pretty print output (Closes: #627312)
* Finally drop the patch adding the wrr qdisc scheduler to tc
* Fix txtdocs patch to apply again
* Add patch to build against xtables version 6

Show diffs side-by-side

added added

removed removed

Lines of Context:
tc/m_skbedit.c
160
160
 
161
161
static int print_skbedit(struct action_util *au, FILE *f, struct rtattr *arg)
162
162
{
163
 
        struct tc_skbedit *sel;
164
163
        struct rtattr *tb[TCA_SKBEDIT_MAX + 1];
165
164
        SPRINT_BUF(b1);
166
165
        __u32 *priority;
177
176
                return -1;
178
177
        }
179
178
 
180
 
        sel = RTA_DATA(tb[TCA_SKBEDIT_PARMS]);
181
 
 
182
179
        fprintf(f, " skbedit");
183
180
 
184
181
        if (tb[TCA_SKBEDIT_QUEUE_MAPPING] != NULL) {