summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-01-1547-243/+552
|\
| * Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2013-01-154-14/+28
| |\
| | * netfilter: x_tables: print correct hook names for ARPJan Engelhardt2013-01-131-8/+20
| | * netfilter: nf_conntrack: fix BUG_ON while removing nf_conntrack with netnsPablo Neira Ayuso2013-01-122-4/+6
| | * netfilter: xt_CT: fix unset return value if conntrack zone are disabledPablo Neira Ayuso2013-01-101-2/+2
| * | tcp: fix a panic on UP machines in reqsk_fastopen_removeEric Dumazet2013-01-151-2/+0Star
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-01-1417-115/+237
| |\ \
| | * | net, wireless: overwrite default_ethtool_opsStanislaw Gruszka2013-01-122-2/+9
| | * | tcp: accept RST without ACK flagEric Dumazet2013-01-111-2/+2
| | * | ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]Romain Kuntz2013-01-101-14/+11Star
| | * | ipv6: fix the noflags test in addrconf_get_prefix_routeRomain Kuntz2013-01-101-1/+1
| | * | tcp: fix splice() and tcp collapsing interactionEric Dumazet2013-01-101-3/+10
| | * | tcp: splice: fix an infinite loop in tcp_read_sock()Eric Dumazet2013-01-101-1/+1
| | |/
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-01-0911-91/+202
| | |\
| | | * mac80211: fix maximum MTUChaitanya2013-01-031-10/+1Star
| | | * mac80211: fix dtim_period in hidden SSID AP associationJohannes Berg2013-01-033-37/+55
| | | * mac80211: use del_timer_sync for final sta cleanup timer deletionJohannes Berg2013-01-031-1/+1
| | | * mac80211: fix station destruction in AP/mesh modesJohannes Berg2013-01-034-17/+62
| | | * mac80211: RMC buckets are just list headsThomas Pedersen2013-01-032-5/+5
| | | * mac80211: assign VLAN channel contextsJohannes Berg2013-01-033-3/+45
| | | * mac80211: flush AP_VLAN stations when tearing down the BSS APFelix Fietkau2013-01-031-0/+2
| | | * mac80211: fix ibss scanningStanislaw Gruszka2013-01-033-18/+31
| | * | net: prevent setting ttl=0 via IP_TTLCong Wang2013-01-091-1/+1
| * | | Merge tag 'nfs-for-3.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-01-112-4/+11
| |\ \ \
| | * | | SUNRPC: Ensure we release the socket write lock if the rpc_task exits earlyTrond Myklebust2013-01-082-4/+11
| * | | | nfs: fix sunrpc/clnt.c kernel-doc warningsRandy Dunlap2013-01-101-1/+1
| * | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2013-01-101-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | s390/irq: remove split irq fields from /proc/statHeiko Carstens2013-01-081-1/+1
| | |/ /
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-01-0820-68/+221
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2013-01-083-31/+28Star
| | |\ \
| | | * | netfilter: xt_recent: avoid high order page allocationsEric Dumazet2013-01-041-5/+18
| | | * | netfilter: fix missing dependencies for the NOTRACK targetPablo Neira Ayuso2013-01-041-0/+3
| | | * | netfilter: ip6t_NPT: fix IPv6 NTP checksum calculationUlrich Weber2013-01-041-26/+7Star
| | * | | ipv4: fix NULL checking in devinet_ioctl()Xi Wang2013-01-071-1/+1
| | * | | net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.Philippe De Muyter2013-01-051-2/+6
| | * | | mac802154: fix NOHZ local_softirq_pending 08 warningAlexander Aring2013-01-041-1/+1
| | |/ /
| | * | bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.Rami Rosen2013-01-031-0/+6
| | * | bridge: Correctly unregister MDB rtnetlink handlersVlad Yasevich2013-01-032-3/+12
| | * | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-12-2813-30/+167
| | |\ \
| | | * | netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expectJesper Juhl2012-12-261-1/+1
| | | * | netfilter: xt_hashlimit: fix namespace destroy pathVitaly E. Lavrov2012-12-261-4/+25
| | | * | netfilter: xt_recent: fix namespace destroy pathVitaly E. Lavrov2012-12-261-4/+16
| | | * | netfilter: xt_hashlimit: fix race that results in duplicated entriesPablo Neira Ayuso2012-12-261-4/+21
| | | * | netfilter: xt_CT: recover NOTRACK target supportPablo Neira Ayuso2012-12-242-1/+53
| | | * | netfilter: nfnetlink_log: fix possible compilation issue due to missing includePablo Neira Ayuso2012-12-171-0/+1
| | | * | netfilter: xt_CT: fix crash while destroy ct templatesPablo Neira Ayuso2012-12-162-0/+10
| | | * | netfilter: nfnetlink_log: fix mac address for 6in4 tunnelsBob Hockney2012-12-161-3/+12
| | | * | netfilter: nf_ct_reasm: fix conntrack reassembly expire codeHaibo Xi2012-12-161-1/+4
| | | * | netfilter: nf_conntrack_ipv6: fix comment for packets without dataFlorent Fourcot2012-12-161-2/+2
| | | * | netfilter: nf_nat: Also handle non-ESTABLISHED routing changes in MASQUERADEAndrew Collins2012-12-162-10/+20