Changeset 3075

Timestamp:

12/23/07 21:11:05 (4 years ago)

Author:

mentor

Message:

Have net80211 hard_start functions return NETDEV_TX_* codes; tidy some headers in the process.

Files:

• madwifi/trunk/net80211/ieee80211_input.c (modified) (1 diff)
• madwifi/trunk/net80211/ieee80211_output.c (modified) (6 diffs)
• madwifi/trunk/net80211/ieee80211_power.c (modified) (6 diffs)
• madwifi/trunk/net80211/ieee80211_power.h (modified) (1 diff)
• madwifi/trunk/net80211/ieee80211_proto.h (modified) (2 diffs)

madwifi/trunk/net80211/ieee80211_input.c

@@ -3732 +3732 @@
-        M_PWR_SAV_SET(skb);             /* ensure MORE_DATA bit is set correctly */
-
-
+(void)
-}
-

madwifi/trunk/net80211/ieee80211_output.c

@@ -233 +233 @@
-        if (vap->iv_opmode == IEEE80211_M_MONITOR) {
-                ieee80211_monitor_encap(vap, skb);
-
-
+
-        }
-        
@@ -249 +248 @@
-        else
-                ni = ieee80211_find_txnode(vap, eh->ether_dhost);
-
-        if (ni == NULL) {
-                /* NB: ieee80211_find_txnode does stat+msg */
-                goto bad;
-        }
+
-        /* calculate priority so drivers can find the TX queue */
-        if (ieee80211_classify(ni, skb)) {
@@ -269 +268 @@
-                M_FLAG_SET(skb, M_UAPSD);
-        } else if ((ni->ni_flags & IEEE80211_NODE_PWR_MGT)) {
-
-
+
-                 * on the STA's power save queue and continue.
-
-
-
+
-                ieee80211_unref_node(&ni);
-0
+ieee80211_pwrsave(skb)
-        }
-
@@ -294 +290 @@
-                        SKB_CB(skb1)->ni = ieee80211_find_txnode(vap->iv_xrvap, 
-                                                       eh->ether_dhost);
-
+
+
-                }
-        }
-#endif
-        ieee80211_parent_queue_xmit(skb);
-        ieee80211_unref_node(&ni);
-0
+ieee80211_parent_queue_xmit(skb)
-
-bad:
@@ -310 +306 @@
-}
-
-void
+int
-        struct ieee80211vap *vap = skb->dev->priv;
+        int ret;
-
-        vap->iv_devstats.tx_packets++;
@@ -320 +317 @@
-        skb->dev = vap->iv_ic->ic_dev;
-
-dev_queue_xmit(skb
+(ret = dev_queue_xmit(skb)
-                vap->iv_devstats.tx_dropped++;
+
+        return ret;
-}
-

madwifi/trunk/net80211/ieee80211_power.c

@@ -53 +53 @@
-#include <net80211/ieee80211_proto.h>
-
+#ifndef NETDEV_TX_OK
+#define NETDEV_TX_OK    0
+#define NETDEV_TX_BUSY  1
+#endif
+
-static void ieee80211_set_tim(struct ieee80211_node *ni, int set);
-
@@ -206 +211 @@
- * is changed, if necessary.
- */
-
-
-
+
+
+
+
-        struct ieee80211vap *vap = ni->ni_vap;
-        struct ieee80211com *ic = ni->ni_ic;
@@ -227 +233 @@
-                ieee80211_unref_node(&SKB_CB(skb)->ni);
-                ieee80211_dev_kfree_skb(&skb);
-
+ NETDEV_TX_BUSY
-        }
-
@@ -254 +260 @@
-        if (qlen == 1 && vap->iv_set_tim != NULL)
-                vap->iv_set_tim(ni, 1);
+
+        return NETDEV_TX_OK;
-}
-
@@ -332 +340 @@
-#endif
-
-
+(void)
-                }
-                vap->iv_set_tim(ni, 0);
@@ -373 +381 @@
-                                if (skb == NULL)
-                                        break;
-
+(void)
-                        }
-                }

madwifi/trunk/net80211/ieee80211_power.h

@@ -48 +48 @@
-int     ieee80211_node_saveq_drain(struct ieee80211_node *);
-int     ieee80211_node_saveq_age(struct ieee80211_node *);
-void   ieee80211_pwrsave(struct ieee80211_node *, 
+int    ieee80211_pwrsave(
-void    ieee80211_node_pwrsave(struct ieee80211_node *, int);
-void    ieee80211_sta_pwrsave(struct ieee80211vap *, int);

madwifi/trunk/net80211/ieee80211_proto.h

@@ -72 +72 @@
-void ieee80211_recv_mgmt(struct ieee80211_node *, struct sk_buff *,
-        int, int, u_int64_t);
-void ieee80211_sta_pwrsave(struct ieee80211vap *, int);
-int ieee80211_hardstart(struct sk_buff *, struct net_device *);
-void
+int
-int ieee80211_send_nulldata(struct ieee80211_node *);
-int ieee80211_send_qosnulldata(struct ieee80211_node *, int);
@@ -84 +83 @@
-        const u_int8_t *, size_t, const void *, size_t);
-struct sk_buff *ieee80211_encap(struct ieee80211_node *, struct sk_buff *, int *);
-void ieee80211_pwrsave(struct ieee80211_node *, struct sk_buff *);
-
-void ieee80211_reset_erp(struct ieee80211com *, enum ieee80211_phymode);