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 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 ...		18 years ago
..
bluetooth	[BLUETOOTH]: Introduce skb->data accessor methods for hci_{acl,event,sco}_hdr	18 years ago
irda	[IRDA] net/irda/: proper prototypes	18 years ago
iucv	[AF_IUCV/IUCV]: smp_call_function deadlock	18 years ago
netfilter	[NETLINK]: Possible cleanups.	18 years ago
sctp	[SCTP]: Implement SCTP_MAX_BURST socket option.	18 years ago
tc_act	…
tipc	…
act_api.h	…
addrconf.h	[IPV6] ADDRCONF: Optimistic Duplicate Address Detection (RFC 4429) Support.	18 years ago
af_rxrpc.h	[AF_RXRPC]: Add an interface to the AF_RXRPC module for the AFS filesystem to use	18 years ago
af_unix.h	…
ah.h	…
arp.h	[IPV6]: Assorted trivial endianness annotations.	18 years ago
atmclip.h	[ATM]: Annotations.	18 years ago
ax25.h	[SK_BUFF]: Introduce skb_reset_mac_header(skb)	18 years ago
cfg80211.h	[WIRELESS] cfg80211: Update comment for locking.	18 years ago
checksum.h	[NET]: Make mangling a checksum (0 -> 0xffff on the wire) explicit.	18 years ago
cipso_ipv4.h	[SK_BUFF]: Introduce skb_network_header()	18 years ago
compat.h	[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution	18 years ago
datalink.h	…
dn.h	…
dn_dev.h	…
dn_fib.h	[DECNet]: Use rtnl registration interface	18 years ago
dn_neigh.h	…
dn_nsp.h	…
dn_route.h	[DECNet]: Use rtnl registration interface	18 years ago
dsfield.h	[NET]: IP header modifier helpers annotations.	18 years ago
dst.h	[NET]: Reorder fields of struct dst_entry	18 years ago
esp.h	[NET]: Move generic skbuff stuff from XFRM code to generic code	18 years ago
fib_rules.h	[NET] fib_rules: Flush route cache after rule modifications	18 years ago
flow.h	[XFRM]: Restrict upper layer information by bundle.	18 years ago
gen_stats.h	…
genetlink.h	[GENETLINK]: Add cmd dump completion.	18 years ago
icmp.h	…
ieee80211.h	[PATCH] Update my email address from jkmaline@cc.hut.fi to j@w1.fi	18 years ago
ieee80211_crypt.h	[PATCH] Update my email address from jkmaline@cc.hut.fi to j@w1.fi	18 years ago
ieee80211_radiotap.h	[PATCH] Remove comment about IEEE80211_RADIOTAP_FCS	18 years ago
ieee80211softmac.h	…
ieee80211softmac_wx.h	…
if_inet6.h	[IPV6]: Per-interface statistics support.	18 years ago
inet6_connection_sock.h	[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().	18 years ago
inet6_hashtables.h	[INET]: Use jhash + random secret for ehash.	18 years ago
inet_common.h	…
inet_connection_sock.h	[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().	18 years ago
inet_ecn.h	[SK_BUFF]: Convert skb->tail to sk_buff_data_t	18 years ago
inet_hashtables.h	[NET]: change layout of ehash table	18 years ago
inet_sock.h	[INET]: Use jhash + random secret for ehash.	18 years ago
inet_timewait_sock.h	[INET]: twcal_jiffie should be unsigned long, not int	18 years ago
inetpeer.h	…
ip.h	[IPV4]: Consolidate common SNMP code	18 years ago
ip6_checksum.h	[IPV6]: Dumb typo in generic csum_ipv6_magic()	18 years ago
ip6_fib.h	[IPv6]: Use rtnl registration interface	18 years ago
ip6_route.h	[IPv6]: Use rtnl registration interface	18 years ago
ip6_tunnel.h	…
ip_fib.h	[IPv4]: Use rtnl registration interface	18 years ago
ip_mp_alg.h	[NET]: Rethink mark field in struct flowi	18 years ago
ip_vs.h	[NET]: ipvs checksum annotations.	18 years ago
ipcomp.h	…
ipconfig.h	…
ipip.h	[IPV6] net/ipv6/sit.c: make 2 functions static	18 years ago
ipv6.h	[IPV6]: Consolidate common SNMP code	18 years ago
ipx.h	[SK_BUFF]: Introduce skb_transport_header(skb)	18 years ago
iw_handler.h	[WEXT]: Clean up how wext is called.	18 years ago
lapb.h	…
llc.h	…
llc_c_ac.h	…
llc_c_ev.h	…
llc_c_st.h	…
llc_conn.h	…
llc_if.h	…
llc_pdu.h	[SK_BUFF]: Introduce skb_network_header()	18 years ago
llc_s_ac.h	…
llc_s_ev.h	…
llc_s_st.h	…
llc_sap.h	…
mip6.h	…
ndisc.h	[IPV6]: Misc endianness annotations.	18 years ago
neighbour.h	[NEIGH]: Use rtnl registration interface	18 years ago
netdma.h	…
netevent.h	…
netlabel.h	NetLabel: convert to an extensibile/sparse category bitmap	18 years ago
netlink.h	[NETLINK]: Possible cleanups.	18 years ago
netrom.h	[PATCH] mark struct file_operations const 1	18 years ago
nexthop.h	…
p8022.h	…
pkt_cls.h	[SK_BUFF]: Convert skb->tail to sk_buff_data_t	18 years ago
pkt_sched.h	[NET_SCHED]: Eliminate qdisc_tree_lock	18 years ago
protocol.h	[INET]: Change protocol field in struct inet_protosw to u16	18 years ago
psnap.h	…
raw.h	…
rawv6.h	[IPV6]: 'info' argument of ipv6 ->err_handler() is net-endian	18 years ago
red.h	[NET_SCHED]: turn PSCHED_GET_TIME into inline function	18 years ago
request_sock.h	[PATCH] slab: remove kmem_cache_t	18 years ago
rose.h	[PATCH] mark struct file_operations const 1	18 years ago
route.h	[IPV4]: Convert ipv4 route to use the new dst_entry 'next' pointer	18 years ago
rtnetlink.h	[NETLINK]: Possible cleanups.	18 years ago
sch_generic.h	[NET_SCHED]: Unline tcf_destroy	18 years ago
scm.h	…
slhc_vj.h	…
snmp.h	…
sock.h	[NET]: Move sk_setup_caps() out of line.	18 years ago
syncppp.h	…
tcp.h	[TCP] FRTO: RFC4138 allows Nagle override when new data must be sent	18 years ago
tcp_ecn.h	[TCP]: Sed magic converts func(sk, tp, ...) -> func(sk, ...)	18 years ago
tcp_states.h	…
timewait_sock.h	[PATCH] slab: remove kmem_cache_t	18 years ago
transp_v6.h	[NET]: Supporting UDP-Lite (RFC 3828) in Linux	18 years ago
udp.h	[NET]: Treat CHECKSUM_PARTIAL as CHECKSUM_UNNECESSARY	18 years ago
udplite.h	[SK_BUFF]: Introduce udp_hdr(), remove skb->h.uh	18 years ago
wext.h	[NET]: Fix networking compilation errors	18 years ago
wireless.h	[WIRELESS] cfg80211: New wireless config infrastructure.	18 years ago
x25.h	[X.25]: Adds /proc/sys/net/x25/x25_forward to control forwarding.	18 years ago
x25device.h	[SK_BUFF]: Introduce skb_reset_mac_header(skb)	18 years ago
xfrm.h	[XFRM]: Restrict upper layer information by bundle.	18 years ago