[toolchain] uClibc: change some symbols to local on ppc to make Kaloz happy :)

[openwrt.git] / package / madwifi / patches / 309-micfail_detect.patch

diff --git a/package/madwifi/patches/309-micfail_detect.patch b/package/madwifi/patches/309-micfail_detect.patch
index 2ab07bb..c1b6224 100644 (file)
--- a/package/madwifi/patches/309-micfail_detect.patch
+++ b/package/madwifi/patches/309-micfail_detect.patch
@@ -1,24 +1,24 @@
-diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c
---- madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c        2007-05-13 18:17:56.785936264 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/ath/if_ath.c        2007-05-13 18:17:56.878922128 +0200
-@@ -5640,6 +5640,7 @@
+Index: madwifi-dfs-r3246/ath/if_ath.c
+===================================================================
+--- madwifi-dfs-r3246.orig/ath/if_ath.c        2008-01-25 16:33:11.528293596 +0100
++++ madwifi-dfs-r3246/ath/if_ath.c     2008-01-25 16:36:40.024175098 +0100
+@@ -6393,6 +6393,7 @@

        u_int phyerr;
        u_int phyerr;

-       int processed = 0, early_stop = 0;
-       int rx_limit = dev->quota;
-+      int mic_fail = 0;
+       u_int processed = 0, early_stop = 0;
+       u_int rx_limit = dev->quota;
++      u_int mic_fail = 0;

  
  

-       /* Let the 802.11 layer know about the new noise floor */
-       ic->ic_channoise = sc->sc_channoise;
-@@ -5734,32 +5735,16 @@
+       DPRINTF(sc, ATH_DEBUG_RX_PROC, "%s\n", __func__);
+ process_rx_again:
+@@ -6492,24 +6493,8 @@

                        }
                        }

-                       if (ds->ds_rxstat.rs_status & HAL_RXERR_MIC) {
+                       if (rs->rs_status & HAL_RXERR_MIC) {

                                sc->sc_stats.ast_rx_badmic++;
 -                              /*
 -                               * Do minimal work required to hand off
 -                               * the 802.11 header for notification.
 -                               */
 -                              /* XXX frag's and QoS frames */
                                sc->sc_stats.ast_rx_badmic++;
 -                              /*
 -                               * Do minimal work required to hand off
 -                               * the 802.11 header for notification.
 -                               */
 -                              /* XXX frag's and QoS frames */

--                              len = ds->ds_rxstat.rs_datalen;

 -                              if (len >= sizeof (struct ieee80211_frame)) {
 -                                      bus_dma_sync_single(sc->sc_bdev,
 -                                          bf->bf_skbaddr, len,
 -                              if (len >= sizeof (struct ieee80211_frame)) {
 -                                      bus_dma_sync_single(sc->sc_bdev,
 -                                          bf->bf_skbaddr, len,


@@ -26,52 +26,68 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/ath/if_ath.c madwifi-ng-refcoun
 -#if 0
 -/* XXX revalidate MIC, lookup ni to find VAP */
 -                                      ieee80211_notify_michael_failure(ic,
 -#if 0
 -/* XXX revalidate MIC, lookup ni to find VAP */
 -                                      ieee80211_notify_michael_failure(ic,

--                                          (struct ieee80211_frame *) skb->data,
+-                                          (struct ieee80211_frame *)skb->data,

 -                                          sc->sc_splitmic ?
 -                                          sc->sc_splitmic ?

--                                              ds->ds_rxstat.rs_keyix - 32 :
--                                              ds->ds_rxstat.rs_keyix
+-                                              rs->rs_keyix - 32 : rs->rs_keyix

 -                                      );
 -#endif
 -                              }
 +                              mic_fail = 1;
 -                                      );
 -#endif
 -                              }
 +                              mic_fail = 1;

++                              goto rx_accept;

                        }
                        /*
                        }
                        /*

-                        * Reject error frames if we have no vaps that 
-                        * are operating in monitor mode.
-                        */
--                      if(sc->sc_nmonvaps == 0) goto rx_next;
-+                      if ((ds->ds_rxstat.rs_status & ~HAL_RXERR_MIC) &&
-+                              ((ds->ds_rxstat.rs_status &~ HAL_RXERR_DECRYPT) ||
-+                           (sc->sc_ic.ic_opmode != IEEE80211_M_MONITOR)))
-+                                      goto rx_next;
-               }
- rx_accept:
+                        * Reject error frames if we have no vaps that
+@@ -6562,8 +6547,9 @@

                /*
                /*

-@@ -5843,6 +5828,20 @@
-                                  ds->ds_rxstat.rs_rssi);
+                * Finished monitor mode handling, now reject
+                * error frames before passing to other vaps
++               * Ignore MIC failures here, as we need to recheck them
+                */
+-              if (rs->rs_status != 0) {
++              if (rs->rs_status & ~(HAL_RXERR_MIC | HAL_RXERR_DECRYPT)) {
+                       ieee80211_dev_kfree_skb(&skb);
+                       goto rx_next;

                }
                }

+@@ -6571,6 +6557,26 @@
+               /* remove the CRC */
+               skb_trim(skb, skb->len - IEEE80211_CRC_LEN);

  
  

-+              /* MIC failure. Drop the packet in any case */

 +              if (mic_fail) {
 +              if (mic_fail) {

-+                      ni = ieee80211_find_rxnode(ic, 
-+                              (const struct ieee80211_frame_min *) skb->data);
-+                      if (ni != NULL) {
++                      /* Ignore control frames which are reported with mic error */
++                  if ((((struct ieee80211_frame *)skb->data)->i_fc[0] &
++                                      IEEE80211_FC0_TYPE_MASK) == IEEE80211_FC0_TYPE_CTL)
++                              goto drop_micfail;
++
++                      ni = ieee80211_find_rxnode(ic, (const struct ieee80211_frame_min *) skb->data);
++
++                      if (ni && ni->ni_table) {

 +                              ieee80211_check_mic(ni, skb);
 +                              ieee80211_unref_node(&ni);
 +                      }
 +                              ieee80211_check_mic(ni, skb);
 +                              ieee80211_unref_node(&ni);
 +                      }

++
++drop_micfail:

 +                      dev_kfree_skb_any(skb);
 +                      skb = NULL;
 +                      mic_fail = 0;
 +                      goto rx_next;
 +                      dev_kfree_skb_any(skb);
 +                      skb = NULL;
 +                      mic_fail = 0;
 +                      goto rx_next;

-+              }
++              }

 +
                /*
 +
                /*

-                * Locate the node for sender, track state, and then
-                * pass the (referenced) node up to the 802.11 layer
-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_ccmp.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_ccmp.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_ccmp.c    2007-04-13 07:53:25.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_ccmp.c    2007-05-13 18:17:56.879921976 +0200
-@@ -78,7 +78,7 @@
+                * From this point on we assume the frame is at least
+                * as large as ieee80211_frame_min; verify that.
+@@ -6583,6 +6589,7 @@
+                       goto rx_next;
+               }
+ 
++              /* MIC failure. Drop the packet in any case */
+               /*
+                * Normal receive.
+                */
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_ccmp.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_ccmp.c    2008-01-25 16:28:31.292323859 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_crypto_ccmp.c 2008-01-25 16:36:01.926004007 +0100
+@@ -73,7 +73,7 @@

  static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
  static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int);
  static int ccmp_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int ccmp_decap(struct ieee80211_key *, struct sk_buff *, int);
  static int ccmp_enmic(struct ieee80211_key *, struct sk_buff *, int);


@@ -80,7 +96,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_ccmp.
  
  static const struct ieee80211_cipher ccmp = {
        .ic_name        = "AES-CCM",
  
  static const struct ieee80211_cipher ccmp = {
        .ic_name        = "AES-CCM",

-@@ -298,7 +298,7 @@
+@@ -308,7 +308,7 @@

   * Verify and strip MIC from the frame.
   */
  static int
   * Verify and strip MIC from the frame.
   */
  static int


@@ -89,9 +105,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_ccmp.
  {
        return 1;
  }
  {
        return 1;
  }

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto.h madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto.h
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto.h 2007-04-25 22:29:55.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto.h 2007-05-13 18:17:56.880921824 +0200
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto.h
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto.h 2008-01-25 16:27:28.000000000 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_crypto.h      2008-01-25 16:36:01.926004007 +0100

 @@ -145,7 +145,7 @@
        int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
        int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);
 @@ -145,7 +145,7 @@
        int (*ic_encap)(struct ieee80211_key *, struct sk_buff *, u_int8_t);
        int (*ic_decap)(struct ieee80211_key *, struct sk_buff *, int);


@@ -114,9 +131,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto.h mad
  }
  
  /*
  }
  
  /*

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_none.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_none.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_none.c    2006-09-20 10:45:13.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_none.c    2007-05-13 18:17:56.880921824 +0200
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_none.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_none.c    2008-01-25 16:27:28.000000000 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_crypto_none.c 2008-01-25 16:36:01.926004007 +0100

 @@ -52,7 +52,7 @@
  static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int none_decap(struct ieee80211_key *, struct sk_buff *, int);
 @@ -52,7 +52,7 @@
  static int none_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int none_decap(struct ieee80211_key *, struct sk_buff *, int);


@@ -135,9 +153,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_none.
  {
        struct ieee80211vap *vap = k->wk_private;
  
  {
        struct ieee80211vap *vap = k->wk_private;
  

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_tkip.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_tkip.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_tkip.c    2007-01-30 04:51:52.000000000 +0100
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_tkip.c    2007-05-13 18:17:56.880921824 +0200
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_tkip.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_tkip.c    2008-01-25 16:27:28.000000000 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_crypto_tkip.c 2008-01-25 16:36:01.930004236 +0100

 @@ -57,7 +57,7 @@
  static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);
 @@ -57,7 +57,7 @@
  static int tkip_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int tkip_enmic(struct ieee80211_key *, struct sk_buff *, int);


@@ -165,9 +184,10 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_tkip.
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];
                struct ieee80211vap *vap = ctx->tc_vap;
                u8 mic[IEEE80211_WEP_MICLEN];
                u8 mic0[IEEE80211_WEP_MICLEN];

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_wep.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_wep.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_wep.c     2006-09-20 10:45:13.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_crypto_wep.c     2007-05-13 18:17:56.881921672 +0200
+Index: madwifi-dfs-r3246/net80211/ieee80211_crypto_wep.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_crypto_wep.c     2008-01-25 16:27:28.000000000 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_crypto_wep.c  2008-01-25 16:36:01.930004236 +0100

 @@ -54,7 +54,7 @@
  static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);
 @@ -54,7 +54,7 @@
  static int wep_encap(struct ieee80211_key *, struct sk_buff *, u_int8_t);
  static int wep_decap(struct ieee80211_key *, struct sk_buff *, int);


@@ -186,10 +206,11 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_crypto_wep.c
  {
        return 1;
  }
  {
        return 1;
  }

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_input.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c  2007-05-13 18:17:56.786936112 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_input.c  2007-05-13 18:17:56.883921368 +0200
-@@ -654,7 +654,7 @@
+Index: madwifi-dfs-r3246/net80211/ieee80211_input.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_input.c  2008-01-25 16:35:46.341115878 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_input.c       2008-01-25 16:36:01.934004465 +0100
+@@ -669,7 +669,7 @@

                 * Next strip any MSDU crypto bits.
                 */
                if (key != NULL &&
                 * Next strip any MSDU crypto bits.
                 */
                if (key != NULL &&


@@ -198,12 +219,12 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
                        IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                ni->ni_macaddr, "data", "%s", "demic error");
                        IEEE80211_NODE_STAT(ni, rx_demicfail);
                        IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_INPUT,
                                ni->ni_macaddr, "data", "%s", "demic error");
                        IEEE80211_NODE_STAT(ni, rx_demicfail);

-@@ -3734,6 +3734,47 @@
+@@ -4221,6 +4221,47 @@

  }
  #endif
  
 +/*
  }
  #endif
  
 +/*

-+ * Process a frame w/ hw detected MIC failure. 
++ * Process a frame w/ hw detected MIC failure.

 + * The frame will be dropped in any case.
 + */
 +void
 + * The frame will be dropped in any case.
 + */
 +void


@@ -215,7 +236,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 +      struct ieee80211_key *key;
 +      int hdrspace;
 +      struct ieee80211com *ic = vap->iv_ic;
 +      struct ieee80211_key *key;
 +      int hdrspace;
 +      struct ieee80211com *ic = vap->iv_ic;

-+      
++

 +      if (skb->len < sizeof(struct ieee80211_frame_min)) {
 +              IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 +                  ni->ni_macaddr, NULL,
 +      if (skb->len < sizeof(struct ieee80211_frame_min)) {
 +              IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_ANY,
 +                  ni->ni_macaddr, NULL,


@@ -225,7 +246,7 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
 +      }
 +
 +      wh = (struct ieee80211_frame *)skb->data;
 +      }
 +
 +      wh = (struct ieee80211_frame *)skb->data;

-+              
++

 +      hdrspace = ieee80211_hdrspace(ic, wh);
 +      key = ieee80211_crypto_decap(ni, skb, hdrspace);
 +      if (key == NULL) {
 +      hdrspace = ieee80211_hdrspace(ic, wh);
 +      key = ieee80211_crypto_decap(ni, skb, hdrspace);
 +      if (key == NULL) {


@@ -246,28 +267,77 @@ diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_input.c madw
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.
  #ifdef IEEE80211_DEBUG
  /*
   * Debugging support.

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_linux.c madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_linux.c
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_linux.c  2007-04-25 22:29:55.000000000 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_linux.c  2007-05-13 18:17:56.883921368 +0200
-@@ -309,8 +309,8 @@
+Index: madwifi-dfs-r3246/net80211/ieee80211_proto.h
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_proto.h  2008-01-25 16:27:28.000000000 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_proto.h       2008-01-25 16:36:01.934004465 +0100
+@@ -90,6 +90,7 @@
+ void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
+ enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
+ void ieee80211_send_pspoll(struct ieee80211_node *);
++void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *);

  
  

+ /*
+  * Return the size of the 802.11 header for a management or data frame.
+Index: madwifi-dfs-r3246/net80211/ieee80211_linux.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_linux.c  2008-01-25 16:28:31.280323176 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_linux.c       2008-01-25 16:36:01.934004465 +0100
+@@ -337,8 +337,8 @@

        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,
        /* TODO: needed parameters: count, keyid, key type, src address, TSC */
        snprintf(buf, sizeof(buf), "%s(keyid=%d %scast addr=%s)", tag,

--              keyix, IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "broad" : "uni",
+               k->wk_keyix,
+-              IEEE80211_IS_MULTICAST(wh->i_addr1) ?  "broad" : "uni",

 -              ether_sprintf(wh->i_addr1));
 -              ether_sprintf(wh->i_addr1));

-+              keyix, IEEE80211_IS_MULTICAST(wh->i_addr2) ?  "broad" : "uni",
++              IEEE80211_IS_MULTICAST(wh->i_addr2) ?  "broad" : "uni",

 +              ether_sprintf(wh->i_addr2));
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
 +              ether_sprintf(wh->i_addr2));
        memset(&wrqu, 0, sizeof(wrqu));
        wrqu.data.length = strlen(buf);
        wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);

-diff -urN madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.h madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.h
---- madwifi-ng-refcount-r2313-20070505.old/net80211/ieee80211_proto.h  2007-05-13 18:17:56.579967576 +0200
-+++ madwifi-ng-refcount-r2313-20070505.dev/net80211/ieee80211_proto.h  2007-05-13 18:17:56.884921216 +0200
-@@ -91,6 +91,7 @@
- void ieee80211_set11gbasicrates(struct ieee80211_rateset *, enum ieee80211_phymode);
- enum ieee80211_phymode ieee80211_get11gbasicrates(struct ieee80211_rateset *);
- void ieee80211_send_pspoll(struct ieee80211_node *);
-+void ieee80211_check_mic(struct ieee80211_node *, struct sk_buff *);
+Index: madwifi-dfs-r3246/net80211/ieee80211_output.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_output.c 2008-01-25 16:27:28.000000000 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_output.c      2008-01-25 16:36:01.938004695 +0100
+@@ -1083,13 +1083,16 @@
+                       cip = (struct ieee80211_cipher *) key->wk_cipher;
+                       ciphdrsize = cip->ic_header;
+                       tailsize += (cip->ic_trailer + cip->ic_miclen);
++
++                      /* add the 8 bytes MIC length */
++                      if (cip->ic_cipher == IEEE80211_CIPHER_TKIP)
++                              pktlen += IEEE80211_WEP_MICLEN;
+               }

  
  

- /*
-  * Return the size of the 802.11 header for a management or data frame.
+               pdusize = vap->iv_fragthreshold - (hdrsize_nopad + ciphdrsize);
+               fragcnt = *framecnt =
+-                      ((pktlen - (hdrsize_nopad + ciphdrsize)) / pdusize) +
+-                      (((pktlen - (hdrsize_nopad + ciphdrsize)) %
+-                              pdusize == 0) ? 0 : 1);
++                      ((pktlen - hdrsize_nopad) / pdusize) +
++                      (((pktlen - hdrsize_nopad) % pdusize == 0) ? 0 : 1);
+ 
+               /*
+                * Allocate sk_buff for each subsequent fragment; First fragment
+Index: madwifi-dfs-r3246/net80211/ieee80211_node.c
+===================================================================
+--- madwifi-dfs-r3246.orig/net80211/ieee80211_node.c   2008-01-25 16:33:11.540294282 +0100
++++ madwifi-dfs-r3246/net80211/ieee80211_node.c        2008-01-25 16:36:01.938004695 +0100
+@@ -2259,11 +2259,13 @@
+       /* From this point onwards we can no longer find the node,
+        * so no more references are generated
+        */
+-      ieee80211_remove_wds_addr(nt, ni->ni_macaddr);
+-      ieee80211_del_wds_node(nt, ni);
+-      IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
+-      node_table_leave_locked(nt, ni);
+-      IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++      if (nt) {
++              ieee80211_remove_wds_addr(nt, ni->ni_macaddr);
++              ieee80211_del_wds_node(nt, ni);
++              IEEE80211_NODE_TABLE_LOCK_IRQ(nt);
++              node_table_leave_locked(nt, ni);
++              IEEE80211_NODE_TABLE_UNLOCK_IRQ(nt);
++      }
+ 
+       /*
+        * If node wasn't previously associated all