Changeset 3123

Timestamp:

01/10/08 21:10:41 (1 year 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/ath/if_ath.c (modified) (2 diffs)
• madwifi/trunk/net80211/ieee80211_input.c (modified) (1 diff)
• madwifi/trunk/net80211/ieee80211_output.c (modified) (5 diffs)
• madwifi/trunk/net80211/ieee80211_power.c (modified) (4 diffs)
• madwifi/trunk/net80211/ieee80211_proto.h (modified) (1 diff)

madwifi/trunk/ath/if_ath.c

@@ -2959 +2959 @@
- *
- * Context: process context with BHs disabled
+ * It mut return either NETDEV_TX_OK or NETDEV_TX_BUSY
- */
-static int
@@ -5874 +5875 @@
- *
- * NB: MAY ALLOCATE */
-
+atic st
-ath_skb_removepad(struct sk_buff *skb, unsigned int copy_skb)
-{

madwifi/trunk/net80211/ieee80211_input.c

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

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;
-}
-

madwifi/trunk/net80211/ieee80211_power.c

@@ -210 +210 @@
- * The new packet is placed on the node's saved queue, and the TIM
- * is changed, if necessary.
+ * It must return either NETDEV_TX_OK or NETDEV_TX_BUSY
- */
-int
@@ -232 +233 @@
-#endif
-                ieee80211_unref_node(&SKB_CB(skb)->ni);
-                ieee80211_dev_kfree_skb(&skb);
-                return NETDEV_TX_BUSY;
-        }
@@ -340 +340 @@
-#endif
-
-(void)
+
-                }
-                vap->iv_set_tim(ni, 0);
@@ -381 +381 @@
-                                if (skb == NULL)
-                                        break;
-(void)
+
-                        }
-                }

madwifi/trunk/net80211/ieee80211_proto.h

@@ -73 +73 @@
-        int, int, u_int64_t);
-int ieee80211_hardstart(struct sk_buff *, struct net_device *);
-int
+void
-int ieee80211_send_nulldata(struct ieee80211_node *);
-int ieee80211_send_qosnulldata(struct ieee80211_node *, int);