John W. Linville e9a68707d7 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem ...

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ipw2x00/ipw2200.c

2010-10-08 15:39:28 -04:00

..

9p

net/9p: Implement TXATTRCREATE 9p call

2010-08-02 14:28:34 -05:00

bluetooth

net: return operator cleanup

2010-09-23 14:33:39 -07:00

caif

caif-driver: Add CAIF-SPI Protocol driver.

2010-06-29 00:08:21 -07:00

irda

net: return operator cleanup

2010-09-23 14:33:39 -07:00

iucv

…

netfilter

netfilter: nf_nat: make unique_tuple return void

2010-08-02 17:20:54 +02:00

netns

ipv6: ip6mr: support multiple tables

2010-05-11 14:40:55 +02:00

phonet

Phonet: Implement Pipe Controller to support Nokia Slim Modems

2010-09-27 21:30:41 -07:00

sctp

net: return operator cleanup

2010-09-23 14:33:39 -07:00

tc_act

net/sched: add ACT_CSUM action to update packets checksums

2010-08-20 01:42:59 -07:00

tipc

net: return operator cleanup

2010-09-23 14:33:39 -07:00

act_api.h

pkt_sched: gen_kill_estimator() rcu fixes

2010-06-11 18:37:08 -07:00

addrconf.h

ipv6: make __ipv6_isatap_ifid static

2010-10-05 00:47:39 -07:00

af_ieee802154.h

…

af_rxrpc.h

…

af_unix.h

af_unix: Allow credentials to work across user and pid namespaces.

2010-06-16 14:58:16 -07:00

ah.h

…

arp.h

arp: remove unnecessary export of arp_broken_ops

2010-09-29 19:45:35 -07:00

atmclip.h

…

ax25.h

…

ax88796.h

…

cfg80211.h

cfg80211: constify WDS address

2010-10-07 14:41:28 -04:00

checksum.h

…

cipso_ipv4.h

…

cls_cgroup.h

cls_cgroup: Fix rcu lockdep warning

2010-09-03 09:55:24 -07:00

compat.h

…

datalink.h

…

dcbnl.h

…

dn_dev.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

dn_fib.h

…

dn_neigh.h

…

dn_nsp.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

dn_route.h

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

dn.h

…

dsa.h

…

dsfield.h

…

dst_ops.h

…

dst.h

net: introduce DST_NOCACHE flag

2010-10-03 22:17:54 -07:00

esp.h

…

ethoc.h

…

fib_rules.h

fib: RCU conversion of fib_lookup()

2010-10-05 20:39:38 -07:00

flow.h

ipv4: Allow configuring subnets as local addresses

2010-09-28 23:38:15 -07:00

garp.h

…

gen_stats.h

…

genetlink.h

genetlink: introduce pre_doit/post_doit hooks

2010-10-05 13:35:30 -04:00

gre.h

PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)

2010-08-21 23:05:39 -07:00

icmp.h

ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h

2010-04-13 14:49:31 -07:00

ieee80211_radiotap.h

…

ieee802154_netdev.h

…

ieee802154.h

…

if_inet6.h

ipv6: Replace inet6_ifaddr->dead with state

2010-05-18 15:36:06 -07:00

inet6_connection_sock.h

net: replace ipfragok with skb->local_df

2010-04-15 23:36:37 -07:00

inet6_hashtables.h

…

inet_common.h

inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()

2010-07-12 20:21:46 -07:00

inet_connection_sock.h

tcp: Add TCP_USER_TIMEOUT socket option.

2010-08-30 13:23:33 -07:00

inet_ecn.h

net: return operator cleanup

2010-09-23 14:33:39 -07:00

inet_frag.h

fragment: add fast path for in-order fragments

2010-06-30 13:44:29 -07:00

inet_hashtables.h

…

inet_sock.h

net - IP_NODEFRAG option for IPv4 socket

2010-06-23 13:16:38 -07:00

inet_timewait_sock.h

net: suppress RCU lockdep false positive in twsk_net()

2010-04-27 12:39:01 -07:00

inetpeer.h

inetpeer: restore small inet_peer structures

2010-06-16 11:55:39 -07:00

ip6_checksum.h

…

ip6_fib.h

net-next: remove useless union keyword

2010-06-10 23:31:35 -07:00

ip6_route.h

net: sk_dst_cache RCUification

2010-04-13 01:41:33 -07:00

ip6_tunnel.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

ip_fib.h

fib: RCU conversion of fib_lookup()

2010-10-05 20:39:38 -07:00

ip_vs.h

ipvs: fix active FTP

2010-09-08 10:39:57 -07:00

ip.h

net: return operator cleanup

2010-09-23 14:33:39 -07:00

ipcomp.h

…

ipconfig.h

…

ipip.h

tunnels: prepare percpu accounting

2010-09-27 21:30:42 -07:00

ipv6.h

net: return operator cleanup

2010-09-23 14:33:39 -07:00

ipx.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

iw_handler.h

…

lapb.h

…

lib80211.h

lib80211: remove unused host_build_iv option

2010-07-26 15:09:04 -04:00

llc_c_ac.h

…

llc_c_ev.h

…

llc_c_st.h

…

llc_conn.h

…

llc_if.h

…

llc_pdu.h

…

llc_s_ac.h

…

llc_s_ev.h

…

llc_s_st.h

…

llc_sap.h

…

llc.h

…

mac80211.h

cfg80211/mac80211: allow per-station GTKs

2010-10-06 16:30:40 -04:00

mip6.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

mld.h

ipv6 mcast: Introduce include/net/mld.h for MLD definitions.

2010-04-23 13:35:55 +09:00

ndisc.h

net: use __packed annotation

2010-06-03 03:21:52 -07:00

neighbour.h

neigh: RCU conversion of struct neighbour

2010-10-06 18:01:33 -07:00

net_namespace.h

…

netdma.h

…

netevent.h

…

netlabel.h

…

netlink.h

net: Fix a typo in netlink.h

2010-06-23 12:58:40 -07:00

netrom.h

…

nexthop.h

…

nl802154.h

…

p8022.h

…

pkt_cls.h

…

pkt_sched.h

net: Define accessors to manipulate QDISC_STATE_RUNNING

2010-06-02 03:23:51 -07:00

protocol.h

…

psnap.h

…

raw.h

include/net/raw.h: Convert raw_seq_private macro to inline

2010-09-08 13:42:22 -07:00

rawv6.h

…

red.h

…

regulatory.h

wireless: only use alpha2 regulatory information from country IE

2010-07-20 16:44:35 -04:00

request_sock.h

…

rose.h

…

route.h

tproxy: check for transparent flag in ip_route_newports

2010-09-27 15:03:33 -07:00

rtnetlink.h

…

sch_generic.h

net: return operator cleanup

2010-09-23 14:33:39 -07:00

scm.h

scm: Capture the full credentials of the scm sender.

2010-06-16 14:55:56 -07:00

slhc_vj.h

…

snmp.h

snmp: 64bit ipstats_mib for all arches

2010-06-30 13:31:19 -07:00

sock.h

net: update SOCK_MIN_RCVBUF

2010-09-26 18:53:07 -07:00

stp.h

…

tcp_states.h

…

tcp.h

tcp: tcp_enter_quickack_mode can be static

2010-09-29 19:45:36 -07:00

timewait_sock.h

…

transp_v6.h

IPv6: Add dontfrag argument to relevant functions

2010-04-23 23:35:28 -07:00

udp.h

udp: add rehash on connect()

2010-09-08 21:45:01 -07:00

udplite.h

…

wext.h

…

wimax.h

…

wpan-phy.h

…

x25.h

X25: Move accept approve flag to bitfield

2010-05-17 17:39:27 -07:00

x25device.h

X25: Add if_x25.h and x25 to device identifiers

2010-04-22 16:12:36 -07:00

xfrm.h

xfrm: Allow different selector family in temporary state

2010-09-20 11:11:38 -07:00