Commit Graph

170 Commits

Author SHA1 Message Date
Jamal Hadi Salim 63c7d26f94 Breakage noticed when debian upgraded to xtables (iptables > 1.4.1)
Many thanks to Yevgeny Kosarzhevsky <yevg@pisem.net> for reporting
and a lot of testing

Thanks to Jan Engelhardt <jengelh@medozas.de> for a lot of advice
Thanks to Denys Fedoryschenko <denys@visp.net.lb> for some sample
code that he tried and thanks to Andreas Henriksson <andreas@fatal.se>
(who maintains iproute2 on debian) for the persistent followup.

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
2009-02-19 09:02:13 -08:00
Patrick McHardy c86f34942a iproute: add DRR support
add DRR support

This patch adds support for the DRR scheduler I just sent
to iproute.

Signed-off-by: Patrick McHardy <kaber@trash.net>
2009-01-27 16:11:39 -08:00
Stephen Hemminger a69293245f Update snapshot 2009-01-15 12:25:04 -08:00
Alexander Duyck f72a7aab0c add support for skbedit action
Provides ability to edit queue_mapping field
	Provides ability to edit priority field

usage: action skbedit [queue_mapping QUEUE_MAPPING] [priority PRIORITY]
	at least one option must be select, or both at the same time

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
2009-01-06 19:27:03 -08:00
Olivier Fourdan 7f71c0cae2 ip maddr show” on an infiniband address causes a stack corruption
“ip maddr show” on an infiniband address causes a stack corruption
because the length of the address for Infiniband (20 bytes, as
described in kernel doc Documentation/infiniband/ipoib.txt) does not
fit on the 16 bytes of the field in which it gets stored.

The proposed patch increases the size of the hardware address from 4
__u32 to 8 and also adds a check to avoid overriding the available
size while parsing the hardware address.

This bug affects current upstream code AFAICT.

Hope this helps,
Cheers,
Olivier.

“ip maddr show ib0” causes a stack corruption because the length of the address
for Infiniband (20 see kernel doc Documentation/infiniband/ipoib.txt) does not
fit on the 16 bytes of the field in which it gets stored.

The proposed patch increases the size of the hardware address from 4 u32 to 8
and adds a check to avoid overriding the available size while parsing the
hardware address.
2009-01-06 18:56:03 -08:00
Stephen Hemminger 05bfd16595 Update headers to 2.6.28
Put in sanitized 2.6.28 headers
2009-01-06 15:03:26 -08:00
Stephen Hemminger 5a67f8f9d3 Update to 2.6.27 API
The one issue was the old multiqueue API, so that is handled
by tc_util.h
2008-09-15 12:05:11 -07:00
Stephen Hemminger 6420b62ec9 Update snapshot 2008-07-25 13:46:07 -07:00
Stephen Hemminger 01eb17a66d Update headers to 2.6.26
Copy santized version of headers from 2.6.26 final version.
2008-07-15 11:03:24 -07:00
Stephen Hemminger 3ea2fb985f Update to 2.6.26-rc6 headers
Copy sanitized headers from 2.6.26-rc6
2008-06-20 11:26:38 -07:00
Stephen Hemminger 727d468e54 Update version
Release new snapshot for 2.6.25
2008-04-17 10:12:54 -07:00
Jesper Dangaard Brouer 292f29b42c ATM cell alignment.
Introducing the function that does the ATM cell alignment, and
modifying tc_calc_rtable() to use this based upon a linklayer
parameter.

Modified from original to use constants from atm.h and
fix all the usages of rtable in same patch.

Signed-off-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
2008-04-17 10:04:31 -07:00
Stephen Hemminger 5344bb287c Update kernel headers to 2.6.25-rc7
Copy sanitized kernel headers from 2.6.25-rc7 to ensure proper
compatiability.
2008-04-01 11:37:35 -07:00
Stephen Hemminger ace7be7d3b add include/linux/hdlc/ioctl.h
Need to add include/linux/hdlc/ioctl.h because it is not present
in older releases.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-02-13 12:32:49 -08:00
Stephen Hemminger 10bd7e8460 add support for matching AOE and CAN ether types
Update the protocol table to match current kernel support.
Why is the list not in an /etc file?
2008-02-07 19:24:31 -08:00
Stephen Hemminger e7305a84c6 reharmonize headers with pre-freeze 2.6.25
Some minor header file changes headed for 2.6.25
2008-02-07 19:22:42 -08:00
Patrick McHardy 66862d3cc7 cls_flow: add vlan-tag support
commit 94e9cba778cb97d77d9146dc3bd38ff195bc2c8a
Author: Patrick McHardy <kaber@trash.net>
Date:   Sat Feb 2 18:22:16 2008 +0100

    [IPROUTE]: cls_flow: add vlan-tag support

    Signed-off-by: Patrick McHardy <kaber@trash.net>

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-02-05 08:36:59 -08:00
Stephen Hemminger efc0ea56c8 harmonize headers with upcoming 2.6.25
Add stuff from early 2.6.25 merge.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 22:41:18 -08:00
Patrick McHardy 9932abb498 Add flow classifier support
[IPROUTE]: Add flow classifier support

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 22:28:11 -08:00
Patrick McHardy 5626a24a8b Add support for SFQ xstats
[IPROUTE]: Add support for SFQ xstats

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 22:28:10 -08:00
Stephen Hemminger f31a37f79d fix problem caused by rtnl_send checks
Some usages of rtnl_send could cause errors (ie flush requests)
others do a listen afterwards.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-31 21:38:58 -08:00
Stephen Hemminger 8055063afe Merge branch 'net-2.6.25' 2008-01-25 14:27:19 -08:00
Stephen Hemminger fb8cc5b268 update headers to current net-2.6.25
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-24 13:14:28 -08:00
Stephen Hemminger 6f313868ae release v2.6.24-080108
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2008-01-08 08:59:32 -08:00
Stephen Hemminger a849d4c868 Merge branch 'master' into net-2.6.25 2007-12-31 12:56:31 -08:00
Stephen Hemminger 76e5d2c392 add include/netinet/tcp.h
ss.c needs lastest version of netinet/tcp.h which probably isn't
on most distro's yet.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 12:56:08 -08:00
Stephen Hemminger bfe594fe31 Update header files from net-2.6.25
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 12:54:18 -08:00
Stephen Hemminger 4c7abb271b Merge branch 'master' into net-2.6.25 2007-12-31 12:51:15 -08:00
Stephen Hemminger 77aa4d03a7 Use netinet/tcp.h (with correction) rather than kernel headers
Fix the userspace header file rather than importing more
kernel headers.

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:41:18 -08:00
Stephen Hemminger 2188a84d1c snapshot 31 Dec 2007
Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:30:40 -08:00
Stephen Hemminger 6b1ac654e9 add decode of match rules
Show ip address etc when decoding output of tc filter show

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
2007-12-31 10:29:52 -08:00
Stephen Hemminger 118c923cc0 veth.h move to linux/
Move veth.h to linux/ since it is an API.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-25 12:38:08 -08:00
Stephen Hemminger 235ac6a41d snapshot target
Add Makefile target to create snapshot file.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:53:45 -08:00
Stephen Hemminger c595fda55b veth: use kernel header file
Use santized kernel header for veth.h and put in correct place
to prevent possible future problems with API.

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:37:30 -08:00
Pavel Emelyanov 909dfe2c7e iplink_parse() routine
This routine parses CLI attributes, describing generic link
parameters such as name, address, etc.

This is mostly copy-pasted from iplink_modify().

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-21 09:23:40 -08:00
Templin, Fred L 0bd17929bc iproute2-2.6.23: RFC4214 Support (v2.5)
This patch includes support for the Intra-Site Automatic Tunnel
Addressing Protocol (ISATAP) per RFC4214.

The following diffs are specific to the iproute2-2.6.23
software distribution. This message includes the full and
patchable diff text; please use this version to apply patches.

Signed-off-by: Fred L. Templin <fred.l.templin@boeing.com>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 10:12:49 -08:00
Stephen Hemminger e50e9f9123 Merge branch 'master' into net-2.6.25 2007-12-11 10:04:33 -08:00
Herbert Xu ec30dcce71 Add NAT action
Here's a patch to add support for the nat action which is now
in the kernel.

Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-11 09:35:07 -08:00
Stephen Hemminger be8d89d3bf Fix breakage from netfilter/ip_tables header change.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-10 09:45:39 -08:00
Stephen Hemminger 70e6e38aad Merge header file changes from net-2.6.25
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-12-10 09:36:07 -08:00
Stephen Hemminger 5472ac6f9f 2.6.24-rc3 headers
Resync santized headers with 2.6.24-rc3

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-11-29 13:56:15 -08:00
Andreas Henriksson d21e88354b Fix corruption when using batch files with comments and broken lines.
The problem was that length of allocation changed but caller not told.

Anyway, the patch fixes a problem resulting in a double free
that occurs when using batch files that contains a special combination
of broken up lines and comments as reported in:
http://bugs.debian.org/398912

Thanks to Michal Pokrywka <mpokrywka@hoga.pl> for testcase and information
on which conditions problem could be reproduced under.

Signed-off-by: Andreas Henriksson <andreas@fatal.se>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-10-17 10:02:33 -07:00
Stephen Hemminger efc0501501 Update snapshot for release
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-10-16 14:26:51 -07:00
Rick Jones 54e0b2e71d rto support for ip command
Enable users of ip to specify the times for rtt, rttvar and rto_min
in human-friendly terms a la "tc" while maintaining backwards
compatability with the previous "raw" mechanism.  Builds upon
David Miller's uncommited patch to set rto_min.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-10-11 13:04:11 -07:00
Stephen Hemminger dfd26e1c4c Update kernel headers to 2.6.23-rc5
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-09-05 13:05:21 +01:00
Patrick McHardy 5c302d518f vlan support
This is a resend of the iproute VLAN patch with the if_link.h changes
edited out since the headers are already synced.

[IPROUTE]: VLAN support

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-09-05 12:03:46 +01:00
Stephen Hemminger a6ffa8b00d sanitized headers update to 2.6.23-rc3
Update headers

Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
2007-08-22 10:19:53 -07:00
PJ Waskiewicz 292ce96bca iproute2: sch_rr support in tc
This patch applies on top of Patrick McHardy's RTNETLINK
patches to add nested compat attributes.  This is needed to maintain
ABI for sch_{rr|prio} in the kernel with respect to tc.  A new option,
namely multiqueue, was added to sch_prio and sch_rr.  This will allow
a user to turn multiqueue support on for sch_prio or sch_rr at loadtime.
Also, tc qdisc ls will display whether or not multiqueue is enabled on
that qdisc.  When in multiqueue mode, a user can specify a value of 0 for
bands, and the number of bands will be created to match the number of
queues on the device.

This patch is to support the new sch_rr (round-robin) qdisc being proposed
in NET for multiqueue network device support in the Linux network stack.
It uses q_prio.c as the template, since the qdiscs are nearly identical,
outside of the ->dequeue() routine.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
2007-08-22 10:04:25 -07:00
Patrick McHardy 2f90c9c0bb IPROUTE2: RTNETLINK nested attributes
This adds capability for iproute2 to send nested attributes to the
kernel, while maintaining backwards compatibility.

Signed-off-by: Patrick McHardy <kaber@trash.net>
2007-08-22 10:04:20 -07:00
Johannes Berg 80c05b0976 show multicast groups
Update the included version of the genetlink.h header to the multicast
group API and make the generic netlink controller part show multicast
groups where applicable. Also fix two typos.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
2007-08-22 10:03:28 -07:00