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
..
9p
bluetooth	Bluetooth: Increase HCI command tx timeout	2012-11-19 19:54:38 -02:00
caif
irda
iucv
netfilter	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
netns	sctp: Make hmac algorithm selection for cookie generation dynamic	2012-10-26 02:22:18 -04:00
nfc	NFC: Export nfc_hci_sak_to_protocol()	2012-11-19 23:56:59 +01:00
phonet
sctp	sctp: send abort chunk when max_retrans exceeded	2012-11-20 15:50:37 -05:00
tc_act
act_api.h
addrconf.h	netfilter: ip6tables: add MASQUERADE target	2012-08-30 03:00:18 +02:00
af_ieee802154.h
af_rxrpc.h
af_unix.h	unix: Remove unused field from unix_sock	2012-10-21 20:37:06 -04:00
ah.h
arp.h	net: Dont use ifindices in hash fns	2012-08-09 16:18:06 -07:00
atmclip.h
ax25.h	userns: Convert net/ax25 to use kuid_t where appropriate	2012-08-14 21:49:42 -07:00
ax88796.h
cfg80211-wext.h
cfg80211.h	nl80211/cfg80211: add VHT MCS support	2012-11-26 12:42:59 +01:00
checksum.h	net: core: add function for incremental IPv6 pseudo header checksum updates	2012-08-30 03:00:16 +02:00
cipso_ipv4.h
cls_cgroup.h	net: Update args to dummy sock_update_classid().	2012-10-26 05:07:00 -04:00
codel.h	codel: refine one condition to avoid a nul rec_inv_sqrt	2012-08-10 16:52:54 -07:00
compat.h
datalink.h
dcbevent.h
dcbnl.h
dn_dev.h
dn_fib.h
dn_neigh.h
dn_nsp.h
dn_route.h
dn.h
dsa.h
dsfield.h
dst_ops.h	net: Fix warnings in dst_ops.h	2012-07-19 10:43:03 -07:00
dst.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-08-22 14:21:38 -07:00
esp.h
ethoc.h
fib_rules.h
flow_keys.h
flow.h	ipv4: Add FLOWI_FLAG_KNOWN_NH	2012-10-08 17:42:36 -04:00
garp.h
gen_stats.h
genetlink.h	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
gre.h
gro_cells.h	net: add gro_cells infrastructure	2012-10-01 17:01:46 -04:00
icmp.h
ieee80211_radiotap.h	wireless: add radiotap A-MPDU status field	2012-08-20 13:53:09 +02:00
ieee802154_netdev.h
ieee802154.h
if_inet6.h
inet6_connection_sock.h	ipv6: Add helper inet6_csk_update_pmtu().	2012-07-16 03:44:56 -07:00
inet6_hashtables.h	ipv6: Early TCP socket demux	2012-07-26 15:50:39 -07:00
inet_common.h	net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)	2012-07-19 11:02:03 -07:00
inet_connection_sock.h	net: ipv6: fix TCP early demux	2012-08-06 13:33:21 -07:00
inet_ecn.h	tunnel: drop packet if ECN present with not-ECT	2012-09-27 18:12:37 -04:00
inet_frag.h	ipv6: unify fragment thresh handling code	2012-09-19 17:23:28 -04:00
inet_hashtables.h
inet_sock.h	net: use a per task frag allocator	2012-09-24 16:31:37 -04:00
inet_timewait_sock.h
inetpeer.h
ip6_checksum.h	ipv6: Separate tcp offload functionality	2012-11-15 17:36:18 -05:00
ip6_fib.h	ipv6: remove rt6i_peer_genid from rt6_info and its handler	2012-11-08 21:16:08 -05:00
ip6_route.h	ipv6: export IP6_RT_PRIO_* to userland	2012-11-16 01:47:40 -05:00
ip6_tunnel.h	gre: Support GRE over IPv6	2012-08-14 14:28:32 -07:00
ip_fib.h	ipv4: add a fib_type to fib_info	2012-10-04 13:58:26 -04:00
ip_vs.h	ipvs: fix build errors related to config option combinations	2012-10-23 09:23:40 +09:00
ip.h	ipv4: fix path MTU discovery with connection tracking	2012-08-26 19:13:55 +02:00
ipcomp.h
ipconfig.h
ipip.h	net: convert __IPTUNNEL_XMIT() to an inline function	2012-11-14 18:49:50 -05:00
ipv6.h	ipv6: improve ipv6_find_hdr() to skip empty routing headers	2012-11-12 12:31:37 -08:00
ipx.h
iw_handler.h
lapb.h
lib80211.h
llc_c_ac.h
llc_c_ev.h
llc_c_st.h
llc_conn.h
llc_if.h
llc_pdu.h
llc_s_ac.h
llc_s_ev.h
llc_s_st.h
llc_sap.h
llc.h	llc: Remove stray reference to sysctl_llc_station_ack_timeout.	2012-09-17 13:13:24 -04:00
mac80211.h	mac80211: support VHT rates in TX info	2012-11-26 12:43:00 +01:00
mac802154.h
mip6.h
mld.h
ndisc.h	net: Dont use ifindices in hash fns	2012-08-09 16:18:06 -07:00
neighbour.h	net: output path optimizations	2012-08-07 16:24:55 -07:00
net_namespace.h	userns: make each net (net_ns) belong to a user_ns	2012-11-18 20:30:55 -05:00
net_ratelimit.h
netdma.h
netevent.h
netlabel.h	userns: Convert the audit loginuid to be a kuid	2012-09-17 18:08:54 -07:00
netlink.h	netlink: Rename pid to portid to avoid confusion	2012-09-10 15:30:41 -04:00
netprio_cgroup.h	cgroup: Assign subsystem IDs during compile time	2012-09-14 09:57:43 -07:00
netrom.h
nexthop.h
nl802154.h
p8022.h
ping.h
pkt_cls.h
pkt_sched.h
protocol.h	net: Remove code duplication between offload structures	2012-11-15 17:39:51 -05:00
psnap.h
raw.h
rawv6.h
red.h
regulatory.h	cfg80211: add cellular base station regulatory hint support	2012-07-17 12:16:39 +02:00
request_sock.h	tcp: better retrans tracking for defer-accept	2012-11-03 14:45:00 -04:00
rose.h
route.h	ipv4: avoid a test in ip_rt_put()	2012-11-03 14:59:04 -04:00
rtnetlink.h	rtnl: allow to specify different num for rx and tx queue count	2012-07-20 11:06:59 -07:00
sch_generic.h	net sched: Pass the skb into change so it can access NETLINK_CB	2012-08-14 21:55:28 -07:00
scm.h	net: Remove unnecessary NULL check in scm_destroy().	2012-09-24 15:52:33 -04:00
secure_seq.h
slhc_vj.h
snmp.h	net: avoid reloads in SNMP_UPD_PO_STATS	2012-08-06 13:40:47 -07:00
sock.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2012-10-02 13:38:27 -07:00
stp.h
tcp_memcontrol.h
tcp_states.h
tcp.h	tcp: remove dead prototype for tcp_v4_get_peer()	2012-11-23 14:10:31 -05:00
timewait_sock.h
transp_v6.h
udp.h
udplite.h
wext.h
wimax.h
wpan-phy.h
x25.h
x25device.h
xfrm.h	xfrm: Fix the gc threshold value for ipv4	2012-11-13 09:15:07 +01:00