summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* net: Allow modules to use is_skb_forwardableVlad Yasevich2014-03-312-2/+3
* Merge branch 'filter-next'David S. Miller2014-03-3120-536/+1658
|\
| * doc: filter: extend BPF documentation to document new internalsAlexei Starovoitov2014-03-311-0/+125
| * net: filter: rework/optimize internal BPF interpreter's instruction setAlexei Starovoitov2014-03-314-372/+1279
| * net: isdn: use sk_unattached_filter apiDaniel Borkmann2014-03-312-23/+43
| * net: ppp: use sk_unattached_filter apiDaniel Borkmann2014-03-311-19/+41
| * net: ptp: do not reimplement PTP/BPF classifierDaniel Borkmann2014-03-315-38/+12
| * net: ptp: use sk_unattached_filter_create() for BPFDaniel Borkmann2014-03-312-11/+14
| * net: filter: move filter accounting to filter coreDaniel Borkmann2014-03-313-42/+42
| * net: filter: keep original BPF program aroundDaniel Borkmann2014-03-313-31/+93
| * net: filter: add jited flag to indicate jit compiled filtersDaniel Borkmann2014-03-317-6/+15
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-2948-267/+527
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-03-2832-195/+363
| |\
| | * Merge branch 'vlan_offloads'David S. Miller2014-03-285-3/+19
| | |\
| | | * vlan: Warn the user if lowerdev has bad vlan features.Vlad Yasevich2014-03-282-0/+10
| | | * veth: Turn off vlan rx acceleration in vlan_featuresVlad Yasevich2014-03-281-1/+4
| | | * ifb: Remove vlan acceleration from vlan_featuresVlad Yasevich2014-03-281-1/+2
| | | * qlge: Do not propaged vlan tag offloads to vlansVlad Yasevich2014-03-281-1/+3
| | |/
| | * bridge: Fix crash with vlan filtering and tcpdumpVlad Yasevich2014-03-282-5/+20
| | * net: Account for all vlan headers in skb_mac_gso_segmentVlad Yasevich2014-03-283-6/+12
| | * MAINTAINERS: bonding: change email addressVeaceslav Falico2014-03-281-1/+1
| | * MAINTAINERS: bonding: change email addressJay Vosburgh2014-03-281-1/+1
| | * ipv6: move DAD and addrconf_verify processing to workqueueHannes Frederic Sowa2014-03-282-52/+145
| | * tcp: fix get_timewait4_sock() delay computation on 64bitEric Dumazet2014-03-281-1/+1
| | * openvswitch: fix a possible deadlock and lockdep warningFlavio Leitner2014-03-281-20/+6
| | * bridge: Fix handling stacked vlan tagsToshiaki Makita2014-03-281-17/+1
| | * bridge: Fix inabillity to retrieve vlan tags when tx offload is disabledToshiaki Makita2014-03-282-3/+15
| | * vhost: validate vhost_get_vq_desc return valueMichael S. Tsirkin2014-03-281-1/+5
| | * vhost: fix total length when packets are too shortMichael S. Tsirkin2014-03-281-0/+14
| | * random32: avoid attempt to late reseed if in the middle of seedingSasha Levin2014-03-281-1/+12
| | * random32: assign to network folks in MAINTAINERSSasha Levin2014-03-281-0/+1
| | * net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during resetWei Yang2014-03-271-1/+5
| | * core, nfqueue, openvswitch: Orphan frags in skb_zerocopy and handle errorsZoltan Kiss2014-03-274-12/+34
| | * vlan: Set hard_header_len according to available accelerationVlad Yasevich2014-03-272-2/+5
| | * usbnet: include wait queue head in device structureOliver Neukum2014-03-272-15/+20
| | * virtio-net: correct error handling of virtqueue_kick()Jason Wang2014-03-271-3/+3
| | * net: unix: non blocking recvmsg() should not return -EINTREric Dumazet2014-03-261-5/+12
| | * Merge branch 'mvneta'David S. Miller2014-03-261-40/+20
| | |\
| | | * net: mvneta: use devm_ioremap_resource() instead of of_iomap()Thomas Petazzoni2014-03-261-6/+11
| | | * net: mvneta: fix usage as a module on RGMII configurationsThomas Petazzoni2014-03-261-33/+8
| | | * net: mvneta: rename MVNETA_GMAC2_PSC_ENABLE to MVNETA_GMAC2_PCS_ENABLEThomas Petazzoni2014-03-261-2/+2
| | |/
| | * tg3: Do not include vlan acceleration features in vlan_featuresVlad Yasevich2014-03-261-3/+2
| | * ip_tunnel: Fix dst ref-count.Pravin B Shelar2014-03-263-3/+9
| * | Merge branch 'akpm' (patches from Andrew Morton)Linus Torvalds2014-03-282-2/+5
| |\ \
| | * | x86: fix boot on uniprocessor systemsArtem Fetishev2014-03-281-1/+2
| | * | ocfs2: check if cluster name exists before derefSasha Levin2014-03-281-1/+3
| * | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2014-03-284-15/+82
| |\ \ \ | | |/ / | |/| |
| | * | Input: synaptics - add manual min/max quirk for ThinkPad X240Hans de Goede2014-03-281-0/+8
| | * | Input: synaptics - add manual min/max quirkBenjamin Tissoires2014-03-281-0/+47
| | * | Input: cypress_ps2 - don't report as a button padsHans de Goede2014-03-261-1/+0