From patchwork Tue Nov 20 16:32:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 200392 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 3E4E92C00F4 for ; Wed, 21 Nov 2012 03:30:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752343Ab2KTQaS (ORCPT ); Tue, 20 Nov 2012 11:30:18 -0500 Received: from lxorguk.ukuu.org.uk ([81.2.110.251]:60936 "EHLO lxorguk.ukuu.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752041Ab2KTQaR (ORCPT ); Tue, 20 Nov 2012 11:30:17 -0500 Received: from bob.linux.org.uk (earthlight.etchedpixels.co.uk [81.2.110.250]) by lxorguk.ukuu.org.uk (8.14.5/8.14.1) with ESMTP id qAKH1sNc002844 for ; Tue, 20 Nov 2012 17:01:59 GMT Subject: [PATCH] ixgbe: fix broken PPTP handling To: netdev@vger.kernel.org From: Alan Cox Date: Tue, 20 Nov 2012 16:32:34 +0000 Message-ID: <20121120163227.11935.57062.stgit@bob.linux.org.uk> User-Agent: StGit/0.16 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Alan Cox Reported to the maintain 3 weeks ago so now sending a patch rather than waiting. ixgbe passes a random event type to the pptp code Signed-off-by: Alan Cox --- drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 1 + 1 file changed, 1 insertion(+) -- 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 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 01d99af..73291fe 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c @@ -398,6 +398,7 @@ void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr) switch (hw->mac.type) { case ixgbe_mac_X540: + event.type = PTP_CLOCK_PPS; ptp_clock_event(adapter->ptp_clock, &event); break; default: