summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* sections: fix section conflicts in netAndi Kleen2012-10-066-6/+6
* sections: fix section conflicts in net/canAndi Kleen2012-10-064-4/+4
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-10-026-70/+83
|\
| * make get_file() return its argumentAl Viro2012-09-262-4/+2
| * new helper: iterate_fd()Al Viro2012-09-261-26/+12
| * unexport sock_map_fd(), switch to sock_alloc_file()Al Viro2012-09-263-17/+30
| * take descriptor handling from sock_alloc_file() to callersAl Viro2012-09-261-22/+40
* | workqueue: avoid using deprecated functionsLinus Torvalds2012-10-025-18/+18
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-10-02348-7791/+14603
|\ \
| * | igmp: export symbol ip_mc_leave_groupstephen hemminger2012-10-011-0/+1
| * | netlink: add attributes to fdb interfacestephen hemminger2012-10-013-4/+7
| * | gre: fix sparse warningstephen hemminger2012-10-011-2/+2
| * | net/key/af_key.c: add range checks on ->sadb_x_policy_lenDan Carpenter2012-10-011-0/+3
| * | ipv4: gre: add GRO capabilityEric Dumazet2012-10-011-2/+11
| * | net: add gro_cells infrastructureEric Dumazet2012-10-011-0/+2
| * | tcp: gro: add checksuming helpersEric Dumazet2012-10-012-6/+33
| * | ipv6: del unreachable route when an addr is deleted on loNicolas Dichtel2012-10-011-2/+8
| * | use skb_end_offset() in skb_try_coalesce()Weiping Pan2012-10-011-2/+1
| * | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-09-3047-919/+1849
| |\ \
| | * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-09-2847-919/+1849
| | |\ \
| | | * | NFC: Fix sleeping in atomic when releasing socketSzymon Janc2012-09-271-5/+5
| | | * | NFC: Fix sleeping in invalid context when netlink socket is closedSzymon Janc2012-09-271-7/+39
| | | * | NFC: Add dummy nfc_llc_shdlc_register definitionJohn W. Linville2012-09-271-0/+8
| | | * | NFC: LLCP raw socket supportThierry Escande2012-09-274-4/+137
| | | * | NFC: Use dynamic initialization for rwlocksSzymon Janc2012-09-271-2/+2
| | | * | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-09-2511-30/+82
| | | |\ \
| | | | * | cfg80211: Fix regulatory check for 60GHz band frequenciesVladimir Kondratiev2012-09-251-5/+14
| | | | * | rfkill: prevent unnecessary event generationVitaly Wool2012-09-241-1/+7
| | | | * | mac80211: don't send delBA on addBA failureJohannes Berg2012-09-211-1/+1
| | | | * | mac80211: don't send delBA when removing stationsJohannes Berg2012-09-211-1/+1
| | | | * | mac80211: don't send delBA before disassocJohannes Berg2012-09-211-1/+1
| | | | * | mac80211: fix IBSS auth TX debug messageSylvain Roger Rieunier2012-09-201-1/+1
| | | | * | cfg80211: constify name parameter to add_virtual_intfJohannes Berg2012-09-191-1/+2
| | | | * | mac80211: make reset debugfs depend on CONFIG_PMJohannes Berg2012-09-191-0/+4
| | | | * | cfg80211/nl80211: Notify connection request failure in AP modePandiyarajan Pitchaimuthu2012-09-183-0/+50
| | | | * | wireless: remove unreachable codeAlan Cox2012-09-181-19/+1
| | | * | | NFC: Fix typo negociating -> negotiatingWaldemar Rymarkiewicz2012-09-251-5/+5
| | | * | | NFC: Don't handle consequent RSET frames after UAWaldemar Rymarkiewicz2012-09-251-7/+31
| | | * | | NFC: Handle RSET in SHDLC_CONNECTING stateWaldemar Rymarkiewicz2012-09-251-1/+2
| | | * | | NFC: Add HCI module descriptionEric Lapuyade2012-09-251-0/+1
| | | * | | NFC: Fix LLC registration definitions for ANSI complianceEric Lapuyade2012-09-252-2/+2
| | | * | | NFC: Remove unneeded LLC symbols exportSamuel Ortiz2012-09-253-17/+1
| | | * | | NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC CoreEric Lapuyade2012-09-254-1009/+123
| | | * | | NFC: Add an shdlc llc module to llc coreEric Lapuyade2012-09-254-2/+851
| | | * | | NFC: Add a nop (passthrough) llc module to llc coreEric Lapuyade2012-09-254-2/+105
| | | * | | NFC: Add an LLC Core layer to HCIEric Lapuyade2012-09-254-1/+241
| | | * | | NFC: Modified hci_transceive to become an asynchronous operationEric Lapuyade2012-09-252-20/+42
| | | * | | NFC: Add a public nfc_hci_send_cmd_async methodEric Lapuyade2012-09-251-1/+33
| | | * | | NFC: Changed the HCI cmd execution callback prototypeEric Lapuyade2012-09-254-24/+21
| | | * | | NFC: Correct outgoing frame before requeueingWaldemar Rymarkiewicz2012-09-251-2/+1