[Madwifi-cvs] revision 4068 committed
Status: Beta
Brought to you by:
otaku
Menu
▾
▴
[Madwifi-cvs] revision 4068 committed
|
From: Pavel R. <svn...@ma...> - 2009-07-04 03:10:59
|
Project : madwifi
Revision : 4068
Author : proski (Pavel Roskin)
Date : 2009-07-04 05:10:46 +0200 (Sat, 04 Jul 2009)
Log Message :
Merge r4022, r4059 and r4061 from trunk
Affected Files:
* madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/ah_os.h updated
* madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211.c updated
* madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.c updated
* madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.h updated
* madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_skb.c updated
* madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c updated
* madwifi/branches/madwifi-hal-0.9.30.13/ath_hal/ah_os.h updated
* madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211.c updated
* madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.c updated
* madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.h updated
* madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_skb.c updated
* madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_wireless.c updated
* madwifi/branches/madwifi-hal-testing/ath_hal/ah_os.h updated
* madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c updated
* madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.c updated
* madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.h updated
* madwifi/branches/madwifi-hal-testing/net80211/ieee80211_skb.c updated
* madwifi/branches/madwifi-hal-testing/net80211/ieee80211_wireless.c updated
Modified: madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/ah_os.h
===================================================================
--- madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/ah_os.h 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.10.5.6/ath_hal/ah_os.h 2009-07-04 03:10:46 UTC (rev 4068)
@@ -198,8 +198,9 @@
(0x7000 <= (__reg) && (__reg) < 0x8000))
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
# define _OS_REG_WRITE(_ah, _reg, _val) do { \
- is_reg_le(_reg) ? \
- iowrite32((_val), (_ah)->ah_sh + (_reg)) : \
+ if (is_reg_le(_reg)) \
+ iowrite32((_val), (_ah)->ah_sh + (_reg)); \
+ else \
iowrite32be((_val), (_ah)->ah_sh + (_reg)); \
} while (0)
# define _OS_REG_READ(_ah, _reg) \
Modified: madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211.c
===================================================================
--- madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -409,6 +409,11 @@
.ndo_set_multicast_list = ieee80211_set_multicast_list,
.ndo_change_mtu = ieee80211_change_mtu,
.ndo_do_ioctl = ieee80211_ioctl,
+#if IEEE80211_VLAN_TAG_USED
+ .ndo_vlan_rx_register = ieee80211_vlan_register,
+ .ndo_vlan_rx_add_vid = ieee80211_vlan_add_vid,
+ .ndo_vlan_rx_kill_vid = ieee80211_vlan_kill_vid,
+#endif
};
#endif
@@ -441,6 +446,11 @@
dev->set_multicast_list = ieee80211_set_multicast_list;
dev->change_mtu = ieee80211_change_mtu;
dev->do_ioctl = ieee80211_ioctl;
+#if IEEE80211_VLAN_TAG_USED
+ dev->vlan_rx_register = ieee80211_vlan_register;
+ dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
+ dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
+#endif
#else
dev->netdev_ops = &ieee80211_netdev_ops;
#endif
Modified: madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.c
===================================================================
--- madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -178,7 +178,7 @@
/*
* Register a vlan group.
*/
-static void
+void
ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -189,7 +189,7 @@
/*
* Add an rx vlan identifier
*/
-static void
+void
ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -201,7 +201,7 @@
/*
* Kill (i.e. delete) a vlan identifier.
*/
-static void
+void
ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -219,9 +219,6 @@
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
- dev->vlan_rx_register = ieee80211_vlan_register;
- dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
- dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
#endif /* IEEE80211_VLAN_TAG_USED */
}
@@ -288,7 +285,7 @@
static const char *tag = "STA-TRAFFIC-STAT";
struct net_device *dev = vap->iv_dev;
union iwreq_data wreq;
- char buf[1024];
+ char buf[256];
snprintf(buf, sizeof(buf), "%s\nmac=" MAC_FMT "\nrx_packets=%u\nrx_bytes=%llu\n"
"tx_packets=%u\ntx_bytes=%llu\n", tag,
Modified: madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.h
===================================================================
--- madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.h 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_linux.h 2009-07-04 03:10:46 UTC (rev 4068)
@@ -636,4 +636,8 @@
struct net_device *);
struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *,
struct net_device *, int, int);
+void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp);
+void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid);
+void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid);
+
#endif /* _NET80211_IEEE80211_LINUX_H_ */
Modified: madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_skb.c
===================================================================
--- madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_skb.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_skb.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -105,7 +105,7 @@
{
va_list args;
char skb_count[32] = { '\0' };
- char expanded_message[1024] = { '\0' };
+ char expanded_message[256] = { '\0' };
if (show_counter) {
#ifdef IEEE80211_DEBUG_REFCNT
snprintf(skb_count,
Modified: madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c
===================================================================
--- madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.10.5.6/net80211/ieee80211_wireless.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -1673,17 +1673,21 @@
{
struct ieee80211vap *vap = netdev_priv(dev);
struct ieee80211com *ic = vap->iv_ic;
- struct waplistreq req; /* XXX off stack */
+ struct waplistreq *req;
- req.vap = vap;
- req.i = 0;
- ieee80211_scan_iterate(ic, waplist_cb, &req);
+ req = kmalloc(sizeof(struct waplistreq), GFP_KERNEL);
+ if (!req)
+ return -ENOMEM;
- data->length = req.i;
- memcpy(extra, &req.addr, req.i * sizeof(req.addr[0]));
+ req->vap = vap;
+ req->i = 0;
+ ieee80211_scan_iterate(ic, waplist_cb, req);
+
+ data->length = req->i;
+ memcpy(extra, &req->addr, req->i * sizeof(req->addr[0]));
data->flags = 1; /* signal quality present (sort of) */
- memcpy(extra + req.i * sizeof(req.addr[0]), &req.qual,
- req.i * sizeof(req.qual[0]));
+ memcpy(extra + req->i * sizeof(req->addr[0]), &req->qual,
+ req->i * sizeof(req->qual[0]));
return 0;
}
Modified: madwifi/branches/madwifi-hal-0.9.30.13/ath_hal/ah_os.h
===================================================================
--- madwifi/branches/madwifi-hal-0.9.30.13/ath_hal/ah_os.h 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.9.30.13/ath_hal/ah_os.h 2009-07-04 03:10:46 UTC (rev 4068)
@@ -198,8 +198,9 @@
(0x7000 <= (__reg) && (__reg) < 0x8000))
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
# define _OS_REG_WRITE(_ah, _reg, _val) do { \
- is_reg_le(_reg) ? \
- iowrite32((_val), (_ah)->ah_sh + (_reg)) : \
+ if (is_reg_le(_reg)) \
+ iowrite32((_val), (_ah)->ah_sh + (_reg)); \
+ else \
iowrite32be((_val), (_ah)->ah_sh + (_reg)); \
} while (0)
# define _OS_REG_READ(_ah, _reg) \
Modified: madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211.c
===================================================================
--- madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -409,6 +409,11 @@
.ndo_set_multicast_list = ieee80211_set_multicast_list,
.ndo_change_mtu = ieee80211_change_mtu,
.ndo_do_ioctl = ieee80211_ioctl,
+#if IEEE80211_VLAN_TAG_USED
+ .ndo_vlan_rx_register = ieee80211_vlan_register,
+ .ndo_vlan_rx_add_vid = ieee80211_vlan_add_vid,
+ .ndo_vlan_rx_kill_vid = ieee80211_vlan_kill_vid,
+#endif
};
#endif
@@ -441,6 +446,11 @@
dev->set_multicast_list = ieee80211_set_multicast_list;
dev->change_mtu = ieee80211_change_mtu;
dev->do_ioctl = ieee80211_ioctl;
+#if IEEE80211_VLAN_TAG_USED
+ dev->vlan_rx_register = ieee80211_vlan_register;
+ dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
+ dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
+#endif
#else
dev->netdev_ops = &ieee80211_netdev_ops;
#endif
Modified: madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.c
===================================================================
--- madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -178,7 +178,7 @@
/*
* Register a vlan group.
*/
-static void
+void
ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -189,7 +189,7 @@
/*
* Add an rx vlan identifier
*/
-static void
+void
ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -201,7 +201,7 @@
/*
* Kill (i.e. delete) a vlan identifier.
*/
-static void
+void
ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -219,9 +219,6 @@
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
- dev->vlan_rx_register = ieee80211_vlan_register;
- dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
- dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
#endif /* IEEE80211_VLAN_TAG_USED */
}
@@ -288,7 +285,7 @@
static const char *tag = "STA-TRAFFIC-STAT";
struct net_device *dev = vap->iv_dev;
union iwreq_data wreq;
- char buf[1024];
+ char buf[256];
snprintf(buf, sizeof(buf), "%s\nmac=" MAC_FMT "\nrx_packets=%u\nrx_bytes=%llu\n"
"tx_packets=%u\ntx_bytes=%llu\n", tag,
Modified: madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.h
===================================================================
--- madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.h 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_linux.h 2009-07-04 03:10:46 UTC (rev 4068)
@@ -636,4 +636,8 @@
struct net_device *);
struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *,
struct net_device *, int, int);
+void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp);
+void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid);
+void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid);
+
#endif /* _NET80211_IEEE80211_LINUX_H_ */
Modified: madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_skb.c
===================================================================
--- madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_skb.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_skb.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -105,7 +105,7 @@
{
va_list args;
char skb_count[32] = { '\0' };
- char expanded_message[1024] = { '\0' };
+ char expanded_message[256] = { '\0' };
if (show_counter) {
#ifdef IEEE80211_DEBUG_REFCNT
snprintf(skb_count,
Modified: madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_wireless.c
===================================================================
--- madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_wireless.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-0.9.30.13/net80211/ieee80211_wireless.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -1673,17 +1673,21 @@
{
struct ieee80211vap *vap = netdev_priv(dev);
struct ieee80211com *ic = vap->iv_ic;
- struct waplistreq req; /* XXX off stack */
+ struct waplistreq *req;
- req.vap = vap;
- req.i = 0;
- ieee80211_scan_iterate(ic, waplist_cb, &req);
+ req = kmalloc(sizeof(struct waplistreq), GFP_KERNEL);
+ if (!req)
+ return -ENOMEM;
- data->length = req.i;
- memcpy(extra, &req.addr, req.i * sizeof(req.addr[0]));
+ req->vap = vap;
+ req->i = 0;
+ ieee80211_scan_iterate(ic, waplist_cb, req);
+
+ data->length = req->i;
+ memcpy(extra, &req->addr, req->i * sizeof(req->addr[0]));
data->flags = 1; /* signal quality present (sort of) */
- memcpy(extra + req.i * sizeof(req.addr[0]), &req.qual,
- req.i * sizeof(req.qual[0]));
+ memcpy(extra + req->i * sizeof(req->addr[0]), &req->qual,
+ req->i * sizeof(req->qual[0]));
return 0;
}
Modified: madwifi/branches/madwifi-hal-testing/ath_hal/ah_os.h
===================================================================
--- madwifi/branches/madwifi-hal-testing/ath_hal/ah_os.h 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-testing/ath_hal/ah_os.h 2009-07-04 03:10:46 UTC (rev 4068)
@@ -205,8 +205,9 @@
# endif
# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
# define _OS_REG_WRITE(_ah, _reg, _val) do { \
- is_reg_le(_reg) ? \
- iowrite32((_val), (_ah)->ah_sh + (_reg)) : \
+ if (is_reg_le(_reg)) \
+ iowrite32((_val), (_ah)->ah_sh + (_reg)); \
+ else \
iowrite32be((_val), (_ah)->ah_sh + (_reg)); \
} while (0)
# define _OS_REG_READ(_ah, _reg) \
Modified: madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c
===================================================================
--- madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-testing/net80211/ieee80211.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -409,6 +409,11 @@
.ndo_set_multicast_list = ieee80211_set_multicast_list,
.ndo_change_mtu = ieee80211_change_mtu,
.ndo_do_ioctl = ieee80211_ioctl,
+#if IEEE80211_VLAN_TAG_USED
+ .ndo_vlan_rx_register = ieee80211_vlan_register,
+ .ndo_vlan_rx_add_vid = ieee80211_vlan_add_vid,
+ .ndo_vlan_rx_kill_vid = ieee80211_vlan_kill_vid,
+#endif
};
#endif
@@ -441,6 +446,11 @@
dev->set_multicast_list = ieee80211_set_multicast_list;
dev->change_mtu = ieee80211_change_mtu;
dev->do_ioctl = ieee80211_ioctl;
+#if IEEE80211_VLAN_TAG_USED
+ dev->vlan_rx_register = ieee80211_vlan_register;
+ dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
+ dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
+#endif
#else
dev->netdev_ops = &ieee80211_netdev_ops;
#endif
Modified: madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.c
===================================================================
--- madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -178,7 +178,7 @@
/*
* Register a vlan group.
*/
-static void
+void
ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -189,7 +189,7 @@
/*
* Add an rx vlan identifier
*/
-static void
+void
ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -201,7 +201,7 @@
/*
* Kill (i.e. delete) a vlan identifier.
*/
-static void
+void
ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid)
{
struct ieee80211vap *vap = netdev_priv(dev);
@@ -219,9 +219,6 @@
dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX |
NETIF_F_HW_VLAN_FILTER;
- dev->vlan_rx_register = ieee80211_vlan_register;
- dev->vlan_rx_add_vid = ieee80211_vlan_add_vid;
- dev->vlan_rx_kill_vid = ieee80211_vlan_kill_vid;
#endif /* IEEE80211_VLAN_TAG_USED */
}
@@ -288,7 +285,7 @@
static const char *tag = "STA-TRAFFIC-STAT";
struct net_device *dev = vap->iv_dev;
union iwreq_data wreq;
- char buf[1024];
+ char buf[256];
snprintf(buf, sizeof(buf), "%s\nmac=" MAC_FMT "\nrx_packets=%u\nrx_bytes=%llu\n"
"tx_packets=%u\ntx_bytes=%llu\n", tag,
Modified: madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.h
===================================================================
--- madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.h 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-testing/net80211/ieee80211_linux.h 2009-07-04 03:10:46 UTC (rev 4068)
@@ -636,4 +636,8 @@
struct net_device *);
struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *,
struct net_device *, int, int);
+void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp);
+void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid);
+void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid);
+
#endif /* _NET80211_IEEE80211_LINUX_H_ */
Modified: madwifi/branches/madwifi-hal-testing/net80211/ieee80211_skb.c
===================================================================
--- madwifi/branches/madwifi-hal-testing/net80211/ieee80211_skb.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-testing/net80211/ieee80211_skb.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -105,7 +105,7 @@
{
va_list args;
char skb_count[32] = { '\0' };
- char expanded_message[1024] = { '\0' };
+ char expanded_message[256] = { '\0' };
if (show_counter) {
#ifdef IEEE80211_DEBUG_REFCNT
snprintf(skb_count,
Modified: madwifi/branches/madwifi-hal-testing/net80211/ieee80211_wireless.c
===================================================================
--- madwifi/branches/madwifi-hal-testing/net80211/ieee80211_wireless.c 2009-06-29 19:00:42 UTC (rev 4067)
+++ madwifi/branches/madwifi-hal-testing/net80211/ieee80211_wireless.c 2009-07-04 03:10:46 UTC (rev 4068)
@@ -1673,17 +1673,21 @@
{
struct ieee80211vap *vap = netdev_priv(dev);
struct ieee80211com *ic = vap->iv_ic;
- struct waplistreq req; /* XXX off stack */
+ struct waplistreq *req;
- req.vap = vap;
- req.i = 0;
- ieee80211_scan_iterate(ic, waplist_cb, &req);
+ req = kmalloc(sizeof(struct waplistreq), GFP_KERNEL);
+ if (!req)
+ return -ENOMEM;
- data->length = req.i;
- memcpy(extra, &req.addr, req.i * sizeof(req.addr[0]));
+ req->vap = vap;
+ req->i = 0;
+ ieee80211_scan_iterate(ic, waplist_cb, req);
+
+ data->length = req->i;
+ memcpy(extra, &req->addr, req->i * sizeof(req->addr[0]));
data->flags = 1; /* signal quality present (sort of) */
- memcpy(extra + req.i * sizeof(req.addr[0]), &req.qual,
- req.i * sizeof(req.qual[0]));
+ memcpy(extra + req->i * sizeof(req->addr[0]), &req->qual,
+ req->i * sizeof(req->qual[0]));
return 0;
}
|