From patchwork Fri Oct 12 10:28:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 1586101 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id C8CD640276 for ; Fri, 12 Oct 2012 10:28:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933849Ab2JLK2b (ORCPT ); Fri, 12 Oct 2012 06:28:31 -0400 Received: from mms3.broadcom.com ([216.31.210.19]:4892 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933843Ab2JLK23 (ORCPT ); Fri, 12 Oct 2012 06:28:29 -0400 Received: from [10.9.200.133] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Fri, 12 Oct 2012 03:25:30 -0700 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Fri, 12 Oct 2012 03:27:48 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 2ECCC40FE5; Fri, 12 Oct 2012 03:28:21 -0700 (PDT) Received: from arend-vb-linux (unknown [10.176.68.25]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 48243207CE; Fri, 12 Oct 2012 03:28:20 -0700 (PDT) Received: from arend by arend-vb-linux with local (Exim 4.76) ( envelope-from ) id 1TMcTb-0006Bm-Ca; Fri, 12 Oct 2012 12:28:19 +0200 From: "Arend van Spriel" To: "John W. Linville" cc: "Linux Wireless List" , "Arend van Spriel" , "Johannes Berg" Subject: [PATCH 3/3] wireless: remove duplicate enum ieee80211_eid definitions Date: Fri, 12 Oct 2012 12:28:16 +0200 Message-ID: <1350037696-23747-4-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350037696-23747-1-git-send-email-arend@broadcom.com> References: <1350037696-23747-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 7C692F903PS4749808-01-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org WLAN_EID_WPA and WLAN_EID_GENERIC mapped to the same value as WLAN_EID_VENDOR_SPECIFIC. The last one being more in line with the standard specification. Removing WLAN_EID_WPA and WLAN_EID_GENERIC as there are no longer drivers using these. Cc: Johannes Berg Signed-off-by: Arend van Spriel --- include/linux/ieee80211.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 2385119..213e7a3 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -1440,8 +1440,6 @@ enum ieee80211_eid { WLAN_EID_RSN = 48, WLAN_EID_MMIE = 76, - WLAN_EID_WPA = 221, - WLAN_EID_GENERIC = 221, WLAN_EID_VENDOR_SPECIFIC = 221, WLAN_EID_QOS_PARAMETER = 222,