[Madwifi-users] Minor changes of BSD branch

[Beat M. <bm...@in...>]

Hello

There seems to be 2 minor "bugs" which prevents to compile the bsd 
branch on linux with gcc- 2.95.3.
I checked it out today (2005-05-24)

1.  gcc on Linux doesn't know about %z (nor do I).  For what is this. 
How can we do it compatible

net80211/ieee80211_output.c

737c737
<               ("WPA IE too big, %u > %zu",
---
 >               ("WPA IE too big, %u > %u",
821c821
<               ("RSN IE too big, %u > %zu",
---
 >               ("RSN IE too big, %u > %u",

2. Before any code we must define first all variables ... Please change 
the order of this few lines
so it can compile on linux too ...

Greetings

Beat

-------------------------- CUT HERE ---------------------
*** net80211/ieee80211_crypto_tkip.c.orig       Mon May 23 23:21:53 2005
--- net80211/ieee80211_crypto_tkip.c    Tue May 24 16:00:46 2005
***************
*** 210,221 ****
        if (k->wk_flags & IEEE80211_KEY_SWMIC) {
                struct ieee80211_frame *wh =
                        (struct ieee80211_frame *) skb->data;
-               IEEE80211_DPRINTF(ctx->tc_ic, IEEE80211_MSG_CRYPTO,
-                       "%s: [%s] doing SWMIC\n",
-                       __func__, ether_sprintf(wh->i_addr1));
                struct ieee80211com *ic = ctx->tc_ic;
                int hdrlen;
                u_int8_t *mic;

                ic->ic_stats.is_crypto_tkipenmic++;

--- 210,221 ----
        if (k->wk_flags & IEEE80211_KEY_SWMIC) {
                struct ieee80211_frame *wh =
                        (struct ieee80211_frame *) skb->data;
                struct ieee80211com *ic = ctx->tc_ic;
                int hdrlen;
                u_int8_t *mic;
+               IEEE80211_DPRINTF(ctx->tc_ic, IEEE80211_MSG_CRYPTO,
+                       "%s: [%s] doing SWMIC\n",
+                       __func__, ether_sprintf(wh->i_addr1));

                ic->ic_stats.is_crypto_tkipenmic++;

***************
*** 336,346 ****
        if (k->wk_flags & IEEE80211_KEY_SWMIC) {
                struct ieee80211_frame *wh =
                        (struct ieee80211_frame *) skb->data;
                IEEE80211_DPRINTF(ctx->tc_ic, IEEE80211_MSG_CRYPTO,
                        "%s: [%s] doing SWMIC\n",
                        __func__, ether_sprintf(wh->i_addr1));
-               int hdrlen;
-               u8 mic[IEEE80211_WEP_MICLEN];

                ctx->tc_ic->ic_stats.is_crypto_tkipdemic++;

--- 336,346 ----
        if (k->wk_flags & IEEE80211_KEY_SWMIC) {
                struct ieee80211_frame *wh =
                        (struct ieee80211_frame *) skb->data;
+               int hdrlen;
+               u8 mic[IEEE80211_WEP_MICLEN];
                IEEE80211_DPRINTF(ctx->tc_ic, IEEE80211_MSG_CRYPTO,
                        "%s: [%s] doing SWMIC\n",
                        __func__, ether_sprintf(wh->i_addr1));

                ctx->tc_ic->ic_stats.is_crypto_tkipdemic++;
-------------------------- CUT HERE ---------------------