summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* batman-adv: Update copyright yearsSven Eckelmann2012-02-1739-39/+39
* batman-adv: refactor tt_global_del() to avoid misalignmentSven Eckelmann2012-02-171-20/+22
* batman-adv: convert time_after instances to has_timed_outMarek Lindner2012-02-178-30/+24
* batman-adv: export used routing algorithm via sysfsMarek Lindner2012-02-171-0/+9
* batman-adv: allowing changing the routing algorithm via module parameterMarek Lindner2012-02-171-0/+24
* batman-adv: convert batman iv algorithm to use dynamic infrastructureMarek Lindner2012-02-177-129/+129
* batman-adv: add infrastructure to change routing algorithm at runtimeMarek Lindner2012-02-177-0/+145
* batman-adv: warn if added interface is part of a bridgeMarek Lindner2012-02-171-0/+8
* batman-adv: Move is_out_of_time() to main.h for general useMartin Hundebøll2012-02-172-20/+23
* batman-adv: Rm empty line from is_my_mac() in main.cMartin Hundebøll2012-02-171-1/+0
* batman-adv: simplify bat_ogm_receive API callMarek Lindner2012-02-173-9/+9
* batman-adv: Explicitly mark the common header structureSven Eckelmann2012-02-1710-98/+87
* batman-adv: add tt_initialised flag to the orig_node structAntonio Quartulli2012-02-173-3/+10
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-1729-100/+123
|\
| * openvswitch: Fix multipart datapath dumps.Ben Pfaff2012-01-171-4/+3
| * ipv6: fix per device IP snmp countersEric Dumazet2012-01-171-2/+2
| * inetpeer: initialize ->redirect_genid in inet_getpeer()Dan Carpenter2012-01-171-0/+1
| * net: fix NULL-deref in WARN() in skb_gso_segment()Michał Mirosław2012-01-171-2/+3
| * net: WARN if skb_checksum_help() is called on skb requiring segmentationBen Hutchings2012-01-171-12/+19
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-01-176-12/+28
| |\
| | * mac80211: Fix possible race between sta_unblock and network softirqHelmut Schaa2012-01-171-2/+4
| | * mac80211: fix tx->skb NULL pointer dereferenceYoni Divinsky2012-01-163-9/+22
| | * Net, mac80211: Fix resource leak in ieee80211_rx_h_mesh_fwding()Jesper Juhl2012-01-161-0/+1
| | * mac80211: fix no-op authorized transitionsJohannes Berg2012-01-131-1/+1
| * | caif: Remove bad WARN_ON in caif_devsjur.brandeland@stericsson.com2012-01-171-7/+9
| * | caif: Fix typo in Vendor/Product-ID for CAIF modemssjur.brandeland@stericsson.com2012-01-171-1/+1
| * | net: fix some sparse errorsEric Dumazet2012-01-175-20/+21
| * | net: kill duplicate included headerShan Wei2012-01-173-3/+0
| * | net: Use device model to get driver name in skb_gso_segment()Ben Hutchings2012-01-171-4/+4
| * | bridge: BH already disabled in br_fdb_cleanup()Eric Dumazet2012-01-171-2/+2
| * | net: remove version.h includes in net/openvswitch/Devendra Naga2012-01-174-4/+0
| * | bql: Fix inconsistency between file mode and attr method.Hiroaki SHIMODA2012-01-171-1/+1
| * | netfilter: ipset: dumping error triggered removing references twiceJozsef Kadlecsik2012-01-171-0/+1
| * | netfilter: ipset: autoload set type modules safelyJozsef Kadlecsik2012-01-171-10/+26
| * | netfilter: revert user-space expectation helper supportPablo Neira Ayuso2012-01-163-21/+3
| * | netfilter: xt_hashlimit: fix unused variable warning if IPv6 disabledStephen Rothwell2012-01-161-1/+4
| * | ipv6: release idev when ip6_neigh_lookup failed in icmp6_dst_allocRongQing.Li2012-01-131-0/+1
| |/
* | Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2012-01-147-7/+7
|\ \
| * | security: remove the security_netlink_recv hook as it is equivalent to capable()Eric Paris2012-01-057-7/+7
* | | Merge branch 'for-3.3' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2012-01-145-35/+64
|\ \ \
| * | | svcrpc: don't revert to SVC_POOL_DEFAULT on nfsd shutdownJ. Bruce Fields2012-01-051-1/+0
| * | | svcrpc: fix double-free on shutdown of nfsd after changing pool modeJ. Bruce Fields2012-01-051-0/+3
| * | | NFSd: use network-namespace-aware cache registering routinesStanislav Kinsbursky2011-12-071-0/+2
| * | | SUNRPC: create svc_xprt in proper network namespaceStanislav Kinsbursky2011-12-063-7/+9
| * | | svcrpc: update outdated BKL commentJ. Bruce Fields2011-12-061-2/+2
| * | | svcrpc: avoid memory-corruption on pool shutdownJ. Bruce Fields2011-12-062-20/+38
| * | | svcrpc: destroy server sockets all at onceJ. Bruce Fields2011-12-062-7/+11
| * | | svcrpc: make svc_delete_xprt staticJ. Bruce Fields2011-12-061-1/+2
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-01-133-20/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | libceph: remove useless return value for osd_client __send_request()Sage Weil2012-01-101-15/+6
OpenPOWER on IntegriCloud