summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2012-06-1725-144/+1116
|\
| * netfilter: add user-space connection tracking helper infrastructurePablo Neira Ayuso2012-06-166-25/+768
| * netfilter: ctnetlink: add CTA_HELP_INFO attributePablo Neira Ayuso2012-06-161-5/+18
| * netfilter: nfnetlink_queue: add NAT TCP sequence adjustment if packet mangledPablo Neira Ayuso2012-06-163-8/+28
| * netfilter: add glue code to integrate nfnetlink_queue and ctnetlinkPablo Neira Ayuso2012-06-163-1/+195
| * netfilter: nf_ct_helper: implement variable length helper private dataPablo Neira Ayuso2012-06-1614-73/+92
| * netfilter: nf_ct_ext: support variable length extensionsPablo Neira Ayuso2012-06-161-7/+9
| * netfilter: nf_ct_helper: allocate 16 bytes for the helper and policy namesPablo Neira Ayuso2012-06-165-29/+10Star
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-162-22/+12Star
|\ \
| * | Revert "ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ip...David S. Miller2012-06-162-22/+12Star
* | | ipv6: Fix types of ip6_update_pmtu().David S. Miller2012-06-161-2/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-166-47/+33Star
|\| |
| * | ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ipv6_routeThomas Graf2012-06-162-12/+22
| * | net: remove skb_orphan_try()Eric Dumazet2012-06-163-26/+1Star
| * | netpoll: fix netpoll_send_udp() bugsEric Dumazet2012-06-141-5/+6
* | | ipv6: Handle PMTU in ICMP error handlers.David S. Miller2012-06-159-118/+50Star
* | | ipv4: Handle PMTU in all ICMP error handlers.David S. Miller2012-06-1510-12/+68
* | | dcbnl: Use BUG_ON() instead of BUG()Thomas Graf2012-06-141-4/+1Star
* | | dcbnl: Silence harmless gcc warning about uninitialized reply_nlhThomas Graf2012-06-141-1/+1
* | | dcbnl: Use type safe nlmsg_data()Thomas Graf2012-06-141-1/+1
* | | dcbnl: Move dcb app allocation into dcb_app_add()Thomas Graf2012-06-141-25/+22Star
* | | dcbnl: Move dcb app lookup code into dcb_app_lookup()Thomas Graf2012-06-141-46/+35Star
* | | dcbnl: Return consistent error codesThomas Graf2012-06-141-135/+138
* | | dcbnl: Use dcbnl_newmsg() where possibleThomas Graf2012-06-141-14/+2Star
* | | dcbnl: Remove now unused dcbnl_reply()Thomas Graf2012-06-141-37/+0Star
* | | dcbnl: Shorten all command handling functionsThomas Graf2012-06-141-550/+172Star
* | | dcbnl: Prepare framework to shorten handling functionsThomas Graf2012-06-141-0/+71
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-1315-53/+71
|\| |
| * | Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-06-132-34/+43
| |\ \
| | * | netfilter: nf_ct_h323: fix bug in rtcp nattingPablo Neira Ayuso2012-06-071-3/+2Star
| | * | netfilter: xt_HMARK: fix endianness and provide consistent hashingHans Schillstrom2012-06-071-31/+41
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-112-1/+4
| |\ \ \
| | * | | mac80211: add back channel change flagStanislaw Gruszka2012-06-081-1/+1
| | * | | NFC: Fix possible NULL ptr deref when getting the name of a socketSasha Levin2012-06-081-0/+3
| * | | | net/core: fix kernel-doc warningsRandy Dunlap2012-06-092-3/+3
| * | | | l2tp: fix a race in l2tp_ip_sendmsg()Eric Dumazet2012-06-081-3/+6
| * | | | snmp: fix OutOctets counter to include forwarded datagramsVincent Bernat2012-06-074-0/+5
| * | | | appletalk: Remove out of date message in printkDave Jones2012-06-071-3/+1Star
| * | | | ipv6: fib: Restore NTF_ROUTER exception in fib6_age()Thomas Graf2012-06-071-1/+1
| * | | | net: neighbour: fix neigh_dump_info()Eric Dumazet2012-06-071-8/+6Star
| * | | | net: l2tp_eth: fix kernel panic on rmmod l2tp_ethEric Dumazet2012-06-071-0/+2
| | |/ / | |/| |
* | | | ethtool: Make more commands available to unprivileged processesBen Hutchings2012-06-131-0/+5
* | | | net-next: add dev_loopback_xmit() to avoid duplicate codeMichel Machado2012-06-133-29/+20Star
| |_|/ |/| |
* | | ipv4: Add interface option to enable routing of 127.0.0.0/8Thomas Graf2012-06-133-11/+27
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-06-1246-1633/+1644
|\ \ \
| * \ \ Merge tag 'nfc-next-3.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2012-06-1110-264/+530
| |\ \ \
| | * | | NFC: Destroy LLCP timout workqueue when releasing the linkSamuel Ortiz2012-06-041-0/+1
| | * | | NFC: Switch to Initiator mode when getting NFC_ATTR_PROTOCOLSSamuel Ortiz2012-06-041-2/+2
| | * | | NFC: Send a receiver ready frame only to reply to an I frameSamuel Ortiz2012-06-041-1/+1
| | * | | NFC: Requeue lost LLCP framesSamuel Ortiz2012-06-041-31/+55