summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2014-01-0614-212/+463
|\
| * ovs: make functions localStephen Hemminger2014-01-064-6/+7
| * openvswitch: Compute checksum in skb_gso_segment() if neededThomas Graf2014-01-061-1/+1
| * openvswitch: Use skb_zerocopy() for upcallThomas Graf2014-01-061-8/+29
| * openvswitch: Pass datapath into userspace queue functionsThomas Graf2014-01-061-20/+14
| * openvswitch: Drop user features if old user space attempted to create datapathThomas Graf2014-01-061-0/+21
| * openvswitch: Allow user space to announce ability to accept unaligned Netlink...Thomas Graf2014-01-062-0/+16
| * net: Export skb_zerocopy() to zerocopy from one skb to anotherThomas Graf2014-01-062-55/+89
| * openvswitch: remove duplicated include from flow_table.cWei Yongjun2014-01-061-2/+0
| * net: ovs: use kfree_rcu instead of rcu_free_{sw_flow_mask_cb,acts_callback}Daniel Borkmann2014-01-062-17/+2
| * openvswitch: Per cpu flow stats.Pravin B Shelar2014-01-067-55/+210
| * openvswitch: Enable memory mapped Netlink i/oThomas Graf2014-01-061-27/+29
| * netlink: Avoid netlink mmap alloc if msg size exceeds frame sizeThomas Graf2014-01-061-0/+4
| * genl: Add genlmsg_new_unicast() for unicast message allocationThomas Graf2014-01-061-0/+21
| * openvswitch: Silence RCU lockdep checks from flow lookup.Jesse Gross2014-01-063-3/+4
| * openvswitch: Change ovs_flow_tbl_lookup_xx() APIsAndy Zhou2014-01-063-14/+16
| * openvswitch: Shrink sw_flow_mask by 8 bytes (64-bit) or 4 bytes (32-bit).Ben Pfaff2014-01-061-2/+2
| * openvswitch: Correct comment.Ben Pfaff2014-01-061-5/+1
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-01-0654-338/+499
|\ \
| * | bridge: use spin_lock_bh() in br_multicast_set_hash_maxCurt Brune2014-01-061-2/+2
| * | ipv6: don't install anycast address for /128 addresses on routersHannes Frederic Sowa2014-01-061-2/+2
| * | net: 6lowpan: fix lowpan_header_create non-compression memcpy callDaniel Borkmann2014-01-051-1/+1
| * | netpoll: Fix missing TXQ unlock and and OOPS.David S. Miller2014-01-021-2/+9
| * | ipv6: fix the use of pcpu_tstats in ip6_vti.cLi RongQing2014-01-021-21/+3
| * | ipv6: fix the use of pcpu_tstats in ip6_tunnelLi RongQing2014-01-021-5/+16
| * | ipv6 addrconf: fix preferred lifetime state-changing behavior while valid_lft...Yasushi Asano2014-01-021-3/+10
| * | net: llc: fix use after free in llc_ui_recvmsgDaniel Borkmann2014-01-021-2/+3
| * | ipv4: fix tunneled VM traffic over hw VXLAN/GRE GSO NICWei-Chun Chao2014-01-023-23/+31
| * | sctp: Remove outqueue empty stateVlad Yasevich2014-01-021-25/+7
| * | ipv6: fix the use of pcpu_tstats in sitLi RongQing2014-01-011-0/+2
| * | vlan: Fix header ops passthru when doing TX VLAN offload.David S. Miller2013-12-312-2/+19
| * | net: rose: restore old recvmsg behaviorFlorian Westphal2013-12-291-12/+4
| * | tipc: fix deadlock during socket releaseYing Xue2013-12-293-48/+49
| * | Merge tag 'batman-adv-fix-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2013-12-2911-105/+177
| |\ \
| | * | batman-adv: fix vlan header accessAntonio Quartulli2013-12-281-1/+1
| | * | batman-adv: clean nf state when removing protocol headerAntonio Quartulli2013-12-281-0/+5
| | * | batman-adv: fix alignment for batadv_tvlv_tt_changeAntonio Quartulli2013-12-282-4/+6
| | * | batman-adv: fix size of batadv_bla_claim_dstSimon Wunderlich2013-12-281-0/+2
| | * | batman-adv: fix size of batadv_icmp_headerAntonio Quartulli2013-12-283-14/+44
| | * | batman-adv: fix header alignment by unrolling batadv_headerSimon Wunderlich2013-12-2810-85/+118
| | * | batman-adv: fix alignment for batadv_coded_packetSimon Wunderlich2013-12-281-2/+2
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2013-12-296-8/+33
| |\ \ \ | | |/ / | |/| |
| | * | netfilter: nf_tables: fix wrong datatype in nft_validate_data_load()Pablo Neira Ayuso2013-12-281-1/+3
| | * | netfilter: nf_tables: fix oops when updating table with user chainsPablo Neira Ayuso2013-12-281-2/+10
| | * | netfilter: nf_tables: fix dumping with large number of setsPablo Neira Ayuso2013-12-281-3/+7
| | * | ipvs: correct usage/allocation of seqadj ext in ipvsJesper Dangaard Brouer2013-12-271-0/+6
| | * | netfilter: WARN about wrong usage of sequence number adjustmentsJesper Dangaard Brouer2013-12-271-0/+5
| | * | netfilter: nf_ct_timestamp: Fix BUG_ON after netns deletionHelmut Schaa2013-12-201-1/+0
| | * | netfilter: nft_exthdr: call ipv6_find_hdr() with explicitly initialized offsetDaniel Borkmann2013-12-201-1/+1
| | * | netfilter: nfnetlink_log: unset nf_loggers for netns when unloading moduleGao feng2013-12-171-0/+1