Linus Torvalds 5f05647dd8 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1699 commits) bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL. vlan: Calling vlan_hwaccel_do_receive() is always valid. tproxy: use the interface primary IP address as a default value for --on-ip tproxy: added IPv6 support to the socket match cxgb3: function namespace cleanup tproxy: added IPv6 support to the TPROXY target tproxy: added IPv6 socket lookup function to nf_tproxy_core be2net: Changes to use only priority codes allowed by f/w tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabled tproxy: added tproxy sockopt interface in the IPV6 layer tproxy: added udp6_lib_lookup function tproxy: added const specifiers to udp lookup functions tproxy: split off ipv6 defragmentation to a separate module l2tp: small cleanup nf_nat: restrict ICMP translation for embedded header can: mcp251x: fix generation of error frames can: mcp251x: fix endless loop in interrupt handler if CANINTF_MERRF is set can-raw: add msg_flags to distinguish local traffic 9p: client code cleanup rds: make local functions/variables static ... Fix up conflicts in net/core/dev.c, drivers/net/pcmcia/smc91c92_cs.c and drivers/net/wireless/ath/ath9k/debug.c as per David		2010-10-23 11:47:02 -07:00
..
9p	9p: client code cleanup	2010-10-21 04:26:39 -07:00
bluetooth	Bluetooth: clean up rfcomm code	2010-10-12 12:44:53 -03:00
caif	caif-driver: Add CAIF-SPI Protocol driver.	2010-06-29 00:08:21 -07:00
irda	net: return operator cleanup	2010-09-23 14:33:39 -07:00
iucv	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2010-10-23 11:47:02 -07:00
netns	netns: reorder fields in struct net	2010-10-17 13:49:14 -07:00
phonet	Phonet: 'connect' socket implementation for Pipe controller	2010-10-13 14:40:34 -07:00
sctp	net: return operator cleanup	2010-09-23 14:33:39 -07:00
tc_act	net/sched: add ACT_CSUM action to update packets checksums	2010-08-20 01:42:59 -07:00
tipc	tipc: cleanup function namespace	2010-10-16 11:13:24 -07:00
act_api.h	pkt_sched: gen_kill_estimator() rcu fixes	2010-06-11 18:37:08 -07:00
addrconf.h	ipv6: make __ipv6_isatap_ifid static	2010-10-05 00:47:39 -07:00
af_ieee802154.h
af_rxrpc.h
af_unix.h	af_unix: Allow credentials to work across user and pid namespaces.	2010-06-16 14:58:16 -07:00
ah.h
arp.h	arp: remove unnecessary export of arp_broken_ops	2010-09-29 19:45:35 -07:00
atmclip.h
ax25.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ax88796.h
cfg80211.h	cfg80211: notify drivers about frame registrations	2010-10-13 15:45:22 -04:00
checksum.h
cipso_ipv4.h
cls_cgroup.h	Merge commit 'v2.6.36-rc7' into core/rcu	2010-10-07 09:43:45 +02:00
compat.h
datalink.h
dcbnl.h
dn.h
dn_dev.h	net: use __packed annotation	2010-06-03 03:21:52 -07:00
dn_fib.h	decnet: Remove unused FIB metric macros.	2010-03-27 19:23:46 -07:00
dn_neigh.h
dn_nsp.h	net: use __packed annotation	2010-06-03 03:21:52 -07:00
dn_route.h	net-next: remove useless union keyword	2010-06-10 23:31:35 -07:00
dsa.h
dsfield.h
dst.h	net: introduce DST_NOCACHE flag	2010-10-03 22:17:54 -07:00
dst_ops.h	net dst: use a percpu_counter to track entries	2010-10-11 13:06:53 -07:00
esp.h
ethoc.h
fib_rules.h	fib: RCU conversion of fib_lookup()	2010-10-05 20:39:38 -07:00
flow.h	ipv4: Allow configuring subnets as local addresses	2010-09-28 23:38:15 -07:00
garp.h
gen_stats.h
genetlink.h	genetlink: introduce pre_doit/post_doit hooks	2010-10-05 13:35:30 -04:00
gre.h	PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)	2010-08-21 23:05:39 -07:00
icmp.h	ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h	2010-04-13 14:49:31 -07:00
ieee80211_radiotap.h
ieee802154.h
ieee802154_netdev.h
if_inet6.h	ipv6: Replace inet6_ifaddr->dead with state	2010-05-18 15:36:06 -07:00
inet6_connection_sock.h	net: replace ipfragok with skb->local_df	2010-04-15 23:36:37 -07:00
inet6_hashtables.h
inet_common.h	inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()	2010-07-12 20:21:46 -07:00
inet_connection_sock.h	tcp: Add TCP_USER_TIMEOUT socket option.	2010-08-30 13:23:33 -07:00
inet_ecn.h	net: return operator cleanup	2010-09-23 14:33:39 -07:00
inet_frag.h	fragment: add fast path for in-order fragments	2010-06-30 13:44:29 -07:00
inet_hashtables.h	tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()	2010-10-21 13:06:43 +02:00
inet_sock.h	net - IP_NODEFRAG option for IPv4 socket	2010-06-23 13:16:38 -07:00
inet_timewait_sock.h	net: suppress RCU lockdep false positive in twsk_net()	2010-04-27 12:39:01 -07:00
inetpeer.h	inetpeer: restore small inet_peer structures	2010-06-16 11:55:39 -07:00
ip.h	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ip6_checksum.h
ip6_fib.h	net-next: remove useless union keyword	2010-06-10 23:31:35 -07:00
ip6_route.h	net: sk_dst_cache RCUification	2010-04-13 01:41:33 -07:00
ip6_tunnel.h	net: use __packed annotation	2010-06-03 03:21:52 -07:00
ip_fib.h	fib: RCU conversion of fib_lookup()	2010-10-05 20:39:38 -07:00
ip_vs.h	ipvs: provide address family for debugging	2010-10-21 11:04:43 +02:00
ipcomp.h
ipconfig.h
ipip.h	tunnels: prepare percpu accounting	2010-09-27 21:30:42 -07:00
ipv6.h	net: return operator cleanup	2010-09-23 14:33:39 -07:00
ipx.h	net: use __packed annotation	2010-06-03 03:21:52 -07:00
iw_handler.h	include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment	2010-03-31 14:49:12 -04:00
lapb.h
lib80211.h	lib80211: remove unused host_build_iv option	2010-07-26 15:09:04 -04:00
llc.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
mac80211.h	mac80211: add probe request filter flag	2010-10-13 15:45:22 -04:00
mip6.h	net: use __packed annotation	2010-06-03 03:21:52 -07:00
mld.h	ipv6 mcast: Introduce include/net/mld.h for MLD definitions.	2010-04-23 13:35:55 +09:00
ndisc.h	net: use __packed annotation	2010-06-03 03:21:52 -07:00
neighbour.h	neigh: reorder struct neighbour fields	2010-10-11 16:09:14 -07:00
net_namespace.h	netns: reorder fields in struct net	2010-10-17 13:49:14 -07:00
netdma.h
netevent.h
netlabel.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
netlink.h	net: Fix a typo in netlink.h	2010-06-23 12:58:40 -07:00
netrom.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
nexthop.h
nl802154.h
p8022.h
pkt_cls.h
pkt_sched.h	net: Define accessors to manipulate QDISC_STATE_RUNNING	2010-06-02 03:23:51 -07:00
protocol.h
psnap.h
raw.h	include/net/raw.h: Convert raw_seq_private macro to inline	2010-09-08 13:42:22 -07:00
rawv6.h
red.h
regulatory.h	wireless: only use alpha2 regulatory information from country IE	2010-07-20 16:44:35 -04:00
request_sock.h
rose.h
route.h	tproxy: check for transparent flag in ip_route_newports	2010-09-27 15:03:33 -07:00
rtnetlink.h	rtnetlink: remove rtnl_kill_links	2010-10-21 03:09:45 -07:00
sch_generic.h	net_sched: remove the unused parameter of qdisc_create_dflt()	2010-10-21 03:09:47 -07:00
scm.h	scm: Capture the full credentials of the scm sender.	2010-06-16 14:55:56 -07:00
slhc_vj.h
snmp.h	snmp: 64bit ipstats_mib for all arches	2010-06-30 13:31:19 -07:00
sock.h	net: update SOCK_MIN_RCVBUF	2010-09-26 18:53:07 -07:00
stp.h
tcp.h	tcp: tcp_enter_quickack_mode can be static	2010-09-29 19:45:36 -07:00
tcp_states.h
timewait_sock.h
transp_v6.h	IPv6: Add dontfrag argument to relevant functions	2010-04-23 23:35:28 -07:00
udp.h	tproxy: added udp6_lib_lookup function	2010-10-21 16:05:41 +02:00
udplite.h
wext.h
wimax.h
wpan-phy.h
x25.h	X25: Move accept approve flag to bitfield	2010-05-17 17:39:27 -07:00
x25device.h	X25: Add if_x25.h and x25 to device identifiers	2010-04-22 16:12:36 -07:00
xfrm.h	xfrm: make xfrm_bundle_ok local	2010-10-21 03:09:46 -07:00