summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-125-27/+82
|\
| * Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2012-06-113-5/+15
| |\
| | * NFC: Introduce target mode rx data callbackSamuel Ortiz2012-06-041-0/+1
| | * NFC: Introduce target mode tx opsSamuel Ortiz2012-06-041-1/+2
| | * NFC: Set the NFC device RF mode appropriatelySamuel Ortiz2012-06-041-1/+1
| | * NFC: Add target mode activation netlink eventSamuel Ortiz2012-06-041-0/+4
| | * NFC: Add target mode protocols to the polling loop startup routineSamuel Ortiz2012-06-043-3/+6
| | * NFC: Export LLCP general bytes getterSamuel Ortiz2012-06-041-0/+1
| * | mac80211: unify SW/offload remain-on-channelJohannes Berg2012-06-061-3/+0
| * | mac80211: do remain-on-channel while idleJohannes Berg2012-06-061-1/+7
| * | cfg80211: clarify set_channel APIsJohannes Berg2012-06-061-9/+15
| * | cfg80211: provide channel to join_mesh functionJohannes Berg2012-06-051-0/+4
| * | cfg80211: provide channel to start_ap functionJohannes Berg2012-06-051-1/+11
| * | cfg80211: simplify cfg80211_can_beacon_sec_chan APIJohannes Berg2012-06-051-1/+4
| * | mac80211: remove ieee80211_get_operstate()Eliad Peller2012-06-051-10/+0
| * | net: mac80211: Add and use ibss_vdbg debugging macroJoe Perches2012-06-051-0/+11
| * | net: mac80211: Add and use ht_vdbg debugging macroJoe Perches2012-06-051-0/+13
| * | mac80211: allow low-level drivers to set netdev feature bitsArik Nemtsov2012-06-051-0/+5
| |/
* | inet: Fix BUG triggered by __rt{,6}_get_peer().David S. Miller2012-06-112-2/+2
* | Merge branch 'master' of git://1984.lsi.us.es/net-nextDavid S. Miller2012-06-114-18/+74
|\ \
| * | netfilter: nf_conntrack: add namespace support for cttimeoutGao feng2012-06-071-1/+2
| * | netfilter: nf_conntrack: remove now unused sysctl for nf_conntrack_l[3|4]protoPablo Neira Ayuso2012-06-072-12/+0
| * | netfilter: nf_ct_icmp: add namespace supportGao feng2012-06-071-0/+1
| * | netfilter: nf_ct_icmp: add namespace supportGao feng2012-06-071-0/+6
| * | netfilter: nf_ct_udp: add namespace supportGao feng2012-06-071-0/+12
| * | netfilter: nf_ct_tcp: add namespace supportGao feng2012-06-071-0/+10
| * | netfilter: nf_ct_generic: add namespace supportGao feng2012-06-072-2/+8
| * | netfilter: nf_conntrack: prepare namespace support for l3 protocol trackersGao feng2012-06-072-2/+15
| * | netfilter: nf_conntrack: prepare namespace support for l4 protocol trackersGao feng2012-06-072-2/+21
| |/
* | inet: Avoid potential NULL peer dereference.David S. Miller2012-06-111-1/+1
* | inet: Add inetpeer tree roots to the FIB tables.David S. Miller2012-06-112-5/+8
* | inet: Add family scope inetpeer flushes.David S. Miller2012-06-111-0/+2
* | ipv4: Kill ip_rt_frag_needed().David S. Miller2012-06-111-2/+0
* | inet: Hide route peer accesses behind helpers.David S. Miller2012-06-114-8/+126
* | inet: Pass inetpeer root into inet_getpeer*() interfaces.David S. Miller2012-06-091-5/+5
* | inet: Consolidate inetpeer_invalidate_tree() interfaces.David S. Miller2012-06-091-2/+1
* | inet: Initialize per-netns inetpeer roots in net/ipv{4,6}/route.cDavid S. Miller2012-06-091-0/+9
* | [PATCH] tcp: Cache inetpeer in timewait socket, and only when necessary.David S. Miller2012-06-092-9/+0
* | tcp: Get rid of inetpeer special cases.David S. Miller2012-06-092-2/+2
* | inet: Create and use rt{,6}_get_peer_create().David S. Miller2012-06-082-6/+25
* | af_unix: speedup /proc/net/unixEric Dumazet2012-06-081-1/+2
* | inetpeer: add parameter net for inet_getpeer_v4,v6Gao feng2012-06-081-4/+8
* | inetpeer: add namespace support for inetpeerGao feng2012-06-083-5/+8
* | inetpeer: fix a race in inetpeer_gc_worker()Eric Dumazet2012-06-061-1/+4
|/
* cipso: handle CIPSO options correctly when NetLabel is disabledPaul Moore2012-06-011-1/+28
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-05-311-0/+1
|\
| * ipv6: fix incorrect ipsec fragmentGao feng2012-05-271-0/+1
* | memcg: decrement static keys at real destroy timeGlauber Costa2012-05-291-0/+22
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-05-2411-72/+184
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-nextJohn W. Linville2012-05-2211-72/+184
| |\
OpenPOWER on IntegriCloud