From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 603C5FA3743 for ; Fri, 28 Oct 2022 08:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230012AbiJ1IXB (ORCPT ); Fri, 28 Oct 2022 04:23:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229489AbiJ1IW7 (ORCPT ); Fri, 28 Oct 2022 04:22:59 -0400 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4744B1A20A6; Fri, 28 Oct 2022 01:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sipsolutions.net; s=mail; h=MIME-Version:Content-Transfer-Encoding: Content-Type:References:In-Reply-To:Date:Cc:To:From:Subject:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-To: Resent-Cc:Resent-Message-ID; bh=awrmdL6Drv/Ct65LQwals/2KrYxC2xB9ldKz7KnqNFM=; t=1666945378; x=1668154978; b=Yb8jlFZHwyg5u4daTfTHZPEQAxqTXj85CG1Q2fA9HURdYLp zz9ncZdQ9qoDfw+BNKQyIC//IiGSgE8WsPQdPExFDD/nqRhBdt6cwy3oDI0om57ydsoBNQT164lzJ ovOqqqvQrHQ0ibZTolvJa0ONcvRTAkI6nyU0P1cOKLwnunIiewinhvG8lAV0JBr+8bSIZWpn7JFyT SLyAebS/Lg96YwBxL6icEBfahe0z211TknYbI4GgNrwV35xMjPeE0MxSrgX83/SP/nFJ9vcYSWrYn NpmS1KWDZ2VAFGvCbrubdsbG4+FuMA4XqwhDbuSiilvIlYX3yzywNA2QDr/9CZlw==; Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96) (envelope-from ) id 1ooKdc-001HRW-1H; Fri, 28 Oct 2022 10:22:48 +0200 Message-ID: Subject: Re: [PATCH v2 1/6] cfg80211: Avoid clashing function prototypes From: Johannes Berg To: "Gustavo A. R. Silva" , Stanislav Yakovlev , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook , linux-hardening@vger.kernel.org Date: Fri, 28 Oct 2022 10:22:47 +0200 In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.44.4 (3.44.4-2.fc36) MIME-Version: 1.0 X-malware-bazaar: not-scanned Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hm. If you're splitting out per driver, > +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c > @@ -9870,7 +9870,7 @@ static int ipw_wx_sw_reset(struct net_device *dev, > =20 > /* Rebase the WE IOCTLs to zero for the handler array */ > static iw_handler ipw_wx_handlers[] =3D { > - IW_HANDLER(SIOCGIWNAME, (iw_handler)cfg80211_wext_giwname), > + IW_HANDLER(SIOCGIWNAME, cfg80211_wext_giwname), I can see how this (and similar) still belongs into this patch since it's related to the cfg80211 change, but > +++ b/drivers/net/wireless/intersil/orinoco/wext.c > @@ -154,9 +154,10 @@ static struct iw_statistics *orinoco_get_wireless_st= ats(struct net_device *dev) > =20 > static int orinoco_ioctl_setwap(struct net_device *dev, > struct iw_request_info *info, > - struct sockaddr *ap_addr, > + union iwreq_data *wrqu, > char *extra) > { > + struct sockaddr *ap_addr =3D &wrqu->ap_addr; why this (and similar) too? The same changes in hostap, zd1201 and airo you did split out? johannes