Linus Torvalds 152a6a9da1 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: (21 commits)
  [IPV4] SNMP: Support OutMcastPkts and OutBcastPkts
  [IPV4] SNMP: Support InMcastPkts and InBcastPkts
  [IPV4] SNMP: Support InTruncatedPkts
  [IPV4] SNMP: Support InNoRoutes
  [SNMP]: Add definitions for {In,Out}BcastPkts
  [TCP] FRTO: RFC4138 allows Nagle override when new data must be sent
  [TCP] FRTO: Delay skb available check until it's mandatory
  [XFRM]: Restrict upper layer information by bundle.
  [TCP]: Catch skb with S+L bugs earlier
  [PATCH] INET : IPV4 UDP lookups converted to a 2 pass algo
  [L2TP]: Add the ability to autoload a pppox protocol module.
  [SKB]: Introduce skb_queue_walk_safe()
  [AF_IUCV/IUCV]: smp_call_function deadlock
  [IPV6]: Fix slab corruption running ip6sic
  [TCP]: Update references in two old comments
  [XFRM]: Export SPD info
  [IPV6]: Track device renames in snmp6.
  [SCTP]: Fix sctp_getsockopt_local_addrs_old() to use local storage.
  [NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.
  [NETPOLL]: Remove CONFIG_NETPOLL_RX
  ...

2007-04-30 08:14:42 -07:00

..

bluetooth

[BLUETOOTH]: Introduce skb->data accessor methods for hci_{acl,event,sco}_hdr

2007-04-25 22:28:21 -07:00

irda

[IRDA] net/irda/: proper prototypes

2007-02-26 11:42:43 -08:00

iucv

[AF_IUCV/IUCV]: smp_call_function deadlock

2007-04-28 23:03:59 -07:00

netfilter

[NETLINK]: Possible cleanups.

2007-04-26 00:57:41 -07:00

sctp

[SCTP]: Implement SCTP_MAX_BURST socket option.

2007-04-25 22:28:04 -07:00

tc_act

[PKT_SCHED]: Kill pkt_act.h inlining.

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

tipc

[TIPC]: endianness annotations

2006-12-02 21:21:08 -08:00

act_api.h

[PKT_SCHED]: Kill pkt_act.h inlining.

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

addrconf.h

[IPV6] ADDRCONF: Optimistic Duplicate Address Detection (RFC 4429) Support.

2007-04-25 22:23:43 -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

[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec patch

2006-08-02 14:12:06 -07:00

ah.h

[IPSEC]: Use HMAC template and hash interface

2006-09-21 11:46:18 +10:00

arp.h

[IPV6]: Assorted trivial endianness annotations.

2006-12-02 21:22:50 -08:00

atmclip.h

[ATM]: Annotations.

2006-12-02 21:22:55 -08:00

ax25.h

[SK_BUFF]: Introduce skb_reset_mac_header(skb)

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

cfg80211.h

[WIRELESS] cfg80211: Update comment for locking.

2007-04-25 22:29:48 -07:00

checksum.h

[NET]: Make mangling a checksum (0 -> 0xffff on the wire) explicit.

2006-12-02 21:23:39 -08:00

cipso_ipv4.h

[SK_BUFF]: Introduce skb_network_header()

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

compat.h

[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution

2007-04-25 22:24:04 -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]: Use rtnl registration interface

2007-04-25 22:27:12 -07: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]: Use rtnl registration interface

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

dn.h

[NET]: Reduce sizeof(struct flowi) by 20 bytes.

2006-10-21 20:24:01 -07:00

dsfield.h

[NET]: IP header modifier helpers annotations.

2006-12-02 21:23:40 -08:00

dst.h

[NET]: Reorder fields of struct dst_entry

2007-02-10 23:20:45 -08:00

esp.h

[NET]: Move generic skbuff stuff from XFRM code to generic code

2007-04-25 22:28:33 -07:00

fib_rules.h

[NET] fib_rules: Flush route cache after rule modifications

2007-04-25 22:28:18 -07:00

flow.h

[XFRM]: Restrict upper layer information by bundle.

2007-04-30 00:58:09 -07:00

gen_stats.h

Linux-2.6.12-rc2

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

genetlink.h

[GENETLINK]: Add cmd dump completion.

2006-12-02 21:32:09 -08:00

icmp.h

[IPV4]: icmp_send() annotation

2006-09-28 18:01:06 -07:00

ieee80211_crypt.h

[PATCH] Update my email address from jkmaline@cc.hut.fi to j@w1.fi

2007-04-28 11:01:01 -04:00

ieee80211_radiotap.h

[PATCH] Remove comment about IEEE80211_RADIOTAP_FCS

2007-04-28 11:01:03 -04:00

ieee80211.h

[PATCH] Update my email address from jkmaline@cc.hut.fi to j@w1.fi

2007-04-28 11:01:01 -04:00

ieee80211softmac_wx.h

[PATCH] softmac: add SIOCSIWMLME

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

ieee80211softmac.h

WorkStruct: make allyesconfig

2006-11-22 14:57:56 +00:00

if_inet6.h

[IPV6]: Per-interface statistics support.

2006-12-02 21:22:08 -08: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

[INET]: Use jhash + random secret for ehash.

2007-04-25 22:28:06 -07:00

inet_common.h

[NET]: move struct proto_ops to const

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

inet_connection_sock.h

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

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

inet_ecn.h

[SK_BUFF]: Convert skb->tail to sk_buff_data_t

2007-04-25 22:26:28 -07:00

inet_hashtables.h

[NET]: change layout of ehash table

2007-02-08 14:16:46 -08:00

inet_sock.h

[INET]: Use jhash + random secret for ehash.

2007-04-25 22:28:06 -07:00

inet_timewait_sock.h

[INET]: twcal_jiffie should be unsigned long, not int

2007-03-05 13:32:48 -08:00

inetpeer.h

[IPV4] inet_peer: Group together avl_left, avl_right, v4daddr to speedup lookups on some CPUS

2006-10-20 00:28:35 -07:00

ip6_checksum.h

[IPV6]: Dumb typo in generic csum_ipv6_magic()

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

ip6_fib.h

[IPv6]: Use rtnl registration interface

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

ip6_route.h

[IPv6]: Use rtnl registration interface

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

ip6_tunnel.h

Linux-2.6.12-rc2

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

ip_fib.h

[IPv4]: Use rtnl registration interface

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

ip_mp_alg.h

[NET]: Rethink mark field in struct flowi

2006-12-02 21:21:39 -08:00

ip_vs.h

[NET]: ipvs checksum annotations.

2006-12-02 21:23:41 -08:00

ip.h

[IPV4]: Consolidate common SNMP code

2007-04-25 22:29:51 -07:00

ipcomp.h

[CRYPTO] users: Use crypto_comp and crypto_has_*

2006-09-21 11:46:22 +10:00

ipconfig.h

[NET]: ipconfig and nfsroot annotations

2006-12-02 21:21:09 -08:00

ipip.h

[IPV6] net/ipv6/sit.c: make 2 functions static

2006-12-02 21:26:15 -08:00

ipv6.h

[IPV6]: Consolidate common SNMP code

2007-04-25 22:29:52 -07:00

ipx.h

[SK_BUFF]: Introduce skb_transport_header(skb)

2007-04-25 22:25:31 -07:00

iw_handler.h

[WEXT]: Clean up how wext is called.

2007-04-26 20:43:56 -07: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

[SK_BUFF]: Introduce skb_network_header()

2007-04-25 22:24:59 -07: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

mip6.h

[IPV6] MIP6: Add receiving mobility header functions through raw socket.

2006-09-22 15:07:01 -07:00

ndisc.h

[IPV6]: Misc endianness annotations.

2006-12-02 21:22:52 -08:00

neighbour.h

[NEIGH]: Use rtnl registration interface

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

netdma.h

Remove all inclusions of <linux/config.h>

2006-10-04 03:38:54 -04:00

netevent.h

[NET]: Network Event Notifier Mechanism.

2006-08-02 13:38:20 -07:00

netlabel.h

NetLabel: convert to an extensibile/sparse category bitmap

2006-12-02 21:31:36 -08:00

netlink.h

[NETLINK]: Possible cleanups.

2007-04-26 00:57:41 -07:00

netrom.h

[PATCH] mark struct file_operations const 1

2007-02-12 09:48:44 -08:00

nexthop.h

[IPv4]: FIB configuration using struct fib_config

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

p8022.h

[NET]: Fix sparse warnings

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

pkt_cls.h

[SK_BUFF]: Convert skb->tail to sk_buff_data_t

2007-04-25 22:26:28 -07:00

pkt_sched.h

[NET_SCHED]: Eliminate qdisc_tree_lock

2007-04-25 22:29:07 -07:00

protocol.h

[INET]: Change protocol field in struct inet_protosw to u16

2006-12-02 21:30:55 -08:00

psnap.h

[NET]: Kill skb->real_dev

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

raw.h

Merge git://git.infradead.org/hdrcleanup-2.6

2006-06-20 15:10:08 -07:00

rawv6.h

[IPV6]: 'info' argument of ipv6 ->err_handler() is net-endian

2006-12-02 21:21:12 -08:00

red.h

[NET_SCHED]: turn PSCHED_GET_TIME into inline function

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

request_sock.h

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

rose.h

[PATCH] mark struct file_operations const 1

2007-02-12 09:48:44 -08:00

route.h

[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer

2007-02-10 23:20:38 -08:00

rtnetlink.h

[NETLINK]: Possible cleanups.

2007-04-26 00:57:41 -07:00

sch_generic.h

[NET_SCHED]: Unline tcf_destroy

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

scm.h

[AF_UNIX]: Kernel memory leak fix for af_unix datagram getpeersec patch

2006-08-02 14:12:06 -07:00

slhc_vj.h

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

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

snmp.h

[SCTP]: Extend /proc/net/sctp/snmp to provide more statistics.

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

sock.h

[NET]: Move sk_setup_caps() out of line.

2007-04-25 22:29:26 -07:00

syncppp.h

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

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

tcp_ecn.h

[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)

2007-04-25 22:29:34 -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] FRTO: RFC4138 allows Nagle override when new data must be sent

2007-04-30 00:58:16 -07:00

timewait_sock.h

[PATCH] slab: remove kmem_cache_t

2006-12-07 08:39:25 -08:00

transp_v6.h

[NET]: Supporting UDP-Lite (RFC 3828) in Linux

2006-12-02 21:22:46 -08:00

udp.h

[NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY

2007-04-25 22:28:43 -07:00

udplite.h

[SK_BUFF]: Introduce udp_hdr(), remove skb->h.uh

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

wext.h

[NET]: Fix networking compilation errors

2007-04-27 15:31:24 -07:00

wireless.h

[WIRELESS] cfg80211: New wireless config infrastructure.

2007-04-25 22:29:41 -07:00

x25.h

[X.25]: Adds /proc/sys/net/x25/x25_forward to control forwarding.

2007-02-08 13:34:36 -08:00

x25device.h

[SK_BUFF]: Introduce skb_reset_mac_header(skb)

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

xfrm.h

[XFRM]: Restrict upper layer information by bundle.

2007-04-30 00:58:09 -07:00