David S. Miller e7165030db
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch ...
Conflicts:
net/ipv6/exthdrs_core.c
Jesse Gross says:
====================
This series of improvements for 3.8/net-next contains four components:
* Support for modifying IPv6 headers
* Support for matching and setting skb->mark for better integration with
things like iptables
* Ability to recognize the EtherType for RARP packets
* Two small performance enhancements
The movement of ipv6_find_hdr() into exthdrs_core.c causes two small merge
conflicts. I left it as is but can do the merge if you want. The conflicts
are:
* ipv6_find_hdr() and ipv6_find_tlv() were both moved to the bottom of
exthdrs_core.c. Both should stay.
* A new use of ipv6_find_hdr() was added to net/netfilter/ipvs/ip_vs_core.c
after this patch. The IPVS user has two instances of the old constant
name IP6T_FH_F_FRAG which has been renamed to IP6_FH_F_FRAG.
====================
Signed-off-by: David S. Miller <davem@davemloft.net >
2012-11-30 12:01:30 -05:00
2012-01-05 10:51:44 -06:00
2012-11-19 19:54:38 -02:00
2012-06-25 16:44:12 -07:00
2012-06-12 15:50:24 -07:00
2012-03-07 22:52:24 -08:00
2012-09-10 15:30:41 -04:00
2012-10-26 02:22:18 -04:00
2012-11-19 23:56:59 +01:00
2012-06-17 16:29:38 -07:00
2012-11-20 15:50:37 -05:00
2011-07-06 02:52:16 -07:00
2012-08-30 03:00:18 +02:00
2012-10-21 20:37:06 -04:00
2012-08-09 16:18:06 -07:00
2011-11-30 18:51:03 -05:00
2012-08-14 21:49:42 -07:00
2011-08-08 14:26:29 -04:00
2012-11-26 12:42:59 +01:00
2012-08-30 03:00:16 +02:00
2012-06-01 14:18:29 -04:00
2012-10-26 05:07:00 -04:00
2012-08-10 16:52:54 -07:00
2012-04-15 12:44:40 -04:00
2011-10-06 15:49:51 -04:00
2012-04-05 05:08:04 -04:00
2012-04-15 12:44:40 -04:00
2012-07-05 01:12:14 -07:00
2012-04-15 12:44:40 -04:00
2011-12-01 11:41:06 -05:00
2012-07-19 10:43:03 -07:00
2012-08-22 14:21:38 -07:00
2012-06-29 01:36:36 -07:00
2011-11-29 13:17:03 -05:00
2012-10-08 17:42:36 -04:00
2011-05-12 17:46:56 -04:00
2012-09-10 15:30:41 -04:00
2012-10-01 17:01:46 -04:00
2012-04-15 12:44:40 -04:00
2012-08-20 13:53:09 +02:00
2012-05-16 15:16:56 -04:00
2011-11-14 00:19:42 -05:00
2012-05-15 20:14:35 -04:00
2012-07-16 03:44:56 -07:00
2012-07-26 15:50:39 -07:00
2012-07-19 11:02:03 -07:00
2012-08-06 13:33:21 -07:00
2012-09-27 18:12:37 -04:00
2012-09-19 17:23:28 -04:00
2012-06-19 21:22:05 -07:00
2012-09-24 16:31:37 -04:00
2011-12-14 13:34:55 -05:00
2012-07-10 22:40:14 -07:00
2012-11-15 17:36:18 -05:00
2012-11-08 21:16:08 -05:00
2012-11-16 01:47:40 -05:00
2012-08-14 14:28:32 -07:00
2012-10-04 13:58:26 -04:00
2012-10-23 09:23:40 +09:00
2012-08-26 19:13:55 +02:00
2012-11-14 18:49:50 -05:00
2012-11-12 12:31:37 -08:00
2012-05-17 18:45:20 -04:00
2011-10-31 19:32:32 -04:00
2012-04-15 12:44:40 -04:00
2012-05-15 20:14:35 -04:00
2012-09-17 13:13:24 -04:00
2012-11-26 12:43:00 +01:00
2012-06-26 21:06:11 -07:00
2012-08-09 16:18:06 -07:00
2012-08-07 16:24:55 -07:00
2012-11-18 20:30:55 -05:00
2011-05-27 13:41:33 -04:00
2012-07-05 02:21:55 -07:00
2012-09-17 18:08:54 -07:00
2012-09-10 15:30:41 -04:00
2012-09-14 09:57:43 -07:00
2011-05-17 14:16:58 -04:00
2012-04-15 12:44:40 -04:00
2012-11-15 17:39:51 -05:00
2012-05-19 01:08:16 -04:00
2012-04-16 23:53:11 -04:00
2012-07-17 12:16:39 +02:00
2012-11-03 14:45:00 -04:00
2012-11-03 14:59:04 -04:00
2012-07-20 11:06:59 -07:00
2012-08-14 21:55:28 -07:00
2012-09-24 15:52:33 -04:00
2011-10-21 05:22:42 -04:00
2012-08-06 13:40:47 -07:00
2012-10-02 13:38:27 -07:00
2012-04-10 10:04:07 -07:00
2012-11-23 14:10:31 -05:00
2012-06-09 14:56:12 -07:00
2011-08-30 17:39:01 -04:00
2012-04-28 22:21:51 -04:00
2012-03-12 17:05:21 -07:00
2012-04-15 12:44:40 -04:00
2012-05-16 15:17:08 -04:00
2012-04-15 12:44:40 -04:00
2012-11-13 09:15:07 +01:00
e7165030db