From patchwork Fri Mar 15 17:38:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Gross X-Patchwork-Id: 228124 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 868E12C00B4 for ; Sat, 16 Mar 2013 04:39:20 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754840Ab3CORjR (ORCPT ); Fri, 15 Mar 2013 13:39:17 -0400 Received: from na3sys009aog118.obsmtp.com ([74.125.149.244]:54378 "HELO na3sys009aog118.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751901Ab3CORjQ (ORCPT ); Fri, 15 Mar 2013 13:39:16 -0400 Received: from mail-ie0-f198.google.com ([209.85.223.198]) (using TLSv1) by na3sys009aob118.postini.com ([74.125.148.12]) with SMTP ID DSNKUUNcsUYrUjAsuaUBSx4hMIN88wA2blg/@postini.com; Fri, 15 Mar 2013 10:39:15 PDT Received: by mail-ie0-f198.google.com with SMTP id 17so18315228iea.5 for ; Fri, 15 Mar 2013 10:38:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=LU/Sia5JmZvr0rNIa0smZ1MITRYSjJgCwZ/FU71pwKo=; b=FpaBmLrwhzsNUu65x/UZh5q3mjTUIg9TQ8RAmocNyecZScpkw+UKfJdpAEF6IYjrFi afr908MdhHGMcbjeooOX72gJejqusD3ie9MvQVGH9+RdErcBZZ+OwhPPAuxq8NI//JGm nEkr1gizUwEuNY3nCREAS27UUegos2pCH4U8FUaPZvq/0jwwxQwpAFG4s8STA5rZOGRm yvXEN9dl7DzWMjY7XUvRtXZE5sAetIOTDWW8ouRL6DThzTEHYv4I+1bMSf2XqoxCgF9o BKUMb7Lm4n4oVROI0JGpk0xcR1cHpNwuj4jsjfj4aenVJ5Tz5WydrjBk7mAlhq+f0024 kiuw== X-Received: by 10.60.169.212 with SMTP id ag20mr3210317oec.102.1363369137534; Fri, 15 Mar 2013 10:38:57 -0700 (PDT) X-Received: by 10.60.169.212 with SMTP id ag20mr3210307oec.102.1363369137371; Fri, 15 Mar 2013 10:38:57 -0700 (PDT) Received: from ubuntu.localdomain (c-24-7-88-182.hsd1.ca.comcast.net. [24.7.88.182]) by mx.google.com with ESMTPS id j4sm2905572oea.3.2013.03.15.10.38.54 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Mar 2013 10:38:56 -0700 (PDT) From: Jesse Gross To: David Miller Cc: netdev@vger.kernel.org, dev@openvswitch.org Subject: [GIT net-next] Open vSwitch Date: Fri, 15 Mar 2013 10:38:46 -0700 Message-Id: <1363369131-16830-1-git-send-email-jesse@nicira.com> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQm3/ndk7lPaepM+0yJb1sg3Ky14oSr2oscJTSZ1NViciYo/a3zuJqe2ZB6PxesdWI3CjEQRri7ElBZBQxoASOElttaEJNeUKKVI7dE25UyQfgqcBP3cOLBERs2FWMszqyrrZMwlN4+p/cJEasGcvUCIfJN1JixSA9WlLapuCOfJbkRWZSg= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A couple of minor enhancements for net-next/3.10. The largest is an extension to allow variable length metadata to be passed to userspace with packets. There is a merge conflict in net/openvswitch/vport-internal_dev.c: A existing commit modifies internal_dev_mac_addr() and a new commit deletes it. The new one is correct, so you can just remove that function. The following changes since commit a5a81f0b9025867efb999d14a8dfc1907c5a4c3b: ipv6: Fix default route failover when CONFIG_IPV6_ROUTER_PREF=n (2012-12-03 15:34:47 -0500) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git master for you to fetch changes up to 4490108b4a5ada14c7be712260829faecc814ae5: openvswitch: Allow OVS_USERSPACE_ATTR_USERDATA to be variable length. (2013-02-22 16:29:22 -0800) ---------------------------------------------------------------- Ben Pfaff (1): openvswitch: Allow OVS_USERSPACE_ATTR_USERDATA to be variable length. Jarno Rajahalme (2): linux/openvswitch.h: Make OVSP_LOCAL 32-bit. openvswitch: Change ENOENT return value to ENODEV in lookup_vport(). Thomas Graf (2): openvswitch: Use eth_mac_addr() instead of duplicating it openvswitch: Avoid useless holes in struct vport include/linux/openvswitch.h | 13 +++++++------ net/openvswitch/datapath.c | 13 +++++++------ net/openvswitch/datapath.h | 2 +- net/openvswitch/vport-internal_dev.c | 14 ++------------ net/openvswitch/vport.h | 4 ++-- 5 files changed, 19 insertions(+), 27 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html