You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		15 years ago
..
9p	9p: client code cleanup	15 years ago
bluetooth	Bluetooth: clean up rfcomm code	15 years ago
caif	caif-driver: Add CAIF-SPI Protocol driver.	15 years ago
irda	net: return operator cleanup	15 years ago
iucv	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	15 years ago
netns	netns: reorder fields in struct net	15 years ago
phonet	Phonet: 'connect' socket implementation for Pipe controller	15 years ago
sctp	net: return operator cleanup	15 years ago
tc_act	net/sched: add ACT_CSUM action to update packets checksums	15 years ago
tipc	tipc: cleanup function namespace	15 years ago
act_api.h	pkt_sched: gen_kill_estimator() rcu fixes	15 years ago
addrconf.h	ipv6: make __ipv6_isatap_ifid static	15 years ago
af_ieee802154.h	…
af_rxrpc.h	…
af_unix.h	af_unix: Allow credentials to work across user and pid namespaces.	15 years ago
ah.h	…
arp.h	arp: remove unnecessary export of arp_broken_ops	15 years ago
atmclip.h	…
ax25.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ax88796.h	…
cfg80211.h	cfg80211: notify drivers about frame registrations	15 years ago
checksum.h	…
cipso_ipv4.h	…
cls_cgroup.h	Merge commit 'v2.6.36-rc7' into core/rcu	15 years ago
compat.h	net: fix compat_sys_recvmmsg parameter type	15 years ago
datalink.h	…
dcbnl.h	…
dn.h	…
dn_dev.h	net: use __packed annotation	15 years ago
dn_fib.h	decnet: Remove unused FIB metric macros.	15 years ago
dn_neigh.h	…
dn_nsp.h	net: use __packed annotation	15 years ago
dn_route.h	net-next: remove useless union keyword	15 years ago
dsa.h	…
dsfield.h	…
dst.h	net: introduce DST_NOCACHE flag	15 years ago
dst_ops.h	net dst: use a percpu_counter to track entries	15 years ago
esp.h	…
ethoc.h	…
fib_rules.h	fib: RCU conversion of fib_lookup()	15 years ago
flow.h	ipv4: Allow configuring subnets as local addresses	15 years ago
garp.h	…
gen_stats.h	…
genetlink.h	genetlink: introduce pre_doit/post_doit hooks	15 years ago
gre.h	PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)	15 years ago
icmp.h	ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h	15 years ago
ieee80211_radiotap.h	wireless: update radiotap parser	15 years ago
ieee802154.h	…
ieee802154_netdev.h	…
if_inet6.h	ipv6: Replace inet6_ifaddr->dead with state	15 years ago
inet6_connection_sock.h	net: replace ipfragok with skb->local_df	15 years ago
inet6_hashtables.h	tcp: Fix a connect() race with timewait sockets	15 years ago
inet_common.h	inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()	15 years ago
inet_connection_sock.h	tcp: Add TCP_USER_TIMEOUT socket option.	15 years ago
inet_ecn.h	net: return operator cleanup	15 years ago
inet_frag.h	fragment: add fast path for in-order fragments	15 years ago
inet_hashtables.h	tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()	15 years ago
inet_sock.h	net - IP_NODEFRAG option for IPv4 socket	15 years ago
inet_timewait_sock.h	net: suppress RCU lockdep false positive in twsk_net()	15 years ago
inetpeer.h	inetpeer: restore small inet_peer structures	15 years ago
ip.h	net: return operator cleanup	15 years ago
ip6_checksum.h	…
ip6_fib.h	net-next: remove useless union keyword	15 years ago
ip6_route.h	net: sk_dst_cache RCUification	15 years ago
ip6_tunnel.h	net: use __packed annotation	15 years ago
ip_fib.h	fib: RCU conversion of fib_lookup()	15 years ago
ip_vs.h	ipvs: provide address family for debugging	15 years ago
ipcomp.h	percpu: add __percpu sparse annotations to net	15 years ago
ipconfig.h	…
ipip.h	tunnels: prepare percpu accounting	15 years ago
ipv6.h	net: return operator cleanup	15 years ago
ipx.h	net: use __packed annotation	15 years ago
iw_handler.h	include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment	15 years ago
lapb.h	…
lib80211.h	lib80211: remove unused host_build_iv option	15 years ago
llc.h	llc: convert llc_sap_list to RCU	15 years ago
llc_c_ac.h	…
llc_c_ev.h	…
llc_c_st.h	…
llc_conn.h	llc: use a device based hash table to speed up multicast delivery	15 years ago
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	15 years ago
mip6.h	net: use __packed annotation	15 years ago
mld.h	ipv6 mcast: Introduce include/net/mld.h for MLD definitions.	15 years ago
ndisc.h	net: use __packed annotation	15 years ago
neighbour.h	neigh: reorder struct neighbour fields	15 years ago
net_namespace.h	netns: reorder fields in struct net	15 years ago
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	15 years ago
netlink.h	net: Fix a typo in netlink.h	15 years ago
netrom.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
nexthop.h	…
nl802154.h	…
p8022.h	…
pkt_cls.h	net: rename skb->iif to skb->skb_iif	15 years ago
pkt_sched.h	net: Define accessors to manipulate QDISC_STATE_RUNNING	15 years ago
protocol.h	…
psnap.h	…
raw.h	include/net/raw.h: Convert raw_seq_private macro to inline	15 years ago
rawv6.h	…
red.h	…
regulatory.h	wireless: only use alpha2 regulatory information from country IE	15 years ago
request_sock.h	tcp: account SYN-ACK timeouts & retransmissions	15 years ago
rose.h	…
route.h	tproxy: check for transparent flag in ip_route_newports	15 years ago
rtnetlink.h	rtnetlink: remove rtnl_kill_links	15 years ago
sch_generic.h	net_sched: remove the unused parameter of qdisc_create_dflt()	15 years ago
scm.h	scm: Capture the full credentials of the scm sender.	15 years ago
slhc_vj.h	…
snmp.h	snmp: 64bit ipstats_mib for all arches	15 years ago
sock.h	net: update SOCK_MIN_RCVBUF	15 years ago
stp.h	…
tcp.h	tcp: tcp_enter_quickack_mode can be static	15 years ago
tcp_states.h	…
timewait_sock.h	…
transp_v6.h	IPv6: Add dontfrag argument to relevant functions	15 years ago
udp.h	tproxy: added udp6_lib_lookup function	15 years ago
udplite.h	…
wext.h	…
wimax.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	15 years ago
wpan-phy.h	…
x25.h	X25: Move accept approve flag to bitfield	15 years ago
x25device.h	X25: Add if_x25.h and x25 to device identifiers	15 years ago
xfrm.h	xfrm: make xfrm_bundle_ok local	15 years ago