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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits)
  decnet: Fix compiler warning in dn_dev.c
  IPV6: Fix default gateway criteria wrt. HIGH/LOW preference radv option
  net/802/fc.c: Fix compilation warnings
  netns: correct mib stats in ip6_route_me_harder()
  netns: fix net_generic array leak
  rt2x00: fix regression introduced by "mac80211: free up 2 bytes in skb->cb"
  rtl8187: Add USB ID for Belkin F5D7050 with RTL8187B chip
  p54usb: Device ID updates
  mac80211: fixme for kernel-doc
  ath9k/mac80211: disallow fragmentation in ath9k, report to userspace
  libertas : Remove unused variable warning for "old_channel" from cmd.c
  mac80211: Fix scan RX processing oops
  orinoco: fix unsafe locking in spectrum_cs_suspend
  orinoco: fix unsafe locking in orinoco_cs_resume
  cfg80211: fix debugfs error handling
  mac80211: fix debugfs netdev rename
  iwlwifi: fix ct kill configuration for 5350
  mac80211: fix HT information element parsing
  p54: Fix compilation problem on PPC
  mac80211: fix debugfs lockup
  ...

2008-10-16 11:26:26 -07:00

..

9p

include: replace __FUNCTION__ with __func__

2008-10-16 11:21:30 -07:00

bluetooth

include: replace __FUNCTION__ with __func__

2008-10-16 11:21:30 -07:00

irda

include: replace __FUNCTION__ with __func__

2008-10-16 11:21:30 -07:00

iucv

[AF_IUCV]: postpone receival of iucv-packets

2007-10-10 16:54:51 -07:00

netfilter

netfilter: ctnetlink: remove bogus module dependency between ctnetlink and nf_nat

2008-10-14 11:58:31 -07:00

netns

ipv6: making ip and icmp statistics per/namespace

2008-10-08 11:16:45 -07:00

phonet

Phonet: implement GPRS virtual interface over PEP socket

2008-10-05 11:16:16 -07:00

sctp

include: replace __FUNCTION__ with __func__

2008-10-16 11:21:30 -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

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -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

[PATCH] f_count may wrap around

2008-07-26 20:53:40 -04: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

[ATM]: Annotations.

2006-12-02 21:22:55 -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 93cx6 eeprom support

2007-10-10 16:53:56 -07:00

cfg80211.h

cfg80211: show interface type

2008-09-24 16:18:00 -04:00

checksum.h

[NET]: Move netfilter checksum helpers to net/core/utils.c

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

cipso_ipv4.h

cipso: Add support for native local labeling and fixup mapping names

2008-10-10 10:16:34 -04:00

compat.h

net: Use standard structures for generic socket address structures.

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

datalink.h

…

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

[NET]: Wrap netdevice hardware header creation.

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

dn.h

[DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h

2007-07-10 23:02:12 -07:00

dsa.h

dsa: add support for Trailer tagging format

2008-10-08 17:24:16 -07:00

dsfield.h

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

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

dst.h

net: Kill plain NET_XMIT_BYPASS.

2008-08-04 23:04:08 -07:00

esp.h

[IPSEC]: Use crypto_aead and authenc in ESP

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

fib_rules.h

net: add fib_rules_ops to flush_cache method

2008-07-05 19:01:28 -07:00

flow.h

ipv4: Loosen source address check on IPv4 output

2008-10-01 07:28:28 -07:00

garp.h

vlan: Add GVRP support

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

gen_stats.h

[NET_SCHED]: Convert packet schedulers from rtnetlink to new netlink API

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

genetlink.h

netlink: Improve returned error codes

2008-06-03 16:36:54 -07:00

icmp.h

mib: put icmpmsg statistics on struct net

2008-07-18 04:04:22 -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

include: use get/put_unaligned_* helpers

2008-07-25 10:53:26 -07:00

ieee80211.h

include: replace __FUNCTION__ with __func__

2008-10-16 11:21:30 -07:00

if_inet6.h

ipv6: make struct ipv6_devconf static

2008-07-22 14:21:58 -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

inet: Don't lookup the socket if there's a socket attached to the skb

2008-10-07 12:41:01 -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

[IPV6]: Use appropriate sock tclass setting for routing lookup.

2008-04-13 23:40:51 -07:00

inet_frag.h

[NET]: Rename inet_frag.h identifiers COMPLETE, FIRST_IN, LAST_IN to INET_FRAG_*

2008-03-28 16:35:27 -07:00

inet_hashtables.h

inet: Don't lookup the socket if there's a socket attached to the skb

2008-10-07 12:41:01 -07:00

inet_sock.h

tcp: Port redirection support for TCP

2008-10-01 07:46:49 -07:00

inet_timewait_sock.h

ipv4: Implement IP_TRANSPARENT socket option

2008-10-01 07:30:02 -07: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

netns: Add network namespace argument to rt6_fill_node() and ipv6_dev_get_saddr()

2008-08-14 15:33:21 -07:00

ip6_tunnel.h

net: remove CVS keywords

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

ip_fib.h

[IPV4]: Fix compile error building without CONFIG_FS_PROC

2008-02-05 02:54:16 -08:00

ip_vs.h

include: replace __FUNCTION__ with __func__

2008-10-16 11:21:30 -07:00

ip.h

sysctl: simplify ->strategy

2008-10-16 11:21:47 -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

inet: Make tunnel RX/TX byte counters more consistent

2008-10-09 12:03:17 -07:00

ipv6.h

ipv6: making ip and icmp statistics per/namespace

2008-10-08 11:16:45 -07:00

ipx.h

[SK_BUFF]: Introduce skb_transport_header(skb)

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

iw_handler.h

wext: Emit event stream entries correctly when compat.

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

lapb.h

…

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: fixme for kernel-doc

2008-10-14 21:12:37 -04:00

mip6.h

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

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

ndisc.h

sysctl: simplify ->strategy

2008-10-16 11:21:47 -07:00

neighbour.h

core: add stat to track unresolved discards in neighbor cache

2008-07-16 20:50:49 -07:00

net_namespace.h

netfilter: netns nf_conntrack: add netns boilerplate

2008-10-08 11:35:02 +02:00

netdma.h

Remove all inclusions of <linux/config.h>

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

netevent.h

[NET]: Remove unnecessary inclusion of dst.h

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

netlabel.h

netlabel: Add configuration support for local labeling

2008-10-10 10:16:34 -04:00

netlink.h

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

2008-10-01 06:12:56 -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

…

pkt_cls.h

[PKT_SCHED]: Pass real namespace in net scheduler classifiers.

2008-03-27 16:53:37 -07:00

pkt_sched.h

pkt_sched: Remove the tx queue state check in qdisc_run()

2008-09-23 01:05:56 -07:00

protocol.h

[NETNS]: Drop packets in the non-initial namespace on the per/protocol basis.

2008-03-24 15:33:00 -07:00

psnap.h

…

raw.h

[RAW]: Add raw_hashinfo member on struct proto.

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

rawv6.h

[IPv6] RAW: Compact the API for the kernel

2008-01-28 14:54:29 -08:00

red.h

[NET_SCHED]: turn PSCHED_GET_TIME into inline function

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

request_sock.h

tcp: Fix kernel panic when calling tcp_v(4/6)_md5_do_lookup

2008-08-06 23:50:04 -07:00

rose.h

rose: improving AX25 routing frames via ROSE network

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

route.h

ipv4: Conditionally enable transparent flow flag when connecting

2008-10-01 07:35:39 -07:00

rtnetlink.h

[RTNL]: Introduce the rtnl_kill_links helper.

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

sch_generic.h

pkt_sched: Fix handling of gso skbs on requeuing

2008-10-06 09:54:39 -07:00

scm.h

pid namespaces: changes to show virtual ids to user

2007-10-19 11:53:40 -07:00

slhc_vj.h

…

snmp.h

net: remove CVS keywords

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

sock.h

net: wrap sk->sk_backlog_rcv()

2008-10-07 14:18:42 -07:00

stp.h

net: Add STP demux layer

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

syncppp.h

Remove bogus variables from syncppp.[ch]

2008-07-23 23:00:31 +02:00

tcp_states.h

…

tcp.h

net: wrap sk->sk_backlog_rcv()

2008-10-07 14:18:42 -07:00

timewait_sock.h

[PATCH] slab: remove kmem_cache_t

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

transp_v6.h

net: change proto destroy method to return void

2008-06-14 17:04:49 -07:00

udp.h

netns: make uplitev6 mib per/namespace

2008-10-07 14:50:06 -07:00

udplite.h

[UDP]: Revert udplite and code split.

2008-03-06 16:22:02 -08:00

wext.h

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

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

wireless.h

cfg80211: show interface type

2008-09-24 16:18:00 -04: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: MIGRATE enhancements (draft-ebalard-mext-pfkey-enhanced-migrate)

2008-10-05 13:33:42 -07:00