OSDN Git Service

wifi: Sync with wpa_supplicant commit 1075b29
authorDmitry Shmidt <dimitrysh@google.com>
Fri, 12 Jul 2013 17:10:40 +0000 (10:10 -0700)
committerDmitry Shmidt <dimitrysh@google.com>
Fri, 12 Jul 2013 17:10:40 +0000 (10:10 -0700)
Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
include/hardware_legacy/driver_nl80211.h

index dd1d01d..eac0879 100644 (file)
@@ -65,6 +65,8 @@
 struct nl80211_global {
        struct dl_list interfaces;
        int if_add_ifindex;
+       u64 if_add_wdevid;
+       int if_add_wdevid_set;
        struct netlink_data *netlink;
        struct nl_cb *nl_cb;
        struct nl_handle *nl;
@@ -89,12 +91,14 @@ struct i802_bss {
        struct wpa_driver_nl80211_data *drv;
        struct i802_bss *next;
        int ifindex;
+       u64 wdev_id;
        char ifname[IFNAMSIZ + 1];
        char brname[IFNAMSIZ];
        unsigned int beacon_set:1;
        unsigned int added_if_into_bridge:1;
        unsigned int added_bridge:1;
        unsigned int in_deinit:1;
+       unsigned int wdev_id_set:1;
 
        u8 addr[ETH_ALEN];
 
@@ -155,6 +159,7 @@ struct wpa_driver_nl80211_data {
        unsigned int retry_auth:1;
        unsigned int use_monitor:1;
        unsigned int ignore_next_local_disconnect:1;
+       unsigned int allow_p2p_device:1;
 
        u64 remain_on_chan_cookie;
        u64 send_action_cookie;