Linus Torvalds d0b952a983 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (109 commits)
  [ETHTOOL]: Fix UFO typo
  [SCTP]: Fix persistent slowdown in sctp when a gap ack consumes rx buffer.
  [SCTP]: Send only 1 window update SACK per message.
  [SCTP]: Don't do CRC32C checksum over loopback.
  [SCTP] Reset rtt_in_progress for the chunk when processing its sack.
  [SCTP]: Reject sctp packets with broadcast addresses.
  [SCTP]: Limit association max_retrans setting in setsockopt.
  [PFKEYV2]: Fix inconsistent typing in struct sadb_x_kmprivate.
  [IPV6]: Sum real space for RTAs.
  [IRDA]: Use put_unaligned() in irlmp_do_discovery().
  [BRIDGE]: Add support for NETIF_F_HW_CSUM devices
  [NET]: Add NETIF_F_GEN_CSUM and NETIF_F_ALL_CSUM
  [TG3]: Convert to non-LLTX
  [TG3]: Remove unnecessary tx_lock
  [TCP]: Add tcp_slow_start_after_idle sysctl.
  [BNX2]: Update version and reldate
  [BNX2]: Use CPU native page size
  [BNX2]: Use compressed firmware
  [BNX2]: Add firmware decompression
  [BNX2]: Allow WoL settings on new 5708 chips
  ...

Manual fixup for conflict in drivers/net/tulip/winbond-840.c

2006-06-19 18:55:56 -07:00

..

bluetooth

[Bluetooth] Reduce L2CAP MTU for RFCOMM connections

2006-02-13 11:39:57 +01:00

irda

[IRDA]: fixup type of ->lsap_state

2006-05-22 16:54:30 -07:00

netfilter

[SECMARK]: Add secmark support to conntrack

2006-06-17 21:30:01 -07:00

sctp

[SCTP] Reset rtt_in_progress for the chunk when processing its sack.

2006-06-17 22:56:08 -07:00

tc_act

[NETFILTER]: futher {ip,ip6,arp}_tables unification

2006-03-22 13:56:56 -08:00

tipc

[TIPC] More updates of file headers

2006-01-12 14:06:39 -08:00

act_api.h

[PKT_SCHED]: Convert tc action functions to single skb pointers

2006-01-09 14:16:08 -08:00

act_generic.h

[PKT_SCHED]: Fixup simple action define.

2005-05-19 12:42:39 -07:00

addrconf.h

[NET]: Fix sparse warnings

2005-08-29 16:01:32 -07:00

af_unix.h

[NET]: sem2mutex part 2

2006-03-20 22:35:41 -08:00

ah.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

arp.h

[IPV4]: Possible cleanups.

2006-04-14 15:00:20 -07:00

atmclip.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ax25.h

[AX.25]: Eleminate HZ from AX.25 kernel interfaces

2006-05-03 23:27:16 -07:00

checksum.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

compat.h

[PATCH] net/compat.h build fix

2006-05-31 16:27:11 -07:00

datalink.h

[NET]: Kill skb->real_dev

2005-08-29 15:32:25 -07:00

dn_dev.h

[DECnet]: Endian annotation and fixes for DECnet.

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

dn_fib.h

[DECnet]: Endian annotation and fixes for DECnet.

2006-03-20 22:42:39 -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

[DECnet]: Endian annotation and fixes for DECnet.

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

dn.h

[DECnet]: Endian annotation and fixes for DECnet.

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

dsfield.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

dst.h

[XFRM]: Netfilter IPsec output hooks

2006-01-07 12:57:28 -08:00

esp.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

flow.h

[DECnet]: Endian annotation and fixes for DECnet.

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

gen_stats.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

genetlink.h

[PATCH] genetlink: don't touch module ref count

2006-01-13 13:06:40 -08:00

icmp.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ieee80211_crypt.h

[PATCH] ieee80211: Add TKIP crypt->build_iv

2006-01-27 17:08:07 -05:00

ieee80211_radiotap.h

[PATCH] ieee80211: Added ieee80211_radiotap.h

2005-09-21 23:03:55 -04:00

ieee80211.h

[PATCH] softmac: complete shared key authentication

2006-06-05 15:51:29 -04:00

ieee80211softmac_wx.h

[PATCH] softmac: add SIOCSIWMLME

2006-04-24 16:15:58 -04:00

ieee80211softmac.h

[PATCH] softmac: Fix handling of authentication failure

2006-06-05 15:51:30 -04:00

if_inet6.h

[IPV6]: ADDRCONF: Use our standard algorithm for randomized ifid.

2006-03-20 16:54:09 -08:00

inet6_connection_sock.h

[IPV6]: Generalise some functions

2006-01-03 13:10:46 -08:00

inet6_hashtables.h

[IPV6]: Deinline few large functions in inet6 code

2006-04-09 22:48:59 -07:00

inet_common.h

[NET]: move struct proto_ops to const

2006-01-03 13:11:15 -08:00

inet_connection_sock.h

[ICSK] compat: Introduce inet_csk_compat_[gs]etsockopt

2006-03-20 22:46:16 -08:00

inet_ecn.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_hashtables.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_sock.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

inet_timewait_sock.h

[NET]: use hlist_unhashed()

2006-04-29 18:33:15 -07:00

inetpeer.h

[IPV4]: Safer reassembly

2006-01-03 13:10:31 -08:00

ip6_checksum.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ip6_fib.h

[IPV6]: V6 route events reported with wrong netlink PID and seq number

2005-06-21 13:51:04 -07:00

ip6_route.h

[IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).

2006-03-20 17:06:24 -08:00

ip6_tunnel.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ip_fib.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ip_mp_alg.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ip_vs.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

ip.h

[NET]: net.ipv4.ip_autoconfig sysctl removal

2006-06-17 21:30:30 -07:00

ipcomp.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ipconfig.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ipip.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ipv6.h

[IPV6]: Clean up hop-by-hop options handler.

2006-04-18 15:57:53 -07:00

ipx.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

iw_handler.h

[PATCH] WE-20 for kernel 2.6.16

2006-03-23 07:12:57 -05:00

lapb.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_c_ac.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_c_ev.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_c_st.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_conn.h

[PATCH] gfp flags annotations - part 1

2005-10-08 15:00:57 -07:00

llc_if.h

[LLC]: add multicast support for datagrams

2006-06-17 21:26:08 -07:00

llc_pdu.h

[LLC]: Fix typo

2005-11-14 21:58:18 -08:00

llc_s_ac.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_s_ev.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_s_st.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

llc_sap.h

[LLC]: Fix the accept path

2005-09-22 07:57:21 -03:00

llc.h

[LLC]: llc_mac_hdr_init const arguments

2006-03-20 22:59:36 -08:00

ndisc.h

[IPV6]: ROUTE: Add experimental support for Route Information Option in RA (RFC4191).

2006-03-20 17:06:24 -08:00

neighbour.h

[NEIGH]: Fix IP-over-ATM and ARP interaction.

2006-05-12 14:56:08 -07:00

netdma.h

[I/OAT]: Utility functions for offloading sk_buff to iovec copies

2006-06-17 21:25:46 -07:00

netlink.h

[NETLINK]: Generic netlink receive queue processor

2005-11-10 02:26:40 +01:00

netrom.h

[NETROM]: Eleminate HZ from NET/ROM kernel interfaces

2006-05-03 23:27:47 -07:00

p8022.h

[NET]: Fix sparse warnings

2005-08-29 16:01:32 -07:00

pkt_act.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

pkt_cls.h

[NET]: Remove explicit initializations of skb->input_dev

2005-08-29 15:33:26 -07:00

pkt_sched.h

[PKT_SCHED]: Use USEC_PER_SEC

2006-01-09 14:16:05 -08:00

protocol.h

[IPV6]: Move nextheader offset to the IP6CB

2006-01-07 12:57:29 -08:00

psnap.h

[NET]: Kill skb->real_dev

2005-08-29 15:32:25 -07:00

raw.h

[IPV4]: Right prototype of __raw_v4_lookup()

2006-06-17 21:29:39 -07:00

rawv6.h

[IPV4/6]: Check if packet was actually delivered to a raw socket to decide whether to send an ICMP unreachable

2005-08-29 15:37:22 -07:00

red.h

[PKT_SCHED]: Generic RED layer

2005-11-05 22:02:24 +01:00

request_sock.h

[NET]: drop duplicate assignment in request_sock

2006-03-26 17:39:55 -08:00

rose.h

[ROSE]: Eleminate HZ from ROSE kernel interfaces

2006-05-03 23:28:20 -07:00

route.h

[IPV4]: Aggregate route entries with different TOS values

2006-03-25 01:38:55 -08:00

sch_generic.h

[PKT_SCHED]: Cleanup qdisc creation and alignment macros

2005-07-05 14:15:09 -07:00

scm.h

[AF_UNIX]: scm: better initialization

2006-03-20 21:31:51 -08:00

slhc_vj.h

[NET]: Remove __ARGS from include/net/slhc_vj.h

2005-07-05 15:12:04 -07:00

snmp.h

[PATCH] smp_processor_id() cleanup

2005-06-21 18:46:13 -07:00

sock.h

[NET]: skb_trim audit

2006-06-17 21:30:20 -07:00

syncppp.h

[PATCH] drivers/net/wan/: possible cleanups

2005-09-14 08:36:54 -04:00

tcp_ecn.h

[NET]: Introduce inet_connection_sock

2005-08-29 15:43:19 -07:00

tcp_states.h

[TCP]: Move the TCPF_ enum to tcp_states.h

2006-01-03 13:10:57 -08:00

tcp.h

[TCP]: Add tcp_slow_start_after_idle sysctl.

2006-06-17 21:30:53 -07:00

timewait_sock.h

[TWSK]: Introduce struct timewait_sock_ops

2006-01-03 13:10:54 -08:00

transp_v6.h

[ICSK]: Rename struct tcp_func to struct inet_connection_sock_af_ops

2006-01-03 13:10:38 -08:00

udp.h

[INET_SOCK]: Move struct inet_sock & helper functions to net/inet_sock.h

2006-01-03 13:11:21 -08:00

x25.h

[X25]: allow ITU-T DTE facilities for x25

2006-03-22 00:01:31 -08:00

x25device.h

[X25]: Restore skb->dev setting in x25_type_trans().

2006-04-09 22:37:18 -07:00

xfrm.h

[IPSEC] xfrm: Use IPPROTO_MAX instead of 256

2006-06-17 21:28:43 -07:00