jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nl80211: Remove some unnecessary ifdef HOSTAPD blocks

Browse source
This commit is contained in:
Jouni Malinen 2011-10-22 22:51:49 +03:00
parent 17fbb751e1
commit bd2df8921b
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/drivers/driver_nl80211.c
View file

@ -277,7 +277,15 @@ static int wpa_driver_nl80211_if_remove(void *priv,
enum wpa_driver_if_type type, enum wpa_driver_if_type type,
const char *ifname); const char *ifname);
#else /* HOSTAPD */ #else /* HOSTAPD */
static int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx) static inline void add_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
{
}
static inline void del_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
{
}
static inline int have_ifidx(struct wpa_driver_nl80211_data *drv, int ifidx)
{ {
return 0; return 0;
} }
@ -637,7 +645,6 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
attr = RTA_NEXT(attr, attrlen); attr = RTA_NEXT(attr, attrlen);
} }
#ifdef HOSTAPD
if (ifi->ifi_family == AF_BRIDGE && brid) { if (ifi->ifi_family == AF_BRIDGE && brid) {
/* device has been added to bridge */ /* device has been added to bridge */
char namebuf[IFNAMSIZ]; char namebuf[IFNAMSIZ];
@ -646,7 +653,6 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
brid, namebuf); brid, namebuf);
add_ifidx(drv, brid); add_ifidx(drv, brid);
} }
#endif /* HOSTAPD */
} }
@ -682,7 +688,6 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx,
attr = RTA_NEXT(attr, attrlen); attr = RTA_NEXT(attr, attrlen);
} }
#ifdef HOSTAPD
if (ifi->ifi_family == AF_BRIDGE && brid) { if (ifi->ifi_family == AF_BRIDGE && brid) {
/* device has been removed from bridge */ /* device has been removed from bridge */
char namebuf[IFNAMSIZ]; char namebuf[IFNAMSIZ];
@ -691,7 +696,6 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx,
"%s", brid, namebuf); "%s", brid, namebuf);
del_ifidx(drv, brid); del_ifidx(drv, brid);
} }
#endif /* HOSTAPD */
} }
@ -4463,10 +4467,8 @@ static void nl80211_remove_iface(struct wpa_driver_nl80211_data *drv,
wpa_printf(MSG_DEBUG, "nl80211: Remove interface ifindex=%d", ifidx); wpa_printf(MSG_DEBUG, "nl80211: Remove interface ifindex=%d", ifidx);
#ifdef HOSTAPD
/* stop listening for EAPOL on this interface */ /* stop listening for EAPOL on this interface */
del_ifidx(drv, ifidx); del_ifidx(drv, ifidx);
#endif /* HOSTAPD */
msg = nlmsg_alloc(); msg = nlmsg_alloc();
if (!msg) if (!msg)
@ -4558,10 +4560,8 @@ static int nl80211_create_iface_once(struct wpa_driver_nl80211_data *drv,
if (ifidx <= 0) if (ifidx <= 0)
return -1; return -1;
#ifdef HOSTAPD
/* start listening for EAPOL on this interface */ /* start listening for EAPOL on this interface */
add_ifidx(drv, ifidx); add_ifidx(drv, ifidx);
#endif /* HOSTAPD */
if (addr && iftype != NL80211_IFTYPE_MONITOR && if (addr && iftype != NL80211_IFTYPE_MONITOR &&
linux_set_ifhwaddr(drv->global->ioctl_sock, ifname, addr)) { linux_set_ifhwaddr(drv->global->ioctl_sock, ifname, addr)) {