Add _{get,set}_encodeext and improve logging in _encode The code in _{get,set}_encode has been reordered a bit so we have better logging (function entry and exit) and _{get,set}_encodeext have been implemented as a wrapper for the ieee80211 stack functions.
diff --git a/ioctl.c b/ioctl.c index 041f165..1fdddd7 100644 --- a/ioctl.c +++ b/ioctl.c @@ -1007,7 +1007,9 @@ acx_ioctl_set_encode( union iwreq_data *wrqu, char *extra) { - int result = ieee80211_wx_set_encode(netdev_priv(ndev), info, wrqu, extra); + int result; + FN_ENTER; + result = ieee80211_wx_set_encode(netdev_priv(ndev), info, wrqu, extra); FN_EXIT1(result); return result; } @@ -1023,12 +1025,45 @@ acx_ioctl_get_encode( union iwreq_data *wrqu, char *extra) { - int result = ieee80211_wx_get_encode(netdev_priv(ndev), info, wrqu, extra); + int result; + FN_ENTER; + result = ieee80211_wx_get_encode(netdev_priv(ndev), info, wrqu, extra); FN_EXIT1(result); return result; } - +/*********************************************************************** +** acx_ioctl_set_encodeext +*/ +static int +acx_ioctl_set_encodeext( + struct net_device *ndev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + int result; + FN_ENTER; + result = ieee80211_wx_set_encodeext(netdev_priv(ndev), info, wrqu, extra); + FN_EXIT1(result); + return result; +} +/*********************************************************************** +** acx_ioctl_get_encodeext +*/ +static int +acx_ioctl_get_encodeext( + struct net_device *ndev, + struct iw_request_info *info, + union iwreq_data *wrqu, + char *extra) +{ + int result; + FN_ENTER; + result = ieee80211_wx_get_encodeext(netdev_priv(ndev), info, wrqu, extra); + FN_EXIT1(result); + return result; +} /*********************************************************************** */ static int @@ -2502,6 +2537,8 @@ static const iw_handler acx_ioctl_handle /* Encoding */ WX(SIOCSIWENCODE) = acx_ioctl_set_encode, WX(SIOCGIWENCODE) = acx_ioctl_get_encode, + WX(SIOCSIWENCODEEXT) = acx_ioctl_set_encodeext, + WX(SIOCGIWENCODEEXT) = acx_ioctl_get_encodeext, /* Power saving */ WX(SIOCSIWPOWER) = acx_ioctl_set_power, WX(SIOCGIWPOWER) = acx_ioctl_get_power, -- Carlos Martín Nieto | http://www.cmartin.tk "Erdbeben? Sicherlich etwas, das mit Erdberen zu tun hat." -- me, paraphrased - To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html