Linus Torvalds 09ce42d316 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:
  bnx2: Fix the behavior of ethtool when ONBOOT=no
  qla3xxx: Don't sleep while holding lock.
  qla3xxx: Give the PHY time to come out of reset.
  ipv4 routing: Ensure that route cache entries are usable and reclaimable with caching is off
  net: Move rx skb_orphan call to where needed
  ipv6: Use correct data types for ICMPv6 type and code
  net: let KS8842 driver depend on HAS_IOMEM
  can: let SJA1000 driver depend on HAS_IOMEM
  netxen: fix firmware init handshake
  netxen: fix build with without CONFIG_PM
  netfilter: xt_rateest: fix comparison with self
  netfilter: xt_quota: fix incomplete initialization
  netfilter: nf_log: fix direct userspace memory access in proc handler
  netfilter: fix some sparse endianess warnings
  netfilter: nf_conntrack: fix conntrack lookup race
  netfilter: nf_conntrack: fix confirmation race condition
  netfilter: nf_conntrack: death_by_timeout() fix

2009-06-24 10:01:12 -07:00

..

9p

net/9p: handle correctly interrupted 9P requests

2009-04-05 16:54:53 -05:00

bluetooth

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

2009-06-11 05:47:43 -07:00

ieee802154

net: add NL802154 interface for configuration of 802.15.4 devices

2009-06-09 05:25:33 -07:00

irda

irda: Add irda_skb_cb qdisc related padding

2008-12-17 15:44:58 -08:00

iucv

af_iucv: Return -EAGAIN if iucv msg limit is exceeded

2009-06-19 00:10:40 -07:00

netfilter

netfilter: conntrack: optional reliable conntrack event delivery

2009-06-13 12:30:52 +02:00

netns

netfilter: conntrack: optional reliable conntrack event delivery

2009-06-13 12:30:52 +02:00

phonet

Phonet: use per-namespace devices list

2009-01-26 21:03:35 -08:00

sctp

net: Move rx skb_orphan call to where needed

2009-06-23 16:36:25 -07:00

tc_act

pkt_action: add new action skbedit

2008-09-12 16:30:20 -07:00

tipc

tipc: Remove unneeded parameter to tipc_createport_raw()

2008-07-14 22:42:19 -07:00

act_api.h

[NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get

2008-01-28 15:11:17 -08:00

addrconf.h

ipv6: Fix conflict resolutions during ipv6 binding

2009-03-24 19:49:11 -07:00

af_rxrpc.h

[AF_RXRPC]: Add an interface to the AF_RXRPC module for the AFS filesystem to use

2007-04-26 15:50:17 -07:00

af_unix.h

net: Fix soft lockups/OOM issues w/ unix garbage collector

2008-11-26 15:32:27 -08:00

ah.h

[IPSEC]: Get rid of ipv6_{auth,esp,comp}_hdr

2007-10-10 16:55:55 -07:00

arp.h

[NETFILTER]: ebtables: remove casts, use consts

2008-01-31 19:27:33 -08:00

atmclip.h

clip: convert to internal network_device_stats

2009-01-21 14:01:59 -08:00

ax25.h

[AX25] ax25_ds_timer: use mod_timer instead of add_timer

2008-02-12 17:53:34 -08:00

ax88796.h

ax88796: Add method to take MAC from platform data

2009-03-24 23:32:03 -07:00

cfg80211.h

cfg80211: add rfkill support

2009-06-03 14:06:14 -04:00

checksum.h

include/net net/ - csum_partial - remove unnecessary casts

2008-11-19 15:44:53 -08:00

cipso_ipv4.h

netlabel: Label incoming TCP connections correctly in SELinux

2009-03-28 15:01:36 +11:00

compat.h

net: Use standard structures for generic socket address structures.

2008-07-19 22:35:47 -07:00

datalink.h

…

dcbnl.h

net: fix DCB setstate to return success/failure

2008-12-21 20:09:50 -08:00

dn_dev.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_fib.h

decnet: remove private wrappers of endian helpers

2008-11-27 00:12:47 -08:00

dn_neigh.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_nsp.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -08:00

dn_route.h

[NET]: Wrap netdevice hardware header creation.

2007-10-10 16:52:50 -07:00

dn.h

decnet: compile fix for removal of byteorder wrapper

2008-11-27 23:04:13 -08:00

dsa.h

dsa: add switch chip cascading support

2009-03-21 19:06:54 -07:00

dsfield.h

[NET]: Constify include/net/dsfield.h

2008-01-28 14:55:58 -08:00

dst.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

esp.h

[IPSEC]: Use crypto_aead and authenc in ESP

2008-01-31 19:27:02 -08:00

ethoc.h

net: Add support for the OpenCores 10/100 Mbps Ethernet MAC.

2009-03-27 00:16:21 -07:00

fib_rules.h

net: Remove unused parameter from fill method in fib_rules_ops.

2009-05-20 17:26:23 -07:00

flow.h

netns xfrm: lookup in netns

2008-11-25 17:35:18 -08:00

garp.h

vlan: Add GVRP support

2008-07-05 21:26:57 -07:00

gen_stats.h

pkt_sched: gen_estimator: Optimize gen_estimator_active()

2008-11-26 15:24:32 -08:00

genetlink.h

genetlink: Introduce genl_register_family_with_ops()

2009-05-21 16:50:22 -07:00

icmp.h

mib: put icmpmsg statistics on struct net

2008-07-18 04:04:22 -07:00

ieee80211_radiotap.h

wireless: radiotap updates

2009-03-27 20:12:52 -04:00

if_inet6.h

ipv6: reorder struct inet6_ifaddr to remove padding on 64 bit builds

2009-03-21 13:29:05 -07:00

inet6_connection_sock.h

[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().

2007-01-26 01:04:55 -08:00

inet6_hashtables.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

inet_common.h

[NETNS]: Inet control socket should not hold a namespace.

2008-04-03 14:28:30 -07:00

inet_connection_sock.h

net: more #ifdef CONFIG_COMPAT

2008-08-28 02:53:51 -07:00

inet_ecn.h

net: replace __constant_{endian} uses in net headers

2009-02-14 22:58:35 -08:00

inet_frag.h

inet fragments: fix sparse warning: context imbalance

2009-02-26 23:13:35 -08:00

inet_hashtables.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

inet_sock.h

Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck

2009-06-16 13:09:51 -07:00

inet_timewait_sock.h

net: annotate inet_timewait_sock bitfields

2009-06-15 15:49:32 +02:00

inetpeer.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip6_checksum.h

[IPV6]: Dumb typo in generic csum_ipv6_magic()

2006-12-22 11:12:07 -08:00

ip6_fib.h

[NETNS][IPV6] rt6_info - move rt6_info structure inside the namespace

2008-03-04 13:48:30 -08:00

ip6_route.h

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

ip6_tunnel.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ip_fib.h

ipv4: remove unused macro (FIB_RES_RESET) from ip_fib.h.

2009-05-03 14:19:51 -07:00

ip_vs.h

net: replace __constant_{endian} uses in net headers

2009-02-14 22:58:35 -08:00

ip.h

snmp: add missing counters for RFC 4293

2009-04-27 02:45:02 -07:00

ipcomp.h

ipsec: ipcomp - Merge IPComp implementations

2008-07-25 02:54:40 -07:00

ipconfig.h

net: remove CVS keywords

2008-06-11 21:00:38 -07:00

ipip.h

sit: stateless autoconf for isatap

2009-05-19 16:02:02 -07:00

ipv6.h

snmp: add missing counters for RFC 4293

2009-04-27 02:45:02 -07:00

ipx.h

net: replace __constant_{endian} uses in net headers

2009-02-14 22:58:35 -08:00

iw_handler.h

wext: Emit event stream entries correctly when compat.

2008-06-16 18:50:49 -07:00

lapb.h

…

lib80211.h

wireless: missing include in lib80211.h

2008-11-21 11:42:55 -05:00

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

…

llc_conn.h

[NET]: Make socket creation namespace safe.

2007-10-10 16:49:07 -07:00

llc_if.h

[LLC]: Kill static inline llc_addrany

2008-02-29 11:46:17 -08:00

llc_pdu.h

[LLC]: skb allocation size for responses

2008-03-31 21:02:47 -07:00

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

[LLC]: skb allocation size for responses

2008-03-31 21:02:47 -07:00

llc.h

[LLC]: station source mac address

2008-03-28 16:28:36 -07:00

mac80211.h

mac80211: do not pass PS frames out of mac80211 again

2009-06-10 13:28:37 -04:00

mip6.h

[IPV6] MIP6: Use our standard definitions for paddings.

2008-04-12 13:43:22 +09:00

ndisc.h

ipv6: Fix sporadic sendmsg -EINVAL when sending to multicast groups.

2009-01-04 16:04:39 -08:00

neighbour.h

net: Cleanup of neighbour code

2008-11-12 00:54:54 -08:00

net_namespace.h

netns: Remove net_alive

2009-03-03 01:14:27 -08:00

netdma.h

net_dma: convert to dma_find_channel

2009-01-06 11:38:15 -07:00

netevent.h

[NET]: Remove unnecessary inclusion of dst.h

2008-01-28 14:53:38 -08:00

netlabel.h

netlabel: Cleanup the Smack/NetLabel code to fix incoming TCP connections

2009-03-28 15:01:37 +11:00

netlink.h

netfilter: conntrack: add support for DCCP handshake sequence to ctnetlink

2009-05-27 17:50:35 +02:00

netrom.h

netrom: convert to internal net_device_stats

2009-01-21 14:02:01 -08:00

nexthop.h

[IPv4]: FIB configuration using struct fib_config

2006-09-22 14:55:04 -07:00

p8022.h

…

pkt_cls.h

ematch: simpler tcf_em_unregister()

2008-11-16 23:01:49 -08:00

pkt_sched.h

pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US

2009-06-15 02:31:47 -07:00

protocol.h

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

psnap.h

snap: use const for descriptor

2009-03-21 19:06:50 -07:00

raw.h

[RAW]: Add raw_hashinfo member on struct proto.

2008-03-22 16:56:51 -07:00

rawv6.h

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00

red.h

[NET_SCHED]: turn PSCHED_GET_TIME into inline function

2007-04-25 22:27:55 -07:00

regulatory.h

cfg80211: clean up includes

2009-04-22 16:57:17 -04:00

request_sock.h

net: Fix memory leak in the proto_register function

2008-11-21 16:45:22 -08:00

rose.h

rose: improving AX25 routing frames via ROSE network

2008-06-17 17:08:32 -07:00

route.h

net: skb->rtable accessor

2009-06-03 02:51:02 -07:00

rtnetlink.h

[RTNL]: Introduce the rtnl_kill_links helper.

2008-04-16 00:46:52 -07:00

sch_generic.h

net: reorder struct Qdisc for better SMP performance

2009-03-20 01:33:32 -07:00

scm.h

Merge branch 'master' into next

2008-11-14 11:29:12 +11:00

slhc_vj.h

…

snmp.h

snmp: add missing counters for RFC 4293

2009-04-27 02:45:02 -07:00

sock.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

2009-06-24 10:01:12 -07:00

stp.h

net: Add STP demux layer

2008-07-05 21:25:39 -07:00

tcp_states.h

…

tcp.h

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2009-05-08 02:48:30 -07:00

timewait_sock.h

net: Fix memory leak in the proto_register function

2008-11-21 16:45:22 -08:00

transp_v6.h

net: replace __constant_{endian} uses in net headers

2009-02-14 22:58:35 -08:00

udp.h

ipv6: Fix NULL pointer dereference with time-wait sockets

2009-04-11 01:53:06 -07:00

udplite.h

udp: introduce struct udp_table and multiple spinlocks

2008-10-29 01:41:45 -07:00

wext.h

wext: Dispatch and handle compat ioctls entirely in net/wireless/wext.c

2008-06-16 18:32:46 -07:00

wimax.h

rfkill: rewrite

2009-06-03 14:06:13 -04:00

x25.h

x25: Fix sleep from timer on socket destroy.

2009-06-16 05:40:30 -07:00

x25device.h

[SK_BUFF]: Introduce skb_reset_mac_header(skb)

2007-04-25 22:24:32 -07:00

xfrm.h

ipv6: Use correct data types for ICMPv6 type and code

2009-06-23 04:31:07 -07:00