aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-07-201-2/+6
|\
| * ipmr: Don't leak memory if fib lookup fails.Ben Greear2010-07-151-2/+6
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-06-111-1/+3
|\ \ | |/
| * ipmr: dont corrupt listsEric Dumazet2010-06-071-1/+3
* | net-next: remove useless union keywordChangli Gao2010-06-101-4/+4
|/
* ipmr: off by one in __ipmr_fill_mroute()Dan Carpenter2010-05-261-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-05-201-275/+650
|\
| * net: Remove unnecessary returns from void function()sJoe Perches2010-05-171-1/+0
| * net: Introduce skb_tunnel_rx() helperEric Dumazet2010-05-171-5/+3
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-05-121-1/+2
| |\
| * \ Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-05-101-14/+96
| |\ \
| | * | net: ipmr: add support for dumping routing tables over netlinkPatrick McHardy2010-04-261-7/+89
| | * | net: rtnetlink: decouple rtnetlink address families from real address familiesPatrick McHardy2010-04-261-1/+1
| | * | net: fib_rules: mark arguments to fib_rules_register const and __net_initdataPatrick McHardy2010-04-261-1/+1
| | * | net: Fix various endianness glitchesEric Dumazet2010-04-201-5/+5
| * | | Merge branch 'master' of /repos/git/net-next-2.6Patrick McHardy2010-04-201-263/+566
| |\ \ \ | | |/ /
| | * | ipv4: ipmr: fix NULL pointer deref during unres queue destructionPatrick McHardy2010-04-151-1/+5
| | * | ipv4: ipmr: fix invalid cache resolving when adding a non-matching entryPatrick McHardy2010-04-151-1/+3
| | * | ipv4: ipmr: support multiple tablesPatrick McHardy2010-04-131-61/+338
| | * | ipv4: ipmr: move mroute data into seperate structurePatrick McHardy2010-04-131-170/+199
| | * | ipv4: ipmr: convert struct mfc_cache to struct list_headPatrick McHardy2010-04-131-64/+61
| | * | ipv4: ipmr: remove net pointer from struct mfc_cachePatrick McHardy2010-04-131-33/+32
| | * | ipv4: ipmr: move unres_queue and timer to per-namespace dataPatrick McHardy2010-04-131-41/+29
| * | | netfilter: ipv4: use NFPROTO values for NF_HOOK invocationJan Engelhardt2010-03-251-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-05-201-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into for-nextJiri Kosina2010-04-231-4/+11
| |\ \ \ | | | |/ | | |/|
| * | | Fix comment and Kconfig typos for 'require' and 'fragment'Gilles Espinasse2010-03-291-1/+1
| | |/ | |/|
* | | IPv4: unresolved multicast route cleanupAndreas Meissner2010-05-101-1/+2
| |/ |/|
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-301-0/+1
* | net: ipmr/ip6mr: prevent out-of-bounds vif_table accessNicolas Dichtel2010-03-271-4/+7
* | net: ipmr/ip6mr: fix potential out-of-bounds vif_table accessPatrick McHardy2010-03-191-0/+3
|/
* ipmr: remove useless checks from ipmr_device_eventPavel Emelyanov2010-02-171-3/+0
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-11-171-1/+3
|\
| * ipmr: missing dev_put() on error path in vif_add()Dan Carpenter2009-11-131-1/+3
* | ipmr: Optimize multiple unregistrationEric Dumazet2009-10-291-5/+10
* | inet: rename some inet_sock fieldsEric Dumazet2009-10-181-1/+1
* | add vif using local interface index instead of IPIlia K2009-10-071-1/+11
|/
* net: Make setsockopt() optlen be unsigned.David S. Miller2009-09-301-1/+1
* net: constify struct net_protocolAlexey Dobriyan2009-09-141-5/+1
* netdev: convert pseudo-devices to netdev_tx_tStephen Hemminger2009-09-011-1/+1
* net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functionsPatrick McHardy2009-07-051-1/+1
* PIM-SM: namespace changesTom Goff2009-06-141-12/+17
* net: skb->dst accessorsEric Dumazet2009-06-031-7/+6
* net: skb->rtable accessorEric Dumazet2009-06-031-3/+3
* ipmr: use goto to common label instead of opencodingIlpo Järvinen2009-02-061-2/+1
* netns: ipmr: enable namespace support in ipv4 multicast routing codeBenjamin Thery2009-01-221-108/+135
* netns: ipmr: declare ipmr /proc/net entries per-namespaceBenjamin Thery2009-01-221-39/+62
* netns: ipmr: declare reg_vif_num per-namespaceBenjamin Thery2009-01-221-10/+12
* netns: ipmr: declare mroute_do_assert and mroute_do_pim per-namespaceBenjamin Thery2009-01-221-13/+11
* netns: ipmr: declare counter cache_resolve_queue_len per-namespaceBenjamin Thery2009-01-221-18/+21