Changeset 3123 for madwifi/trunk/net80211/ieee80211_output.c

Timestamp:

01/10/08 21:10:41 (4 years ago)

Author:

benoit

Message:

Fixed a kernel panic due to incorrect linux API use
hard_start_xmit() functions must either return NETDEV_TX_OK or
NETDEV_TX_BUSY (they might also return negative errno values as well,
like -ENETDOWN)
Correct a small missing static reported by sparse
This revert part of r3075

Files:

• madwifi/trunk/net80211/ieee80211_output.c (modified) (5 diffs)

madwifi/trunk/net80211/ieee80211_output.c

@@ -197 +197 @@
-/*
- * Context: process context (BHs disabled)
+ * It must return either NETDEV_TX_OK or NETDEV_TX_BUSY
- */
-int
@@ -233 +234 @@
-        if (vap->iv_opmode == IEEE80211_M_MONITOR) {
-                ieee80211_monitor_encap(vap, skb);
-
+
+
-        }
-        
@@ -291 +293 @@
-                                                       eh->ether_dhost);
-                        /* Ignore this return code. */
-(void)
+
-                }
-        }
-#endif
-        ieee80211_unref_node(&ni);
-
+
+
-
-bad:
@@ -303 +306 @@
-        if (ni != NULL)
-                ieee80211_unref_node(&ni);
-
-
-
-
+
+
+
+
+
+
+
+
-        struct ieee80211vap *vap = skb->dev->priv;
-        int ret;
-
-        vap->iv_devstats.tx_packets++;
@@ -317 +323 @@
-        skb->dev = vap->iv_ic->ic_dev;
-
-(ret = dev_queue_xmit(skb)
+dev_queue_xmit(skb
-                vap->iv_devstats.tx_dropped++;
-
-        return ret;
-}
-