Changeset 19077


Ignore:
Timestamp:
2010-01-08T17:55:19+01:00 (8 years ago)
Author:
nbd
Message:

hostapd: upgrade to latest version

Location:
trunk/package/hostapd
Files:
1 deleted
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/hostapd/Makefile

    r18606 r19077  
    99 
    1010PKG_NAME:=hostapd 
    11 PKG_VERSION:=20091129 
     11PKG_VERSION:=20100108 
    1212PKG_RELEASE:=1 
    13 PKG_REV:=be8eb8ab3ee42aa66930aea827bdcb05a2172276 
     13PKG_REV:=d97572a40fd7ec77094e2e4ef83424a4c0f7e24d 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
  • trunk/package/hostapd/patches/100-madwifi_fix.patch

    r18606 r19077  
    11--- a/src/drivers/driver_madwifi.c 
    22+++ b/src/drivers/driver_madwifi.c 
    3 @@ -323,6 +323,7 @@ madwifi_set_iface_flags(void *priv, int  
    4  { 
    5         struct madwifi_driver_data *drv = priv; 
    6         struct ifreq ifr; 
    7 +       short flags; 
    8   
    9         wpa_printf(MSG_DEBUG, "%s: dev_up=%d", __func__, dev_up); 
    10   
    11 @@ -337,10 +338,14 @@ madwifi_set_iface_flags(void *priv, int  
    12                 return -1; 
     3@@ -1170,8 +1170,6 @@ madwifi_init(struct hostapd_data *hapd,  
     4                goto bad; 
    135        } 
    146  
    15 +       flags = ifr.ifr_flags; 
    16         if (dev_up) 
    17 -               ifr.ifr_flags |= IFF_UP; 
    18 +               flags |= IFF_UP; 
    19         else 
    20 -               ifr.ifr_flags &= ~IFF_UP; 
    21 +               flags &= ~IFF_UP; 
    22 + 
    23 +       if (flags == ifr.ifr_flags) 
    24 +               return 0; 
     7-       /* mark down during setup */ 
     8-       linux_set_iface_flags(drv->ioctl_sock, drv->iface, 0); 
     9        madwifi_set_privacy(drv->iface, drv, 0); /* default to no privacy */ 
    2510  
    26         if (ioctl(drv->ioctl_sock, SIOCSIFFLAGS, &ifr) != 0) { 
    27                 perror("ioctl[SIOCSIFFLAGS]"); 
     11        madwifi_receive_probe_req(drv); 
     12@@ -1261,8 +1259,7 @@ madwifi_set_countermeasures(void *priv,  
     13 static int 
     14 madwifi_commit(void *priv) 
     15 { 
     16-       struct madwifi_driver_data *drv = priv; 
     17-       return linux_set_iface_flags(drv->ioctl_sock, drv->iface, 1); 
     18+       return 0; 
     19 } 
     20  
     21 #else /* HOSTAPD */ 
  • trunk/package/hostapd/patches/110-countrycode.patch

    r18606 r19077  
    1 --- a/hostapd/hostapd.c 
    2 +++ b/hostapd/hostapd.c 
    3 @@ -1339,10 +1339,8 @@ static int setup_interface(struct hostap 
    4         if (hapd->iconf->country[0] && hapd->iconf->country[1]) { 
    5                 os_memcpy(country, hapd->iconf->country, 3); 
     1--- a/src/ap/hostapd.c 
     2+++ b/src/ap/hostapd.c 
     3@@ -649,7 +649,6 @@ static int setup_interface(struct hostap 
    64                country[3] = '\0'; 
    7 -               if (hostapd_set_country(hapd, country) < 0) { 
    8 +               if (hostapd_set_country(hapd, country) < 0) 
     5                if (hostapd_set_country(hapd, country) < 0) { 
    96                        wpa_printf(MSG_ERROR, "Failed to set country code"); 
    107-                       return -1; 
    11 -               } 
     8                } 
    129        } 
    1310  
    14         if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL && 
  • trunk/package/hostapd/patches/120-compile_fix.patch

    r19076 r19077  
    11--- a/src/drivers/driver_nl80211.c 
    22+++ b/src/drivers/driver_nl80211.c 
    3 @@ -23,6 +23,7 @@ 
     3@@ -22,6 +22,7 @@ 
    44 #include <netlink/genl/genl.h> 
    55 #include <netlink/genl/family.h> 
    66 #include <netlink/genl/ctrl.h> 
    77+#include <linux/rtnetlink.h> 
     8 #include <netpacket/packet.h> 
     9 #include <linux/filter.h> 
    810 #include "nl80211_copy.h" 
    9   
    10  #include "common.h" 
Note: See TracChangeset for help on using the changeset viewer.