summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-12-282-0/+2
|\
| * netfilter: xt_CT: recover NOTRACK target supportPablo Neira Ayuso2012-12-241-0/+1
| * netfilter: xt_CT: fix crash while destroy ct templatesPablo Neira Ayuso2012-12-161-0/+1
* | netprio_cgroup: define sk_cgrp_prioidx only if NETPRIO_CGROUP is enabledLi Zefan2012-12-261-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-12-192-0/+8
|\|
| * inet: Fix kmemleak in tcp_v4/6_syn_recv_sock and dccp_v4/6_request_recv_sockChristoph Paasch2012-12-141-0/+1
| * ipv6: Change skb->data before using icmpv6_notify() to propagate redirectDuan Jiong2012-12-141-0/+7
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2012-12-171-0/+2
|\ \ | |/ |/|
| * proc: Usable inode numbers for the namespace file descriptors.Eric W. Biederman2012-11-201-0/+2
| * userns: make each net (net_ns) belong to a user_nsEric W. Biederman2012-11-181-2/+7
| * netns: Deduplicate and fix copy_net_ns when !CONFIG_NET_NSEric W. Biederman2012-11-181-6/+9
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-12-132-2/+2
|\ \
| * | Fix misspellings of "whether" in comments.Adam Buchbinder2012-11-191-1/+1
| * | various: Fix spelling of "registered" in comments.Adam Buchbinder2012-11-191-1/+1
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-12-1244-320/+1315
|\ \
| * | ndisc: Unexport ndisc_{build,send}_skb().YOSHIFUJI Hideaki2012-12-121-15/+0
| * | pkt_sched: avoid requeues if possibleEric Dumazet2012-12-121-0/+7
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-12-111-0/+5
| |\ \
| | * \ Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-nextJohn W. Linville2012-12-111-0/+5
| | |\ \
| | | * | mac80211: introduce IEEE80211_HW_TEARDOWN_AGGR_ON_BAR_FAILStanislaw Gruszka2012-12-051-0/+5
| * | | | net: fix a race in gro_cell_poll()Eric Dumazet2012-12-111-5/+9
| * | | | sctp: Add RCU protection to assoc->transport_addr_listThomas Graf2012-12-071-0/+2
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-12-075-28/+110
| |\| | |
| | * | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-12-063-21/+84
| | |\| |
| | | * | mac80211: Fix typo in mac80211.hSimon Wunderlich2012-12-031-1/+1
| | | * | cfg80211: fix BSS struct IE access racesJohannes Berg2012-11-301-14/+27
| | | * | mac80211: remove probe response temporary buffer allocationJohannes Berg2012-11-301-3/+2
| | | * | nl80211: support P2P GO powersave configurationJohannes Berg2012-11-271-0/+7
| | | * | mac80211: support (partial) VHT radiotap informationJohannes Berg2012-11-272-0/+29
| | | * | cfg80211: rework chandef checking and export itJohannes Berg2012-11-271-3/+18
| | * | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-032-7/+26
| | |\ \ \
| | | * | | Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCSAndrei Emeltchenko2012-12-031-1/+1
| | | * | | Bluetooth: AMP: Check that AMP is present and activeAndrei Emeltchenko2012-12-031-0/+16
| | | * | | Bluetooth: Move double negation to macrosGustavo Padovan2012-12-031-3/+3
| | | * | | Bluetooth: Implement deferred sco socket setupFrédéric Dalleau2012-12-031-3/+6
| * | | | | netconf: advertise mc_forwarding statusNicolas Dichtel2012-12-041-0/+3
| * | | | | Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2012-12-043-7/+18
| |\ \ \ \ \
| | * | | | | netfilter: nf_nat: Handle routing changes in MASQUERADE targetJozsef Kadlecsik2012-12-031-0/+15
| | * | | | | netfilter: kill support for per-af queue backendsFlorian Westphal2012-12-031-6/+2
| | * | | | | netfilter: nf_conntrack: improve nf_conn object traceabilityPablo Neira Ayuso2012-12-031-1/+1
| * | | | | | sctp: Add support to per-association statistics via a new SCTP_GET_ASSOC_STAT...Michele Baldessari2012-12-033-0/+75
| |/ / / / /
| * | | | | net: fix sparse endianness warnings on sock_commonEric Dumazet2012-12-022-4/+5
| * | | | | ipv6: unify logic evaluating inet6_dev's accept_ra propertyShmulik Ladkani2012-12-011-0/+9
| * | | | | net: move inet_dport/inet_num in sock_commonEric Dumazet2012-11-304-32/+56
| * | | | | rtnelink: remove unused parameter from rtnl_create_link().Rami Rosen2012-11-301-1/+1
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2012-11-301-0/+10
| |\ \ \ \ \
| | * | | | | ipv6: improve ipv6_find_hdr() to skip empty routing headersAnsis Atteka2012-11-121-2/+3
| | * | | | | ipv6: Move ipv6_find_hdr() out of Netfilter code.Jesse Gross2012-11-091-0/+9
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-287-91/+412
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-262-63/+173
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |