Re: [PATCH v2 1/6] cfg80211: Avoid clashing function prototypes

[Johannes Berg]

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,
>  
>  /* Rebase the WE IOCTLs to zero for the handler array */
>  static iw_handler ipw_wx_handlers[] = {
> -	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_stats(struct net_device *dev)
>  
>  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 = &wrqu->ap_addr;

why this (and similar) too?

The same changes in hostap, zd1201 and airo you did split out?

johannes