wifi: cfg80211: Avoid clashing function prototypes

When built with Control Flow Integrity, function prototypes between
caller and function declaration must match. These mismatches are visible
at compile time with the new -Wcast-function-type-strict in Clang[1].

Fix a total of 73 warnings like these:

drivers/net/wireless/intersil/orinoco/wext.c:1379:27: warning: cast from 'int (*)(struct net_device *, struct iw_request_info *, struct iw_param *, char *)' to 'iw_handler' (aka 'int (*)(struct net_device *, struct iw_request_info *, union iwreq_data *, char *)') converts to incompatible function type [-Wcast-function-type-strict]
        IW_HANDLER(SIOCGIWPOWER,        (iw_handler)orinoco_ioctl_getpower),
                                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../net/wireless/wext-compat.c:1607:33: warning: cast from 'int (*)(struct net_device *, struct iw_request_info *, struct iw_point *, char *)' to 'iw_handler' (aka 'int (*)(struct net_device *, struct iw_request_info *, union iwreq_data *, char *)') converts to incompatible function type [-Wcast-function-type-strict]
        [IW_IOCTL_IDX(SIOCSIWGENIE)]    = (iw_handler) cfg80211_wext_siwgenie,
                                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

../drivers/net/wireless/intersil/orinoco/wext.c:1390:27: error: incompatible function pointer types initializing 'const iw_handler' (aka 'int (*const)(struct net_device *, struct iw_request_info *, union iwreq_data *, char *)') with an expression of type 'int (struct net_device *, struct iw_request_info *, struct iw_param *, char *)' [-Wincompatible-function-pointer-types]
        IW_HANDLER(SIOCGIWRETRY,        cfg80211_wext_giwretry),
                                        ^~~~~~~~~~~~~~~~~~~~~~

The cfg80211 Wireless Extension handler callbacks (iw_handler) use a
union for the data argument. Actually use the union and perform explicit
member selection in the function body instead of having a function
prototype mismatch. There are no resulting binary differences
before/after changes.

These changes were made partly manually and partly with the help of
Coccinelle.

Link: https://github.com/KSPP/linux/issues/234
Link: https://reviews.llvm.org/D134831
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/a68822bf8dd587988131bb6a295280cb4293f05d.1667934775.git.gustavoars@kernel.org

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index 79d5c09..ca802af 100644 (file)
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -9856,7 +9856,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),
        IW_HANDLER(SIOCSIWFREQ, ipw_wx_set_freq),
        IW_HANDLER(SIOCGIWFREQ, ipw_wx_get_freq),
        IW_HANDLER(SIOCSIWMODE, ipw_wx_set_mode),

diff --git a/drivers/net/wireless/intersil/orinoco/wext.c b/drivers/net/wireless/intersil/orinoco/wext.c
index b8eb5d6..dea1ff0 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/wext.c
+++ b/drivers/net/wireless/intersil/orinoco/wext.c
@@ -1363,31 +1363,31 @@ static const struct iw_priv_args orinoco_privtab[] = {
 
 static const iw_handler        orinoco_handler[] = {
        IW_HANDLER(SIOCSIWCOMMIT,       orinoco_ioctl_commit),
-       IW_HANDLER(SIOCGIWNAME,         (iw_handler)cfg80211_wext_giwname),
+       IW_HANDLER(SIOCGIWNAME,         cfg80211_wext_giwname),
        IW_HANDLER(SIOCSIWFREQ,         orinoco_ioctl_setfreq),
        IW_HANDLER(SIOCGIWFREQ,         orinoco_ioctl_getfreq),
-       IW_HANDLER(SIOCSIWMODE,         (iw_handler)cfg80211_wext_siwmode),
-       IW_HANDLER(SIOCGIWMODE,         (iw_handler)cfg80211_wext_giwmode),
+       IW_HANDLER(SIOCSIWMODE,         cfg80211_wext_siwmode),
+       IW_HANDLER(SIOCGIWMODE,         cfg80211_wext_giwmode),
        IW_HANDLER(SIOCSIWSENS,         orinoco_ioctl_setsens),
        IW_HANDLER(SIOCGIWSENS,         orinoco_ioctl_getsens),
-       IW_HANDLER(SIOCGIWRANGE,        (iw_handler)cfg80211_wext_giwrange),
+       IW_HANDLER(SIOCGIWRANGE,        cfg80211_wext_giwrange),
        IW_HANDLER(SIOCSIWSPY,          iw_handler_set_spy),
        IW_HANDLER(SIOCGIWSPY,          iw_handler_get_spy),
        IW_HANDLER(SIOCSIWTHRSPY,       iw_handler_set_thrspy),
        IW_HANDLER(SIOCGIWTHRSPY,       iw_handler_get_thrspy),
        IW_HANDLER(SIOCSIWAP,           orinoco_ioctl_setwap),
        IW_HANDLER(SIOCGIWAP,           orinoco_ioctl_getwap),
-       IW_HANDLER(SIOCSIWSCAN,         (iw_handler)cfg80211_wext_siwscan),
-       IW_HANDLER(SIOCGIWSCAN,         (iw_handler)cfg80211_wext_giwscan),
+       IW_HANDLER(SIOCSIWSCAN,         cfg80211_wext_siwscan),
+       IW_HANDLER(SIOCGIWSCAN,         cfg80211_wext_giwscan),
        IW_HANDLER(SIOCSIWESSID,        orinoco_ioctl_setessid),
        IW_HANDLER(SIOCGIWESSID,        orinoco_ioctl_getessid),
        IW_HANDLER(SIOCSIWRATE,         orinoco_ioctl_setrate),
        IW_HANDLER(SIOCGIWRATE,         orinoco_ioctl_getrate),
-       IW_HANDLER(SIOCSIWRTS,          (iw_handler)cfg80211_wext_siwrts),
-       IW_HANDLER(SIOCGIWRTS,          (iw_handler)cfg80211_wext_giwrts),
-       IW_HANDLER(SIOCSIWFRAG,         (iw_handler)cfg80211_wext_siwfrag),
-       IW_HANDLER(SIOCGIWFRAG,         (iw_handler)cfg80211_wext_giwfrag),
-       IW_HANDLER(SIOCGIWRETRY,        (iw_handler)cfg80211_wext_giwretry),
+       IW_HANDLER(SIOCSIWRTS,          cfg80211_wext_siwrts),
+       IW_HANDLER(SIOCGIWRTS,          cfg80211_wext_giwrts),
+       IW_HANDLER(SIOCSIWFRAG,         cfg80211_wext_siwfrag),
+       IW_HANDLER(SIOCGIWFRAG,         cfg80211_wext_giwfrag),
+       IW_HANDLER(SIOCGIWRETRY,        cfg80211_wext_giwretry),
        IW_HANDLER(SIOCSIWENCODE,       orinoco_ioctl_setiwencode),
        IW_HANDLER(SIOCGIWENCODE,       orinoco_ioctl_getiwencode),
        IW_HANDLER(SIOCSIWPOWER,        orinoco_ioctl_setpower),

diff --git a/include/net/cfg80211-wext.h b/include/net/cfg80211-wext.h
index ad77caf..0ee36d9 100644 (file)
--- a/include/net/cfg80211-wext.h
+++ b/include/net/cfg80211-wext.h
@@ -19,34 +19,34 @@
  */
 int cfg80211_wext_giwname(struct net_device *dev,
                          struct iw_request_info *info,
-                         char *name, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
-                         u32 *mode, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
-                         u32 *mode, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_siwscan(struct net_device *dev,
                          struct iw_request_info *info,
                          union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_giwscan(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_point *data, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_giwrange(struct net_device *dev,
                           struct iw_request_info *info,
-                          struct iw_point *data, char *extra);
+                          union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_siwrts(struct net_device *dev,
                         struct iw_request_info *info,
-                        struct iw_param *rts, char *extra);
+                        union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_giwrts(struct net_device *dev,
                         struct iw_request_info *info,
-                        struct iw_param *rts, char *extra);
+                        union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_siwfrag(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_param *frag, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_giwfrag(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_param *frag, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_giwretry(struct net_device *dev,
                           struct iw_request_info *info,
-                          struct iw_param *retry, char *extra);
+                          union iwreq_data *wrqu, char *extra);
 
 #endif /* __NET_CFG80211_WEXT_H */

diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 806a5f1..853619b 100644 (file)
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -3229,8 +3229,9 @@ static int ieee80211_scan_results(struct cfg80211_registered_device *rdev,
 
 int cfg80211_wext_giwscan(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_point *data, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
+       struct iw_point *data = &wrqu->data;
        struct cfg80211_registered_device *rdev;
        int res;
 

diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index ddf340b..8a24dfc 100644 (file)
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -25,16 +25,17 @@
 
 int cfg80211_wext_giwname(struct net_device *dev,
                          struct iw_request_info *info,
-                         char *name, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
-       strcpy(name, "IEEE 802.11");
+       strcpy(wrqu->name, "IEEE 802.11");
        return 0;
 }
 EXPORT_WEXT_HANDLER(cfg80211_wext_giwname);
 
 int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
-                         u32 *mode, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
+       __u32 *mode = &wrqu->mode;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev;
        struct vif_params vifparams;
@@ -71,8 +72,9 @@ int cfg80211_wext_siwmode(struct net_device *dev, struct iw_request_info *info,
 EXPORT_WEXT_HANDLER(cfg80211_wext_siwmode);
 
 int cfg80211_wext_giwmode(struct net_device *dev, struct iw_request_info *info,
-                         u32 *mode, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
+       __u32 *mode = &wrqu->mode;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
        if (!wdev)
@@ -108,8 +110,9 @@ EXPORT_WEXT_HANDLER(cfg80211_wext_giwmode);
 
 int cfg80211_wext_giwrange(struct net_device *dev,
                           struct iw_request_info *info,
-                          struct iw_point *data, char *extra)
+                          union iwreq_data *wrqu, char *extra)
 {
+       struct iw_point *data = &wrqu->data;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct iw_range *range = (struct iw_range *) extra;
        enum nl80211_band band;
@@ -251,8 +254,9 @@ int cfg80211_wext_freq(struct iw_freq *freq)
 
 int cfg80211_wext_siwrts(struct net_device *dev,
                         struct iw_request_info *info,
-                        struct iw_param *rts, char *extra)
+                        union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *rts = &wrqu->rts;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        u32 orts = wdev->wiphy->rts_threshold;
@@ -281,8 +285,9 @@ EXPORT_WEXT_HANDLER(cfg80211_wext_siwrts);
 
 int cfg80211_wext_giwrts(struct net_device *dev,
                         struct iw_request_info *info,
-                        struct iw_param *rts, char *extra)
+                        union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *rts = &wrqu->rts;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
        rts->value = wdev->wiphy->rts_threshold;
@@ -295,8 +300,9 @@ EXPORT_WEXT_HANDLER(cfg80211_wext_giwrts);
 
 int cfg80211_wext_siwfrag(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_param *frag, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *frag = &wrqu->frag;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        u32 ofrag = wdev->wiphy->frag_threshold;
@@ -325,8 +331,9 @@ EXPORT_WEXT_HANDLER(cfg80211_wext_siwfrag);
 
 int cfg80211_wext_giwfrag(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_param *frag, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *frag = &wrqu->frag;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
        frag->value = wdev->wiphy->frag_threshold;
@@ -339,8 +346,9 @@ EXPORT_WEXT_HANDLER(cfg80211_wext_giwfrag);
 
 static int cfg80211_wext_siwretry(struct net_device *dev,
                                  struct iw_request_info *info,
-                                 struct iw_param *retry, char *extra)
+                                 union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *retry = &wrqu->retry;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        u32 changed = 0;
@@ -378,8 +386,9 @@ static int cfg80211_wext_siwretry(struct net_device *dev,
 
 int cfg80211_wext_giwretry(struct net_device *dev,
                           struct iw_request_info *info,
-                          struct iw_param *retry, char *extra)
+                          union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *retry = &wrqu->retry;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
        retry->disabled = 0;
@@ -588,8 +597,9 @@ static int cfg80211_set_encryption(struct cfg80211_registered_device *rdev,
 
 static int cfg80211_wext_siwencode(struct net_device *dev,
                                   struct iw_request_info *info,
-                                  struct iw_point *erq, char *keybuf)
+                                  union iwreq_data *wrqu, char *keybuf)
 {
+       struct iw_point *erq = &wrqu->encoding;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        int idx, err;
@@ -664,8 +674,9 @@ out:
 
 static int cfg80211_wext_siwencodeext(struct net_device *dev,
                                      struct iw_request_info *info,
-                                     struct iw_point *erq, char *extra)
+                                     union iwreq_data *wrqu, char *extra)
 {
+       struct iw_point *erq = &wrqu->encoding;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        struct iw_encode_ext *ext = (struct iw_encode_ext *) extra;
@@ -767,8 +778,9 @@ static int cfg80211_wext_siwencodeext(struct net_device *dev,
 
 static int cfg80211_wext_giwencode(struct net_device *dev,
                                   struct iw_request_info *info,
-                                  struct iw_point *erq, char *keybuf)
+                                  union iwreq_data *wrqu, char *keybuf)
 {
+       struct iw_point *erq = &wrqu->encoding;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        int idx;
 
@@ -804,8 +816,9 @@ static int cfg80211_wext_giwencode(struct net_device *dev,
 
 static int cfg80211_wext_siwfreq(struct net_device *dev,
                                 struct iw_request_info *info,
-                                struct iw_freq *wextfreq, char *extra)
+                                union iwreq_data *wrqu, char *extra)
 {
+       struct iw_freq *wextfreq = &wrqu->freq;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        struct cfg80211_chan_def chandef = {
@@ -870,8 +883,9 @@ static int cfg80211_wext_siwfreq(struct net_device *dev,
 
 static int cfg80211_wext_giwfreq(struct net_device *dev,
                                 struct iw_request_info *info,
-                                struct iw_freq *freq, char *extra)
+                                union iwreq_data *wrqu, char *extra)
 {
+       struct iw_freq *freq = &wrqu->freq;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        struct cfg80211_chan_def chandef = {};
@@ -1147,8 +1161,9 @@ static int cfg80211_set_key_mgt(struct wireless_dev *wdev, u32 key_mgt)
 
 static int cfg80211_wext_siwauth(struct net_device *dev,
                                 struct iw_request_info *info,
-                                struct iw_param *data, char *extra)
+                                union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *data = &wrqu->param;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
        if (wdev->iftype != NL80211_IFTYPE_STATION)
@@ -1180,7 +1195,7 @@ static int cfg80211_wext_siwauth(struct net_device *dev,
 
 static int cfg80211_wext_giwauth(struct net_device *dev,
                                 struct iw_request_info *info,
-                                struct iw_param *data, char *extra)
+                                union iwreq_data *wrqu, char *extra)
 {
        /* XXX: what do we need? */
 
@@ -1189,8 +1204,9 @@ static int cfg80211_wext_giwauth(struct net_device *dev,
 
 static int cfg80211_wext_siwpower(struct net_device *dev,
                                  struct iw_request_info *info,
-                                 struct iw_param *wrq, char *extra)
+                                 union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *wrq = &wrqu->power;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        bool ps;
@@ -1238,8 +1254,9 @@ static int cfg80211_wext_siwpower(struct net_device *dev,
 
 static int cfg80211_wext_giwpower(struct net_device *dev,
                                  struct iw_request_info *info,
-                                 struct iw_param *wrq, char *extra)
+                                 union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *wrq = &wrqu->power;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
 
        wrq->disabled = !wdev->ps;
@@ -1249,8 +1266,9 @@ static int cfg80211_wext_giwpower(struct net_device *dev,
 
 static int cfg80211_wext_siwrate(struct net_device *dev,
                                 struct iw_request_info *info,
-                                struct iw_param *rate, char *extra)
+                                union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *rate = &wrqu->bitrate;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        struct cfg80211_bitrate_mask mask;
@@ -1307,8 +1325,9 @@ static int cfg80211_wext_siwrate(struct net_device *dev,
 
 static int cfg80211_wext_giwrate(struct net_device *dev,
                                 struct iw_request_info *info,
-                                struct iw_param *rate, char *extra)
+                                union iwreq_data *wrqu, char *extra)
 {
+       struct iw_param *rate = &wrqu->bitrate;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        struct station_info sinfo = {};
@@ -1430,8 +1449,9 @@ static struct iw_statistics *cfg80211_wireless_stats(struct net_device *dev)
 
 static int cfg80211_wext_siwap(struct net_device *dev,
                               struct iw_request_info *info,
-                              struct sockaddr *ap_addr, char *extra)
+                              union iwreq_data *wrqu, char *extra)
 {
+       struct sockaddr *ap_addr = &wrqu->ap_addr;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        int ret;
@@ -1455,8 +1475,9 @@ static int cfg80211_wext_siwap(struct net_device *dev,
 
 static int cfg80211_wext_giwap(struct net_device *dev,
                               struct iw_request_info *info,
-                              struct sockaddr *ap_addr, char *extra)
+                              union iwreq_data *wrqu, char *extra)
 {
+       struct sockaddr *ap_addr = &wrqu->ap_addr;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        int ret;
@@ -1480,8 +1501,9 @@ static int cfg80211_wext_giwap(struct net_device *dev,
 
 static int cfg80211_wext_siwessid(struct net_device *dev,
                                  struct iw_request_info *info,
-                                 struct iw_point *data, char *ssid)
+                                 union iwreq_data *wrqu, char *ssid)
 {
+       struct iw_point *data = &wrqu->data;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        int ret;
@@ -1505,8 +1527,9 @@ static int cfg80211_wext_siwessid(struct net_device *dev,
 
 static int cfg80211_wext_giwessid(struct net_device *dev,
                                  struct iw_request_info *info,
-                                 struct iw_point *data, char *ssid)
+                                 union iwreq_data *wrqu, char *ssid)
 {
+       struct iw_point *data = &wrqu->data;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        int ret;
@@ -1533,7 +1556,7 @@ static int cfg80211_wext_giwessid(struct net_device *dev,
 
 static int cfg80211_wext_siwpmksa(struct net_device *dev,
                                  struct iw_request_info *info,
-                                 struct iw_point *data, char *extra)
+                                 union iwreq_data *wrqu, char *extra)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
@@ -1584,78 +1607,39 @@ static int cfg80211_wext_siwpmksa(struct net_device *dev,
        return ret;
 }
 
-#define DEFINE_WEXT_COMPAT_STUB(func, type)                    \
-       static int __ ## func(struct net_device *dev,           \
-                             struct iw_request_info *info,     \
-                             union iwreq_data *wrqu,           \
-                             char *extra)                      \
-       {                                                       \
-               return func(dev, info, (type *)wrqu, extra);    \
-       }
-
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwname, char)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwfreq, struct iw_freq)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwfreq, struct iw_freq)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwmode, u32)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwmode, u32)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwrange, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwap, struct sockaddr)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwap, struct sockaddr)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwmlme, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwscan, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwessid, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwessid, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwrate, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwrate, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwrts, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwrts, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwfrag, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwfrag, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwretry, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwretry, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwencode, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwencode, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwpower, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwpower, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwgenie, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_giwauth, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwauth, struct iw_param)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwencodeext, struct iw_point)
-DEFINE_WEXT_COMPAT_STUB(cfg80211_wext_siwpmksa, struct iw_point)
-
 static const iw_handler cfg80211_handlers[] = {
-       [IW_IOCTL_IDX(SIOCGIWNAME)]     = __cfg80211_wext_giwname,
-       [IW_IOCTL_IDX(SIOCSIWFREQ)]     = __cfg80211_wext_siwfreq,
-       [IW_IOCTL_IDX(SIOCGIWFREQ)]     = __cfg80211_wext_giwfreq,
-       [IW_IOCTL_IDX(SIOCSIWMODE)]     = __cfg80211_wext_siwmode,
-       [IW_IOCTL_IDX(SIOCGIWMODE)]     = __cfg80211_wext_giwmode,
-       [IW_IOCTL_IDX(SIOCGIWRANGE)]    = __cfg80211_wext_giwrange,
-       [IW_IOCTL_IDX(SIOCSIWAP)]       = __cfg80211_wext_siwap,
-       [IW_IOCTL_IDX(SIOCGIWAP)]       = __cfg80211_wext_giwap,
-       [IW_IOCTL_IDX(SIOCSIWMLME)]     = __cfg80211_wext_siwmlme,
-       [IW_IOCTL_IDX(SIOCSIWSCAN)]     = cfg80211_wext_siwscan,
-       [IW_IOCTL_IDX(SIOCGIWSCAN)]     = __cfg80211_wext_giwscan,
-       [IW_IOCTL_IDX(SIOCSIWESSID)]    = __cfg80211_wext_siwessid,
-       [IW_IOCTL_IDX(SIOCGIWESSID)]    = __cfg80211_wext_giwessid,
-       [IW_IOCTL_IDX(SIOCSIWRATE)]     = __cfg80211_wext_siwrate,
-       [IW_IOCTL_IDX(SIOCGIWRATE)]     = __cfg80211_wext_giwrate,
-       [IW_IOCTL_IDX(SIOCSIWRTS)]      = __cfg80211_wext_siwrts,
-       [IW_IOCTL_IDX(SIOCGIWRTS)]      = __cfg80211_wext_giwrts,
-       [IW_IOCTL_IDX(SIOCSIWFRAG)]     = __cfg80211_wext_siwfrag,
-       [IW_IOCTL_IDX(SIOCGIWFRAG)]     = __cfg80211_wext_giwfrag,
-       [IW_IOCTL_IDX(SIOCSIWTXPOW)]    = cfg80211_wext_siwtxpower,
-       [IW_IOCTL_IDX(SIOCGIWTXPOW)]    = cfg80211_wext_giwtxpower,
-       [IW_IOCTL_IDX(SIOCSIWRETRY)]    = __cfg80211_wext_siwretry,
-       [IW_IOCTL_IDX(SIOCGIWRETRY)]    = __cfg80211_wext_giwretry,
-       [IW_IOCTL_IDX(SIOCSIWENCODE)]   = __cfg80211_wext_siwencode,
-       [IW_IOCTL_IDX(SIOCGIWENCODE)]   = __cfg80211_wext_giwencode,
-       [IW_IOCTL_IDX(SIOCSIWPOWER)]    = __cfg80211_wext_siwpower,
-       [IW_IOCTL_IDX(SIOCGIWPOWER)]    = __cfg80211_wext_giwpower,
-       [IW_IOCTL_IDX(SIOCSIWGENIE)]    = __cfg80211_wext_siwgenie,
-       [IW_IOCTL_IDX(SIOCSIWAUTH)]     = __cfg80211_wext_siwauth,
-       [IW_IOCTL_IDX(SIOCGIWAUTH)]     = __cfg80211_wext_giwauth,
-       [IW_IOCTL_IDX(SIOCSIWENCODEEXT)]= __cfg80211_wext_siwencodeext,
-       [IW_IOCTL_IDX(SIOCSIWPMKSA)]    = __cfg80211_wext_siwpmksa,
+       IW_HANDLER(SIOCGIWNAME,         cfg80211_wext_giwname),
+       IW_HANDLER(SIOCSIWFREQ,         cfg80211_wext_siwfreq),
+       IW_HANDLER(SIOCGIWFREQ,         cfg80211_wext_giwfreq),
+       IW_HANDLER(SIOCSIWMODE,         cfg80211_wext_siwmode),
+       IW_HANDLER(SIOCGIWMODE,         cfg80211_wext_giwmode),
+       IW_HANDLER(SIOCGIWRANGE,        cfg80211_wext_giwrange),
+       IW_HANDLER(SIOCSIWAP,           cfg80211_wext_siwap),
+       IW_HANDLER(SIOCGIWAP,           cfg80211_wext_giwap),
+       IW_HANDLER(SIOCSIWMLME,         cfg80211_wext_siwmlme),
+       IW_HANDLER(SIOCSIWSCAN,         cfg80211_wext_siwscan),
+       IW_HANDLER(SIOCGIWSCAN,         cfg80211_wext_giwscan),
+       IW_HANDLER(SIOCSIWESSID,        cfg80211_wext_siwessid),
+       IW_HANDLER(SIOCGIWESSID,        cfg80211_wext_giwessid),
+       IW_HANDLER(SIOCSIWRATE,         cfg80211_wext_siwrate),
+       IW_HANDLER(SIOCGIWRATE,         cfg80211_wext_giwrate),
+       IW_HANDLER(SIOCSIWRTS,          cfg80211_wext_siwrts),
+       IW_HANDLER(SIOCGIWRTS,          cfg80211_wext_giwrts),
+       IW_HANDLER(SIOCSIWFRAG,         cfg80211_wext_siwfrag),
+       IW_HANDLER(SIOCGIWFRAG,         cfg80211_wext_giwfrag),
+       IW_HANDLER(SIOCSIWTXPOW,        cfg80211_wext_siwtxpower),
+       IW_HANDLER(SIOCGIWTXPOW,        cfg80211_wext_giwtxpower),
+       IW_HANDLER(SIOCSIWRETRY,        cfg80211_wext_siwretry),
+       IW_HANDLER(SIOCGIWRETRY,        cfg80211_wext_giwretry),
+       IW_HANDLER(SIOCSIWENCODE,       cfg80211_wext_siwencode),
+       IW_HANDLER(SIOCGIWENCODE,       cfg80211_wext_giwencode),
+       IW_HANDLER(SIOCSIWPOWER,        cfg80211_wext_siwpower),
+       IW_HANDLER(SIOCGIWPOWER,        cfg80211_wext_giwpower),
+       IW_HANDLER(SIOCSIWGENIE,        cfg80211_wext_siwgenie),
+       IW_HANDLER(SIOCSIWAUTH,         cfg80211_wext_siwauth),
+       IW_HANDLER(SIOCGIWAUTH,         cfg80211_wext_giwauth),
+       IW_HANDLER(SIOCSIWENCODEEXT,    cfg80211_wext_siwencodeext),
+       IW_HANDLER(SIOCSIWPMKSA,        cfg80211_wext_siwpmksa),
 };
 
 const struct iw_handler_def cfg80211_wext_handler = {

diff --git a/net/wireless/wext-compat.h b/net/wireless/wext-compat.h
index 8d3cc15..c02eb78 100644 (file)
--- a/net/wireless/wext-compat.h
+++ b/net/wireless/wext-compat.h
@@ -13,7 +13,7 @@
 
 int cfg80211_ibss_wext_siwfreq(struct net_device *dev,
                               struct iw_request_info *info,
-                              struct iw_freq *freq, char *extra);
+                              struct iw_freq *wextfreq, char *extra);
 int cfg80211_ibss_wext_giwfreq(struct net_device *dev,
                               struct iw_request_info *info,
                               struct iw_freq *freq, char *extra);
@@ -32,7 +32,7 @@ int cfg80211_ibss_wext_giwessid(struct net_device *dev,
 
 int cfg80211_mgd_wext_siwfreq(struct net_device *dev,
                              struct iw_request_info *info,
-                             struct iw_freq *freq, char *extra);
+                             struct iw_freq *wextfreq, char *extra);
 int cfg80211_mgd_wext_giwfreq(struct net_device *dev,
                              struct iw_request_info *info,
                              struct iw_freq *freq, char *extra);
@@ -51,10 +51,10 @@ int cfg80211_mgd_wext_giwessid(struct net_device *dev,
 
 int cfg80211_wext_siwmlme(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_point *data, char *extra);
+                         union iwreq_data *wrqu, char *extra);
 int cfg80211_wext_siwgenie(struct net_device *dev,
                           struct iw_request_info *info,
-                          struct iw_point *data, char *extra);
+                          union iwreq_data *wrqu, char *extra);
 
 
 int cfg80211_wext_freq(struct iw_freq *freq);

diff --git a/net/wireless/wext-sme.c b/net/wireless/wext-sme.c
index 68f45af..191c6d9 100644 (file)
--- a/net/wireless/wext-sme.c
+++ b/net/wireless/wext-sme.c
@@ -324,8 +324,9 @@ int cfg80211_mgd_wext_giwap(struct net_device *dev,
 
 int cfg80211_wext_siwgenie(struct net_device *dev,
                           struct iw_request_info *info,
-                          struct iw_point *data, char *extra)
+                          union iwreq_data *wrqu, char *extra)
 {
+       struct iw_point *data = &wrqu->data;
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
        u8 *ie = extra;
@@ -374,7 +375,7 @@ int cfg80211_wext_siwgenie(struct net_device *dev,
 
 int cfg80211_wext_siwmlme(struct net_device *dev,
                          struct iw_request_info *info,
-                         struct iw_point *data, char *extra)
+                         union iwreq_data *wrqu, char *extra)
 {
        struct wireless_dev *wdev = dev->ieee80211_ptr;
        struct iw_mlme *mlme = (struct iw_mlme *)extra;