KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

madwifi: improve reliability of the wds modes

Browse source 
SVN-Revision: 13416
This commit is contained in:
Felix Fietkau 2008-11-28 20:46:52 +00:00
parent bd29378e8d
commit 9d5a1f6aa4
16 changed files with 862 additions and 889 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

878
package/madwifi/patches/370-wdsvap.patch
View file

File diff suppressed because it is too large Load diff

815
package/madwifi/patches/371-wds_sta_separation.patch
View file

@ -1,815 +0,0 @@
--- a/net80211/ieee80211_input.c
+++ b/net80211/ieee80211_input.c
@@ -202,6 +202,7 @@ ieee80211_input(struct ieee80211vap * va
struct ieee80211com *ic;
struct net_device *dev;
struct ieee80211_node *ni_wds = NULL;
+ struct net_device_stats *stats;
struct ieee80211_frame *wh;
struct ieee80211_key *key;
struct ether_header *eh;
@@ -447,7 +448,7 @@ ieee80211_input(struct ieee80211vap * va
switch (type) {
case IEEE80211_FC0_TYPE_DATA:
- hdrspace = ieee80211_hdrspace(ic, wh);
+ hdrspace = ieee80211_hdrsize(wh);
if (skb->len < hdrspace) {
IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
wh, "data", "too short: len %u, expecting %u",
@@ -457,16 +458,24 @@ ieee80211_input(struct ieee80211vap * va
}
switch (vap->iv_opmode) {
case IEEE80211_M_STA:
- if ((dir != IEEE80211_FC1_DIR_FROMDS) &&
- (!((vap->iv_flags_ext & IEEE80211_FEXT_WDS) &&
- (dir == IEEE80211_FC1_DIR_DSTODS)))) {
+ switch(dir) {
+ case IEEE80211_FC1_DIR_FROMDS:
+ break;
+ case IEEE80211_FC1_DIR_DSTODS:
+ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS)
+ break;
+ default:
IEEE80211_DISCARD(vap, IEEE80211_MSG_ANY,
wh, "data", "invalid dir 0x%x", dir);
vap->iv_stats.is_rx_wrongdir++;
goto out;
}
- if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+ if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+ /* ignore 3-addr mcast if we're WDS STA */
+ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS)
+ goto out;
+
/* Discard multicast if IFF_MULTICAST not set */
if ((0 != memcmp(wh->i_addr3, dev->broadcast, ETH_ALEN)) &&
(0 == (dev->flags & IFF_MULTICAST))) {
@@ -494,24 +503,10 @@ ieee80211_input(struct ieee80211vap * va
vap->iv_stats.is_rx_mcastecho++;
goto out;
}
- /*
- * if it is brodcasted by me on behalf of
- * a station behind me, drop it.
- */
- if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) {
- struct ieee80211_node_table *nt;
- struct ieee80211_node *ni_wds;
- nt = &ic->ic_sta;
- ni_wds = ieee80211_find_wds_node(nt, wh->i_addr3);
- if (ni_wds) {
- ieee80211_unref_node(&ni_wds);
- IEEE80211_DISCARD(vap, IEEE80211_MSG_INPUT,
- wh, NULL, "%s",
- "multicast echo originated from node behind me");
- vap->iv_stats.is_rx_mcastecho++;
- goto out;
- }
- }
+ } else {
+ /* Same BSSID, but not meant for us to receive */
+ if (!IEEE80211_ADDR_EQ(wh->i_addr1, vap->iv_myaddr))
+ goto out;
}
break;
case IEEE80211_M_IBSS:
@@ -553,14 +548,30 @@ ieee80211_input(struct ieee80211vap * va
vap->iv_stats.is_rx_notassoc++;
goto err;
}
+
+ /* subif isn't fully set up yet, drop the frame */
+ if (ni->ni_subif == ni->ni_vap)
+ goto err;
+
/*
* If we're a 4 address packet, make sure we have an entry in
* the node table for the packet source address (addr4).
* If not, add one.
*/
+ /* check for wds link first */
+ if ((dir == IEEE80211_FC1_DIR_DSTODS) && !ni->ni_subif) {
+ if (vap->iv_flags_ext & IEEE80211_FEXT_WDSSEP) {
+ ieee80211_wds_addif(ni);
+ /* we must drop frames here until the interface has
+ * been fully separated, otherwise a bridge might get
+ * confused */
+ goto err;
+ }
+ }
/* XXX: Useless node mgmt API; make better */
- if ((dir == IEEE80211_FC1_DIR_DSTODS) && !vap->iv_wdsnode && !ni_wds) {
+ if ((dir == IEEE80211_FC1_DIR_DSTODS) && !vap->iv_wdsnode &&
+ !ni_wds && !ni->ni_subif) {
struct ieee80211_node_table *nt = &ic->ic_sta;
struct ieee80211_frame_addr4 *wh4;
@@ -620,6 +631,11 @@ ieee80211_input(struct ieee80211vap * va
goto out;
}
+ /* check if there is any data left */
+ hdrspace = ieee80211_hdrspace(ic, wh);
+ if (skb->len < hdrspace)
+ goto out;
+
/*
* Handle privacy requirements. Note that we
* must not be preempted from here until after
@@ -692,8 +708,12 @@ ieee80211_input(struct ieee80211vap * va
if (! accept_data_frame(vap, ni, key, skb, eh))
goto out;
- vap->iv_devstats.rx_packets++;
- vap->iv_devstats.rx_bytes += skb->len;
+ if (ni->ni_subif && ((eh)->ether_type != __constant_htons(ETHERTYPE_PAE)))
+ stats = &ni->ni_subif->iv_devstats;
+ else
+ stats = &vap->iv_devstats;
+ stats->rx_packets++;
+ stats->rx_bytes += skb->len;
IEEE80211_NODE_STAT(ni, rx_data);
IEEE80211_NODE_STAT_ADD(ni, rx_bytes, skb->len);
ic->ic_lastdata = jiffies;
@@ -1126,6 +1146,13 @@ ieee80211_deliver_data(struct ieee80211_
dev = vap->iv_xrvap->iv_dev;
#endif
+ /* if the node has a wds subif, move data frames there,
+ * but keep EAP traffic on the master */
+ if (ni->ni_subif && ((eh)->ether_type != __constant_htons(ETHERTYPE_PAE))) {
+ vap = ni->ni_subif;
+ dev = vap->iv_dev;
+ }
+
/* perform as a bridge within the vap */
/* XXX intra-vap bridging only */
if (vap->iv_opmode == IEEE80211_M_HOSTAP &&
@@ -1151,7 +1178,16 @@ ieee80211_deliver_data(struct ieee80211_
if (ni1 != NULL) {
if (ni1->ni_vap == vap &&
ieee80211_node_is_authorized(ni1) &&
+ !ni1->ni_subif &&
ni1 != vap->iv_bss) {
+
+ /* tried to bridge to a subif, drop the packet */
+ if (ni->ni_subif) {
+ ieee80211_unref_node(&ni1);
+ ieee80211_dev_kfree_skb(&skb);
+ return;
+ }
+
skb1 = skb;
skb = NULL;
}
--- a/net80211/ieee80211_ioctl.h
+++ b/net80211/ieee80211_ioctl.h
@@ -649,6 +649,7 @@ enum {
IEEE80211_PARAM_BGSCAN_THRESH = 79, /* bg scan rssi threshold */
IEEE80211_PARAM_RSSI_DIS_THR = 80, /* rssi threshold for disconnection */
IEEE80211_PARAM_RSSI_DIS_COUNT = 81, /* counter for rssi threshold */
+ IEEE80211_PARAM_WDS_SEP = 82, /* move wds stations into separate interfaces */
};
#define SIOCG80211STATS (SIOCDEVPRIVATE+2)
--- a/net80211/ieee80211_node.h
+++ b/net80211/ieee80211_node.h
@@ -92,11 +92,13 @@ struct ath_softc;
* the ieee80211com structure.
*/
struct ieee80211_node {
- struct ieee80211vap *ni_vap;
+ struct ieee80211vap *ni_vap, *ni_subif;
struct ieee80211com *ni_ic;
struct ieee80211_node_table *ni_table;
TAILQ_ENTRY(ieee80211_node) ni_list;
LIST_ENTRY(ieee80211_node) ni_hash;
+ struct work_struct ni_create; /* task for creating a subif */
+ struct work_struct ni_destroy; /* task for destroying a subif */
atomic_t ni_refcnt;
u_int ni_scangen; /* gen# for timeout scan */
u_int8_t ni_authmode; /* authentication algorithm */
@@ -430,5 +432,6 @@ void ieee80211_node_join(struct ieee8021
void ieee80211_node_leave(struct ieee80211_node *);
u_int8_t ieee80211_getrssi(struct ieee80211com *);
int32_t ieee80211_get_node_count(struct ieee80211com *);
+void ieee80211_wds_addif(struct ieee80211_node *ni);
#endif /* _NET80211_IEEE80211_NODE_H_ */
--- a/net80211/ieee80211_var.h
+++ b/net80211/ieee80211_var.h
@@ -322,6 +322,7 @@ struct ieee80211com {
u_int8_t ic_myaddr[IEEE80211_ADDR_LEN];
struct timer_list ic_inact; /* mgmt/inactivity timer */
+ unsigned int ic_subifs;
u_int32_t ic_flags; /* state flags */
u_int32_t ic_flags_ext; /* extension of state flags */
u_int32_t ic_caps; /* capabilities */
@@ -625,6 +626,7 @@ MALLOC_DECLARE(M_80211_VAP);
#define IEEE80211_FEXT_DROPUNENC_EAPOL 0x00000800 /* CONF: drop unencrypted eapol frames */
#define IEEE80211_FEXT_APPIE_UPDATE 0x00001000 /* STATE: beacon APP IE updated */
#define IEEE80211_FEXT_BGSCAN_THR 0x00002000 /* bgscan due to low rssi */
+#define IEEE80211_FEXT_WDSSEP 0x00004000 /* move wds clients into separate interfaces */
#define IEEE80211_COM_UAPSD_ENABLE(_ic) ((_ic)->ic_flags_ext |= IEEE80211_FEXT_UAPSD)
#define IEEE80211_COM_UAPSD_DISABLE(_ic) ((_ic)->ic_flags_ext &= ~IEEE80211_FEXT_UAPSD)
--- a/net80211/ieee80211_wireless.c
+++ b/net80211/ieee80211_wireless.c
@@ -2867,6 +2867,14 @@ ieee80211_ioctl_setparam(struct net_devi
else
vap->iv_minrateindex = 0;
break;
+ case IEEE80211_PARAM_WDS_SEP:
+ if (vap->iv_opmode != IEEE80211_M_HOSTAP)
+ retv = -EINVAL;
+ else if (value)
+ vap->iv_flags_ext |= IEEE80211_FEXT_WDSSEP;
+ else
+ vap->iv_flags_ext &= ~IEEE80211_FEXT_WDSSEP;
+ break;
#ifdef ATH_REVERSE_ENGINEERING
case IEEE80211_PARAM_DUMPREGS:
ieee80211_dump_registers(dev, info, w, extra);
@@ -3223,6 +3231,9 @@ ieee80211_ioctl_getparam(struct net_devi
case IEEE80211_PARAM_MINRATE:
param[0] = vap->iv_minrateindex;
break;
+ case IEEE80211_PARAM_WDS_SEP:
+ param[0] = !!(vap->iv_flags_ext & IEEE80211_FEXT_WDSSEP);
+ break;
default:
return -EOPNOTSUPP;
}
@@ -4450,6 +4461,8 @@ get_sta_space(void *arg, struct ieee8021
struct ieee80211vap *vap = ni->ni_vap;
size_t ielen;
+ if (req->vap->iv_wdsnode && ni->ni_subif)
+ vap = ni->ni_subif;
if (vap != req->vap && vap != req->vap->iv_xrvap) /* only entries for this vap */
return;
if ((vap->iv_opmode == IEEE80211_M_HOSTAP ||
@@ -4469,6 +4482,8 @@ get_sta_info(void *arg, struct ieee80211
size_t ielen, len;
u_int8_t *cp;
+ if (req->vap->iv_wdsnode && ni->ni_subif)
+ vap = ni->ni_subif;
if (vap != req->vap && vap != req->vap->iv_xrvap) /* only entries for this vap (or) xrvap */
return;
if ((vap->iv_opmode == IEEE80211_M_HOSTAP ||
@@ -5770,6 +5785,10 @@ static const struct iw_priv_args ieee802
0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_minrate"},
{ IEEE80211_IOCTL_SETSCANLIST,
IW_PRIV_TYPE_CHAR | 255, 0, "setscanlist"},
+ { IEEE80211_PARAM_WDS_SEP,
+ IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "wdssep"},
+ { IEEE80211_PARAM_WDS_SEP,
+ 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_wdssep"},
#ifdef ATH_REVERSE_ENGINEERING
/*
@@ -5893,6 +5912,8 @@ static int
ieee80211_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct ieee80211vap *vap = dev->priv;
+ struct ieee80211com *ic = vap->iv_ic;
+ struct ieee80211_node *ni;
switch (cmd) {
case SIOCG80211STATS:
@@ -5901,8 +5922,20 @@ ieee80211_ioctl(struct net_device *dev,
case SIOC80211IFDESTROY:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
+ /* drop all node subifs */
+ TAILQ_FOREACH(ni, &ic->ic_sta.nt_node, ni_list) {
+ struct ieee80211vap *avp = ni->ni_subif;
+
+ if (ni->ni_vap != vap)
+ continue;
+ if (!avp)
+ continue;
+ ni->ni_subif = NULL;
+ ieee80211_stop(avp->iv_dev);
+ ic->ic_vap_delete(avp);
+ }
ieee80211_stop(vap->iv_dev); /* force state before cleanup */
- vap->iv_ic->ic_vap_delete(vap);
+ ic->ic_vap_delete(vap);
return 0;
case IEEE80211_IOCTL_GETKEY:
return ieee80211_ioctl_getkey(dev, (struct iwreq *) ifr);
--- a/net80211/ieee80211_node.c
+++ b/net80211/ieee80211_node.c
@@ -47,6 +47,7 @@
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/random.h>
+#include <linux/rtnetlink.h>
#include "if_media.h"
@@ -236,7 +237,11 @@ void
ieee80211_node_vdetach(struct ieee80211vap *vap)
{
struct ieee80211com *ic = vap->iv_ic;
+ struct ieee80211_node *ni;
+ ni = vap->iv_wdsnode;
+ if (ni)
+ ni->ni_subif = NULL;
ieee80211_node_table_reset(&ic->ic_sta, vap);
if (vap->iv_bss != NULL) {
ieee80211_unref_node(&vap->iv_bss);
@@ -1140,6 +1145,57 @@ ieee80211_alloc_node(struct ieee80211vap
return ni;
}
+#define WDSIFNAME ".sta%d"
+static void
+ieee80211_wds_do_addif(struct work_struct *work)
+{
+ struct ieee80211_node *ni = container_of(work, struct ieee80211_node, ni_create);
+ struct ieee80211vap *vap = ni->ni_vap;
+ struct ieee80211com *ic = vap->iv_ic;
+ struct ieee80211vap *avp;
+ char *name;
+
+ rtnl_lock();
+ /* did we get cancelled by the destroy call? */
+ if (!ni->ni_subif)
+ goto done;
+
+ ni->ni_subif = NULL;
+ name = kmalloc(strlen(vap->iv_dev->name) + sizeof(WDSIFNAME) + 1, GFP_KERNEL);
+ if (!name)
+ goto done;
+
+ strcpy(name, vap->iv_dev->name);
+ strcat(name, WDSIFNAME);
+ avp = ieee80211_create_vap(ic, name, ic->ic_dev, IEEE80211_M_WDS, 0, vap);
+ kfree(name);
+ if (!avp)
+ goto done;
+
+ memcpy(avp->wds_mac, ni->ni_bssid, IEEE80211_ADDR_LEN);
+ avp->iv_wdsnode = ieee80211_ref_node(ni);
+ ni->ni_subif = avp;
+ ic->ic_subifs++;
+
+done:
+ rtnl_unlock();
+ ieee80211_unref_node(&ni);
+}
+#undef WDSIFNAME
+
+void ieee80211_wds_addif(struct ieee80211_node *ni)
+{
+ /* check if the node is split out already,
+ * or if we're in progress of setting up a new interface already */
+ if (ni->ni_subif)
+ return;
+
+ ieee80211_ref_node(ni);
+ ni->ni_subif = ni->ni_vap;
+ IEEE80211_INIT_WORK(&ni->ni_create, ieee80211_wds_do_addif);
+ schedule_work(&ni->ni_create);
+}
+
/* Add wds address to the node table */
int
#ifdef IEEE80211_DEBUG_REFCNT
@@ -2285,6 +2341,36 @@ ieee80211_node_leave_11g(struct ieee8021
}
}
+static void
+ieee80211_subif_destroy(struct work_struct *work)
+{
+ struct ieee80211_node *ni = container_of(work, struct ieee80211_node, ni_destroy);
+ struct ieee80211vap *vap;
+ struct ieee80211com *ic;
+
+ rtnl_lock();
+ vap = ni->ni_subif;
+
+ /* if addif is waiting for the timer to fire, cancel! */
+ if (vap == ni->ni_vap) {
+ ni->ni_subif = NULL;
+ goto done;
+ }
+
+ if (!vap)
+ goto done;
+
+ ic = vap->iv_ic;
+ ni->ni_subif = NULL;
+ ieee80211_stop(vap->iv_dev);
+ ic->ic_vap_delete(vap);
+ ic->ic_subifs--;
+
+done:
+ ieee80211_unref_node(&ni);
+ rtnl_unlock();
+}
+
/*
* Handle bookkeeping for a station/neighbor leaving
* the bss when operating in ap or adhoc modes.
@@ -2301,6 +2387,12 @@ ieee80211_node_leave(struct ieee80211_no
ni, "station with aid %d leaves (refcnt %u)",
IEEE80211_NODE_AID(ni), atomic_read(&ni->ni_refcnt));
+ if (ni->ni_subif) {
+ ieee80211_ref_node(ni);
+ IEEE80211_INIT_WORK(&ni->ni_destroy, ieee80211_subif_destroy);
+ schedule_work(&ni->ni_destroy);
+ }
+
/* From this point onwards we can no longer find the node,
* so no more references are generated
*/
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -81,6 +81,12 @@ set_quality(struct iw_quality *iq, u_int
#endif
}
+#ifndef container_of
+#define container_of(ptr, type, member) ({ \
+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+ (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
/*
* Task deferral
*
@@ -113,6 +119,29 @@ typedef void *IEEE80211_TQUEUE_ARG;
#define IEEE80211_RESCHEDULE schedule
+#include <linux/sched.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
+#include <linux/tqueue.h>
+#define work_struct tq_struct
+#define schedule_work(t) schedule_task((t))
+#define flush_scheduled_work() flush_scheduled_tasks()
+#define IEEE80211_INIT_WORK(t, f) do { \
+ memset((t), 0, sizeof(struct tq_struct)); \
+ (t)->routine = (void (*)(void*)) (f); \
+ (t)->data=(void *) (t); \
+} while (0)
+#else
+#include <linux/workqueue.h>
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#define IEEE80211_INIT_WORK(_t, _f) INIT_WORK((_t), (void (*)(void *))(_f), (_t));
+#else
+#define IEEE80211_INIT_WORK(_t, _f) INIT_WORK((_t), (_f));
+#endif
+
+#endif /* KERNEL_VERSION < 2.5.41 */
+
+
/* Locking */
/* NB: beware, spin_is_locked() is not usefully defined for !(DEBUG || SMP)
* because spinlocks do not exist in this configuration. Instead IRQs
--- a/net80211/ieee80211_proto.c
+++ b/net80211/ieee80211_proto.c
@@ -1081,6 +1081,8 @@ ieee80211_init(struct net_device *dev, i
int
ieee80211_open(struct net_device *dev)
{
+ struct ieee80211vap *vap = dev->priv;
+
return ieee80211_init(dev, 0);
}
@@ -1123,6 +1125,7 @@ ieee80211_stop(struct net_device *dev)
struct ieee80211vap *vap = dev->priv;
struct ieee80211com *ic = vap->iv_ic;
struct net_device *parent = ic->ic_dev;
+ struct ieee80211_node *tni, *ni;
struct ieee80211vap *avp;
IEEE80211_DPRINTF(vap,
@@ -1138,6 +1141,27 @@ ieee80211_stop(struct net_device *dev)
ieee80211_stop(avp->iv_dev);
}
+ /* get rid of all wds nodes while we're still locked */
+ do {
+ ni = NULL;
+
+ IEEE80211_NODE_TABLE_LOCK_IRQ(&ic->ic_sta);
+ TAILQ_FOREACH(tni, &ic->ic_sta.nt_node, ni_list) {
+ if (tni->ni_vap != vap)
+ continue;
+ if (!tni->ni_subif)
+ continue;
+ ni = tni;
+ break;
+ }
+ IEEE80211_NODE_TABLE_UNLOCK_IRQ(&ic->ic_sta);
+
+ if (!ni)
+ break;
+
+ ieee80211_node_leave(ni);
+ } while (1);
+
ieee80211_new_state(vap, IEEE80211_S_INIT, -1);
if (dev->flags & IFF_RUNNING) {
dev->flags &= ~IFF_RUNNING; /* mark us stopped */
@@ -1653,6 +1677,7 @@ __ieee80211_newstate(struct ieee80211vap
*/
if (ni->ni_authmode != IEEE80211_AUTH_8021X)
ieee80211_node_authorize(ni);
+
#ifdef ATH_SUPERG_XR
/*
* fire a timer to bring up XR vap if configured.
@@ -1912,8 +1937,15 @@ ieee80211_newstate(struct ieee80211vap *
if (ostate == IEEE80211_S_SCAN ||
ostate == IEEE80211_S_AUTH ||
ostate == IEEE80211_S_ASSOC) {
+
/* Transition (S_SCAN|S_AUTH|S_ASSOC) -> S_RUN */
__ieee80211_newstate(vap, nstate, arg);
+
+ /* if we're in wds, let the ap know that we're doing this */
+ if ((vap->iv_opmode == IEEE80211_M_STA) &&
+ (vap->iv_flags_ext & IEEE80211_FEXT_WDS))
+ ieee80211_send_nulldata(ieee80211_ref_node(vap->iv_bss));
+
/* Then bring up all other vaps pending on the scan */
dstate = get_dominant_state(ic);
if (dstate == IEEE80211_S_RUN) {
--- a/net80211/ieee80211.c
+++ b/net80211/ieee80211.c
@@ -373,10 +373,25 @@ void
ieee80211_ifdetach(struct ieee80211com *ic)
{
struct ieee80211vap *vap;
+ int count;
+
+ /* bring down all vaps */
+ TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) {
+ ieee80211_stop(vap->iv_dev);
+ }
+
+ /* wait for all subifs to disappear */
+ do {
+ schedule();
+ rtnl_lock();
+ count = ic->ic_subifs;
+ rtnl_unlock();
+ } while (count > 0);
rtnl_lock();
- while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL)
+ while ((vap = TAILQ_FIRST(&ic->ic_vaps)) != NULL) {
ic->ic_vap_delete(vap);
+ }
rtnl_unlock();
del_timer(&ic->ic_dfs_excl_timer);
@@ -600,8 +615,10 @@ ieee80211_vap_detach(struct ieee80211vap
IEEE80211_CANCEL_TQUEUE(&vap->iv_stajoin1tq);
IEEE80211_LOCK_IRQ(ic);
- if (vap->iv_wdsnode)
+ if (vap->iv_wdsnode) {
+ vap->iv_wdsnode->ni_subif = NULL;
ieee80211_unref_node(&vap->iv_wdsnode);
+ }
if ((vap->iv_opmode == IEEE80211_M_WDS) &&
(vap->iv_master != NULL))
TAILQ_REMOVE(&vap->iv_master->iv_wdslinks, vap, iv_wdsnext);
--- a/ath/if_athvar.h
+++ b/ath/if_athvar.h
@@ -79,28 +79,6 @@ typedef void *TQUEUE_ARG;
#define tasklet_enable(t) do { (void) t; local_bh_enable(); } while (0)
#endif /* !DECLARE_TASKLET */
-#include <linux/sched.h>
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41)
-#include <linux/tqueue.h>
-#define work_struct tq_struct
-#define schedule_work(t) schedule_task((t))
-#define flush_scheduled_work() flush_scheduled_tasks()
-#define ATH_INIT_WORK(t, f) do { \
- memset((t), 0, sizeof(struct tq_struct)); \
- (t)->routine = (void (*)(void*)) (f); \
- (t)->data=(void *) (t); \
-} while (0)
-#else
-#include <linux/workqueue.h>
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#define ATH_INIT_WORK(_t, _f) INIT_WORK((_t), (void (*)(void *))(_f), (_t));
-#else
-#define ATH_INIT_WORK(_t, _f) INIT_WORK((_t), (_f));
-#endif
-
-#endif /* KERNEL_VERSION < 2.5.41 */
-
/*
* Guess how the interrupt handler should work.
*/
--- a/net80211/ieee80211_output.c
+++ b/net80211/ieee80211_output.c
@@ -252,6 +252,10 @@ ieee80211_hardstart(struct sk_buff *skb,
goto bad;
}
+ if (ni->ni_subif && (vap != ni->ni_subif) &&
+ ((eh)->ether_type != __constant_htons(ETHERTYPE_PAE)))
+ goto bad;
+
/* calculate priority so drivers can find the TX queue */
if (ieee80211_classify(ni, skb)) {
IEEE80211_NOTE(vap, IEEE80211_MSG_OUTPUT, ni,
@@ -331,20 +335,33 @@ void ieee80211_parent_queue_xmit(struct
* constructing a frame as it sets i_fc[1]; other bits can
* then be or'd in.
*/
-static void
+static struct ieee80211_frame *
ieee80211_send_setup(struct ieee80211vap *vap,
struct ieee80211_node *ni,
- struct ieee80211_frame *wh,
+ struct sk_buff *skb,
int type,
const u_int8_t sa[IEEE80211_ADDR_LEN],
const u_int8_t da[IEEE80211_ADDR_LEN],
const u_int8_t bssid[IEEE80211_ADDR_LEN])
{
#define WH4(wh) ((struct ieee80211_frame_addr4 *)wh)
+ struct ieee80211_frame *wh;
+ int len = sizeof(struct ieee80211_frame);
+ int opmode = vap->iv_opmode;
+
+ if ((type & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_DATA) {
+ if ((opmode == IEEE80211_M_STA) &&
+ (vap->iv_flags_ext & IEEE80211_FEXT_WDS))
+ opmode = IEEE80211_M_WDS;
+
+ if (opmode == IEEE80211_M_WDS)
+ len = sizeof(struct ieee80211_frame_addr4);
+ }
+ wh = (struct ieee80211_frame *)skb_push(skb, len);
wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | type;
if ((type & IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_DATA) {
- switch (vap->iv_opmode) {
+ switch (opmode) {
case IEEE80211_M_STA:
wh->i_fc[1] = IEEE80211_FC1_DIR_TODS;
IEEE80211_ADDR_COPY(wh->i_addr1, bssid);
@@ -386,6 +403,8 @@ ieee80211_send_setup(struct ieee80211vap
*(__le16 *)&wh->i_seq[0] =
htole16(ni->ni_txseqs[0] << IEEE80211_SEQ_SEQ_SHIFT);
ni->ni_txseqs[0]++;
+
+ return wh;
#undef WH4
}
@@ -407,9 +426,7 @@ ieee80211_mgmt_output(struct ieee80211_n
SKB_CB(skb)->ni = ni;
- wh = (struct ieee80211_frame *)
- skb_push(skb, sizeof(struct ieee80211_frame));
- ieee80211_send_setup(vap, ni, wh,
+ wh = ieee80211_send_setup(vap, ni, skb,
IEEE80211_FC0_TYPE_MGT | type,
vap->iv_myaddr, ni->ni_macaddr, vap->iv_bssid);
/* XXX power management */
@@ -455,6 +472,9 @@ ieee80211_send_nulldata(struct ieee80211
struct ieee80211_frame *wh;
u_int8_t *frm;
+ if (ni->ni_subif)
+ vap = ni->ni_subif;
+
skb = ieee80211_getmgtframe(&frm, 0);
if (skb == NULL) {
/* XXX debug msg */
@@ -463,9 +483,7 @@ ieee80211_send_nulldata(struct ieee80211
return -ENOMEM;
}
- wh = (struct ieee80211_frame *)
- skb_push(skb, sizeof(struct ieee80211_frame));
- ieee80211_send_setup(vap, ni, wh,
+ wh = ieee80211_send_setup(vap, ni, skb,
IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_NODATA,
vap->iv_myaddr, ni->ni_macaddr, vap->iv_bssid);
/* NB: power management bit is never sent by an AP */
@@ -503,6 +521,7 @@ ieee80211_send_qosnulldata(struct ieee80
struct sk_buff *skb;
struct ieee80211_qosframe *qwh;
u_int8_t *frm;
+ u_int8_t *i_qos;
int tid;
skb = ieee80211_getmgtframe(&frm, 2);
@@ -514,11 +533,12 @@ ieee80211_send_qosnulldata(struct ieee80
SKB_CB(skb)->ni = ieee80211_ref_node(ni);
skb->priority = ac;
- qwh = (struct ieee80211_qosframe *)skb_push(skb, sizeof(struct ieee80211_qosframe));
- qwh = (struct ieee80211_qosframe *)skb->data;
+ /* grab a pointer to QoS control and also compensate for the header length
+ * difference between QoS and non-QoS frame */
+ i_qos = skb_push(skb, sizeof(struct ieee80211_qosframe) - sizeof(struct ieee80211_frame));
- ieee80211_send_setup(vap, ni, (struct ieee80211_frame *)qwh,
+ qwh = (struct ieee80211_qosframe *) ieee80211_send_setup(vap, ni, skb,
IEEE80211_FC0_TYPE_DATA,
vap->iv_myaddr, /* SA */
ni->ni_macaddr, /* DA */
@@ -532,10 +552,10 @@ ieee80211_send_qosnulldata(struct ieee80
/* map from access class/queue to 11e header priority value */
tid = WME_AC_TO_TID(ac);
- qwh->i_qos[0] = tid & IEEE80211_QOS_TID;
+ i_qos[0] = tid & IEEE80211_QOS_TID;
if (ic->ic_wme.wme_wmeChanParams.cap_wmeParams[ac].wmep_noackPolicy)
qwh->i_qos[0] |= (1 << IEEE80211_QOS_ACKPOLICY_S) & IEEE80211_QOS_ACKPOLICY;
- qwh->i_qos[1] = 0;
+ i_qos[1] = 0;
IEEE80211_NODE_STAT(ni, tx_data);
@@ -777,6 +797,8 @@ ieee80211_encap(struct ieee80211_node *n
hdrsize = sizeof(struct ieee80211_frame);
SKB_CB(skb)->auth_pkt = (eh.ether_type == __constant_htons(ETHERTYPE_PAE));
+ if (ni->ni_subif)
+ vap = ni->ni_subif;
switch (vap->iv_opmode) {
case IEEE80211_M_IBSS:
@@ -796,20 +818,9 @@ ieee80211_encap(struct ieee80211_node *n
ismulticast = IEEE80211_IS_MULTICAST(eh.ether_dhost);
break;
case IEEE80211_M_STA:
- if ((vap->iv_flags_ext & IEEE80211_FEXT_WDS) &&
- !IEEE80211_ADDR_EQ(eh.ether_shost, vap->iv_myaddr)) {
+ if (vap->iv_flags_ext & IEEE80211_FEXT_WDS) {
use4addr = 1;
- ismulticast = IEEE80211_IS_MULTICAST(ni->ni_macaddr);
- /* Add a WDS entry to the station VAP */
- if (IEEE80211_IS_MULTICAST(eh.ether_dhost)) {
- struct ieee80211_node_table *nt = &ic->ic_sta;
- struct ieee80211_node *ni_wds
- = ieee80211_find_wds_node(nt, eh.ether_shost);
- if (ni_wds)
- ieee80211_unref_node(&ni_wds);
- else
- ieee80211_add_wds_addr(nt, ni, eh.ether_shost, 0);
- }
+ ismulticast = 0;
} else
ismulticast = IEEE80211_IS_MULTICAST(vap->iv_bssid);
break;
@@ -1680,9 +1691,7 @@ ieee80211_send_probereq(struct ieee80211
SKB_CB(skb)->ni = ieee80211_ref_node(ni);
- wh = (struct ieee80211_frame *)
- skb_push(skb, sizeof(struct ieee80211_frame));
- ieee80211_send_setup(vap, ni, wh,
+ wh = ieee80211_send_setup(vap, ni, skb,
IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_PROBE_REQ,
sa, da, bssid);
/* XXX power management? */
--- a/net80211/ieee80211_linux.c
+++ b/net80211/ieee80211_linux.c
@@ -145,7 +145,7 @@ ieee80211_getmgtframe(u_int8_t **frm, u_
struct sk_buff *skb;
u_int len;
- len = roundup(sizeof(struct ieee80211_frame) + pktlen, 4);
+ len = roundup(sizeof(struct ieee80211_frame_addr4) + pktlen, 4);
#ifdef IEEE80211_DEBUG_REFCNT
skb = ieee80211_dev_alloc_skb_debug(len + align - 1, func, line);
#else
@@ -161,7 +161,7 @@ ieee80211_getmgtframe(u_int8_t **frm, u_
SKB_CB(skb)->flags = 0;
SKB_CB(skb)->next = NULL;
- skb_reserve(skb, sizeof(struct ieee80211_frame));
+ skb_reserve(skb, sizeof(struct ieee80211_frame_addr4));
*frm = skb_put(skb, pktlen);
}
return skb;

2
package/madwifi/patches/374-nbtt_fix.patch
View file

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -5484,6 +5484,9 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5483,6 +5483,9 @@ ath_beacon_config(struct ath_softc *sc,
ath_beacon_dturbo_config(vap, intval &
~(HAL_BEACON_RESET_TSF | HAL_BEACON_ENA));
#endif

10
package/madwifi/patches/375-atim_tsf_update.patch
View file

@ -8,7 +8,7 @@
static int ath_desc_alloc(struct ath_softc *);
static void ath_desc_free(struct ath_softc *);
static void ath_desc_swap(struct ath_desc *);
@@ -2793,6 +2794,72 @@ ath_set_ack_bitrate(struct ath_softc *sc
@@ -2792,6 +2793,72 @@ ath_set_ack_bitrate(struct ath_softc *sc
return 1;
}
@ -81,7 +81,7 @@
/*
* Reset the hardware w/o losing operational state. This is
* basically a more efficient way of doing ath_stop, ath_init,
@@ -5292,6 +5359,7 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5291,6 +5358,7 @@ ath_beacon_config(struct ath_softc *sc,
u_int64_t tsf, hw_tsf;
u_int32_t tsftu, hw_tsftu;
u_int32_t intval, nexttbtt = 0;
@ -89,7 +89,7 @@
int reset_tsf = 0;
if (vap == NULL)
@@ -5299,6 +5367,9 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5298,6 +5366,9 @@ ath_beacon_config(struct ath_softc *sc,
ni = vap->iv_bss;
@ -99,7 +99,7 @@
hw_tsf = ath_hal_gettsf64(ah);
tsf = le64_to_cpu(ni->ni_tstamp.tsf);
hw_tsftu = hw_tsf >> 10;
@@ -5488,15 +5559,27 @@ ath_beacon_config(struct ath_softc *sc,
@@ -5487,15 +5558,27 @@ ath_beacon_config(struct ath_softc *sc,
<= ath_hal_sw_beacon_response_time)
nexttbtt += intval;
sc->sc_nexttbtt = nexttbtt;
@ -127,7 +127,7 @@
/* We print all debug messages here, in order to preserve the
* time critical aspect of this function */
DPRINTF(sc, ATH_DEBUG_BEACON,
@@ -6399,6 +6482,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6398,6 +6481,11 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}

2
package/madwifi/patches/377-disable_vlan_code.patch
View file

@ -1,6 +1,6 @@
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -649,22 +649,7 @@ int ieee80211_proc_vcreate(struct ieee80
@@ -657,22 +657,7 @@ int ieee80211_proc_vcreate(struct ieee80
char *);
void ieee80211_proc_cleanup(struct ieee80211vap *);

2
package/madwifi/patches/381-ibss_modes.patch
View file

@ -12,7 +12,7 @@
break;
case IEEE80211_M_AHDEMO:
case IEEE80211_M_MONITOR:
@@ -1455,7 +1458,7 @@ ath_vap_create(struct ieee80211com *ic,
@@ -1454,7 +1457,7 @@ ath_vap_create(struct ieee80211com *ic,
* frames. Other modes carry over directly to the HAL.
*/
if (ic->ic_opmode == IEEE80211_M_AHDEMO)

10
package/madwifi/patches/383-ibss_hostap.patch
View file

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -1452,6 +1452,23 @@ ath_vap_create(struct ieee80211com *ic,
@@ -1451,6 +1451,23 @@ ath_vap_create(struct ieee80211com *ic,
sc->sc_nstavaps++;
else if (opmode == IEEE80211_M_MONITOR)
sc->sc_nmonvaps++;
@ -24,7 +24,7 @@
/*
* Adhoc demo mode is a pseudo mode; to the HAL it's
* just IBSS mode and the driver doesn't use management
@@ -4279,7 +4296,8 @@ ath_calcrxfilter(struct ath_softc *sc)
@@ -4278,7 +4295,8 @@ ath_calcrxfilter(struct ath_softc *sc)
if (ic->ic_opmode != IEEE80211_M_HOSTAP && (dev->flags & IFF_PROMISC))
rfilt |= HAL_RX_FILTER_PROM;
if (ic->ic_opmode == IEEE80211_M_STA ||
@ -34,7 +34,7 @@
(sc->sc_nostabeacons) || sc->sc_scanning ||
(ic->ic_opmode == IEEE80211_M_HOSTAP))
rfilt |= HAL_RX_FILTER_BEACON;
@@ -6433,6 +6451,33 @@ ath_capture(struct net_device *dev, cons
@@ -6432,6 +6450,33 @@ ath_capture(struct net_device *dev, cons
}
/*
@ -68,7 +68,7 @@
* Intercept management frames to collect beacon RSSI data and to do
* ibss merges. This function is called for all management frames,
* including those belonging to other BSS.
@@ -6485,10 +6530,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6484,10 +6529,19 @@ ath_recv_mgmt(struct ieee80211vap * vap,
DPRINTF(sc, ATH_DEBUG_BEACON,
"Updated beacon timers\n");
}
@ -92,7 +92,7 @@
}
/* NB: Fall Through */
case IEEE80211_FC0_SUBTYPE_PROBE_RESP:
@@ -6561,6 +6615,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
@@ -6560,6 +6614,10 @@ ath_recv_mgmt(struct ieee80211vap * vap,
#endif
if (do_merge)
ieee80211_ibss_merge(ni);

8
package/madwifi/patches/384-hwdetect.patch
View file

@ -33,7 +33,7 @@
/* Allocate space for dynamically determined maximum VAP count */
sc->sc_bslot =
kmalloc(ath_maxvaps * sizeof(struct ieee80211vap*), GFP_KERNEL);
@@ -1508,6 +1520,28 @@ ath_vap_create(struct ieee80211com *ic,
@@ -1507,6 +1519,28 @@ ath_vap_create(struct ieee80211com *ic,
return vap;
}
@ -62,7 +62,7 @@
static void
ath_vap_delete(struct ieee80211vap *vap)
{
@@ -10819,6 +10853,12 @@ ath_ioctl(struct net_device *dev, struct
@@ -10818,6 +10852,12 @@ ath_ioctl(struct net_device *dev, struct
* is to add module parameters.
*/
@ -75,7 +75,7 @@
/*
* Dynamic (i.e. per-device) sysctls. These are automatically
* mirrored in /proc/sys.
@@ -10898,6 +10938,38 @@ ath_sysctl_get_intmit(struct ath_softc *
@@ -10897,6 +10937,38 @@ ath_sysctl_get_intmit(struct ath_softc *
}
static int
@ -114,7 +114,7 @@
ATH_SYSCTL_DECL(ath_sysctl_halparam, ctl, write, filp, buffer, lenp, ppos)
{
struct ath_softc *sc = ctl->extra1;
@@ -11177,6 +11249,24 @@ static int maxint = 0x7fffffff; /* 32-b
@@ -11176,6 +11248,24 @@ static int maxint = 0x7fffffff; /* 32-b
static const ctl_table ath_sysctl_template[] = {
{ .ctl_name = CTL_AUTO,

2
package/madwifi/patches/385-antenna_fix.patch
View file

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6666,6 +6666,7 @@ ath_setdefantenna(struct ath_softc *sc,
@@ -6665,6 +6665,7 @@ ath_setdefantenna(struct ath_softc *sc,
struct ath_hal *ah = sc->sc_ah;
/* XXX block beacon interrupts */

2
package/madwifi/patches/386-acl_crashfix.patch
View file

@ -88,7 +88,7 @@ Signed-off-by: Sebastian Gottschall <brainslayer@dd-wrt.com>
}
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -311,16 +311,15 @@ typedef spinlock_t ieee80211_scan_lock_t
@@ -319,16 +319,15 @@ typedef spinlock_t ieee80211_scan_lock_t
typedef spinlock_t acl_lock_t;
#define ACL_LOCK_INIT(_as, _name) spin_lock_init(&(_as)->as_lock)
#define ACL_LOCK_DESTROY(_as)

6
package/madwifi/patches/388-apsta_fix.patch
View file

@ -1,6 +1,6 @@
--- a/net80211/ieee80211_proto.c
+++ b/net80211/ieee80211_proto.c
@@ -1406,7 +1406,8 @@ __ieee80211_newstate(struct ieee80211vap
@@ -1409,7 +1409,8 @@ __ieee80211_newstate(struct ieee80211vap
vap->iv_state = nstate; /* state transition */
del_timer(&vap->iv_mgtsend);
if ((vap->iv_opmode != IEEE80211_M_HOSTAP) &&
@ -10,7 +10,7 @@
ieee80211_cancel_scan(vap); /* background scan */
ni = vap->iv_bss; /* NB: no reference held */
switch (nstate) {
@@ -1448,7 +1449,8 @@ __ieee80211_newstate(struct ieee80211vap
@@ -1451,7 +1452,8 @@ __ieee80211_newstate(struct ieee80211vap
}
goto reset;
case IEEE80211_S_SCAN:
@ -20,7 +20,7 @@
goto reset;
reset:
ieee80211_reset_bss(vap);
@@ -1985,7 +1987,9 @@ ieee80211_newstate(struct ieee80211vap *
@@ -1989,7 +1991,9 @@ ieee80211_newstate(struct ieee80211vap *
}
}
}

2
package/madwifi/patches/401-changeset_r3602.patch
View file

@ -1,6 +1,6 @@
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -340,6 +340,8 @@ typedef spinlock_t acl_lock_t;
@@ -348,6 +348,8 @@ typedef spinlock_t acl_lock_t;
/* __skb_append got a third parameter in 2.6.14 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14)
#define __skb_append(a,b,c) __skb_append(a, b)

4
package/madwifi/patches/403-changeset_r3605.patch
View file

@ -16,7 +16,7 @@
#endif /* _ATH_COMPAT_H_ */
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -337,13 +337,6 @@ typedef spinlock_t acl_lock_t;
@@ -345,13 +345,6 @@ typedef spinlock_t acl_lock_t;
#define ACL_LOCK_CHECK(_as)
#endif
@ -30,7 +30,7 @@
/*
* Per-node power-save queue definitions. Beware of control
* flow with IEEE80211_NODE_SAVEQ_LOCK/IEEE80211_NODE_SAVEQ_UNLOCK.
@@ -387,16 +380,16 @@ typedef spinlock_t acl_lock_t;
@@ -395,16 +388,16 @@ typedef spinlock_t acl_lock_t;
_skb = __skb_dequeue(&(_ni)->ni_savedq); \
(_qlen) = skb_queue_len(&(_ni)->ni_savedq); \
} while (0)

4
package/madwifi/patches/406-monitor_r3711.patch
View file

@ -1,6 +1,6 @@
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -6474,7 +6474,7 @@ ath_capture(struct net_device *dev, cons
@@ -6473,7 +6473,7 @@ ath_capture(struct net_device *dev, cons
/* Never copy the SKB, as it is ours on the RX side, and this is the
* last process on the TX side and we only modify our own headers. */
@ -9,7 +9,7 @@
if (tskb == NULL) {
DPRINTF(sc, ATH_DEBUG_ANY,
"Dropping; ath_skb_removepad failed!\n");
@@ -6482,6 +6482,8 @@ ath_capture(struct net_device *dev, cons
@@ -6481,6 +6481,8 @@ ath_capture(struct net_device *dev, cons
}
ieee80211_input_monitor(ic, tskb, bf, tx, tsf, sc);

2
package/madwifi/patches/408-changeset_r3337.patch
View file

@ -10,7 +10,7 @@
Please let us know if you think your name should be mentioned here!
--- a/ath/if_ath.c
+++ b/ath/if_ath.c
@@ -3093,7 +3093,7 @@ ath_tx_startraw(struct net_device *dev,
@@ -3092,7 +3092,7 @@ ath_tx_startraw(struct net_device *dev,
struct ath_softc *sc = dev->priv;
struct ath_hal *ah = sc->sc_ah;
struct ieee80211_phy_params *ph = (struct ieee80211_phy_params *)

2
package/madwifi/patches/450-new_hal.patch
View file

@ -108,7 +108,7 @@
/*
* Check if the MAC has multi-rate retry support.
* We do this by trying to setup a fake extended
@@ -7488,7 +7496,7 @@ ath_txq_setup(struct ath_softc *sc, int
@@ -7487,7 +7495,7 @@ ath_txq_setup(struct ath_softc *sc, int
if (qtype == HAL_TX_QUEUE_UAPSD)
qi.tqi_qflags = HAL_TXQ_TXDESCINT_ENABLE;
else