From patchwork Thu Aug 28 13:54:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kravkov X-Patchwork-Id: 383842 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 E11C514011E for ; Thu, 28 Aug 2014 23:54:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197AbaH1Nyo (ORCPT ); Thu, 28 Aug 2014 09:54:44 -0400 Received: from mx0a-0016ce01.pphosted.com ([67.231.148.157]:30897 "EHLO mx0a-0016ce01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750764AbaH1Nyn (ORCPT ); Thu, 28 Aug 2014 09:54:43 -0400 Received: from pps.filterd (m0045602.ppops.net [127.0.0.1]) by mx0a-0016ce01.pphosted.com (8.14.5/8.14.5) with SMTP id s7SDseDK001069; Thu, 28 Aug 2014 06:54:40 -0700 Received: from avcashub1.qlogic.com (avcashub2.qlogic.com [198.70.193.116]) by mx0a-0016ce01.pphosted.com with ESMTP id 1p1hddhvsn-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Thu, 28 Aug 2014 06:54:40 -0700 Received: from lb-tlvb-dmitry.il.qlogic.com.com (10.185.7.55) by qlc.com (10.1.4.191) with Microsoft SMTP Server id 14.2.347.0; Thu, 28 Aug 2014 06:54:38 -0700 From: Dmitry Kravkov To: , CC: , Dmitry Kravkov Subject: [PATCH net-next 1/2] bnx2x: prevent incorrect byte-swap in BE Date: Thu, 28 Aug 2014 16:54:23 +0300 Message-ID: <1409234064-20619-1-git-send-email-Dmitry.Kravkov@qlogic.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 disclaimer: bypass X-Proofpoint-Virus-Version: vendor=nai engine=5600 definitions=7543 signatures=670506 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1408280157 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fixes incorrectly defined struct in FW HSI for BE platform. Affects tunneling, tx-switching and anti-spoofing. Introduced in e42780b66aab88d3a82b6087bcd6095b90eecde7 bnx2x: Utilize FW 7.10.51 Reported-by: Dan Carpenter Signed-off-by: Dmitry Kravkov --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h index 7ea0453..5579d4b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h @@ -3983,29 +3983,10 @@ struct eth_mac_addresses { /* tunneling related data */ struct eth_tunnel_data { -#if defined(__BIG_ENDIAN) - __le16 dst_mid; - __le16 dst_lo; -#elif defined(__LITTLE_ENDIAN) __le16 dst_lo; __le16 dst_mid; -#endif -#if defined(__BIG_ENDIAN) - __le16 fw_ip_hdr_csum; - __le16 dst_hi; -#elif defined(__LITTLE_ENDIAN) __le16 dst_hi; __le16 fw_ip_hdr_csum; -#endif -#if defined(__BIG_ENDIAN) - u8 flags; -#define ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER (0x1<<0) -#define ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER_SHIFT 0 -#define ETH_TUNNEL_DATA_RESERVED (0x7F<<1) -#define ETH_TUNNEL_DATA_RESERVED_SHIFT 1 - u8 ip_hdr_start_inner_w; - __le16 pseudo_csum; -#elif defined(__LITTLE_ENDIAN) __le16 pseudo_csum; u8 ip_hdr_start_inner_w; u8 flags; @@ -4013,7 +3994,6 @@ struct eth_tunnel_data { #define ETH_TUNNEL_DATA_IP_HDR_TYPE_OUTER_SHIFT 0 #define ETH_TUNNEL_DATA_RESERVED (0x7F<<1) #define ETH_TUNNEL_DATA_RESERVED_SHIFT 1 -#endif }; /* union for mac addresses and for tunneling data.