diff options
| author | Dan Murphy <dmurphy@ti.com> | 2012-02-16 12:56:10 -0600 |
|---|---|---|
| committer | Dan Murphy <dmurphy@ti.com> | 2012-02-16 12:58:55 -0600 |
| commit | a80710ad1a7ddfee509425056ac5e0483d88fbaa (patch) | |
| tree | d75b67449c10db2fe12daffe19e047febbfee09c /include/net | |
| parent | e5493a63c6e84a0066796c81477b92829363450b (diff) | |
| download | kernel_samsung_espresso10-a80710ad1a7ddfee509425056ac5e0483d88fbaa.zip kernel_samsung_espresso10-a80710ad1a7ddfee509425056ac5e0483d88fbaa.tar.gz kernel_samsung_espresso10-a80710ad1a7ddfee509425056ac5e0483d88fbaa.tar.bz2 | |
Merge branch 'android-omap-3.0' into p-android-omap-3.0
Conflicts:
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/omap_twl.c
drivers/gpu/pvr/ion.c
drivers/gpu/pvr/ion.h
drivers/gpu/pvr/mm.c
drivers/gpu/pvr/omap4/syslocal.h
drivers/gpu/pvr/sgxfeaturedefs.h
drivers/mmc/host/omap_hsmmc.c
drivers/usb/gadget/android.c
drivers/video/hdmi_ti_4xxx_ip.c
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/dss/hdmi.c
fs/proc/base.c
include/video/hdmi_ti_4xxx_ip.h
sound/soc/codecs/twl6040.c
sound/soc/omap/sdp4430.c
Change-Id: Ia1edb1885eff7554aead12780898502df08b7c83
Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 396e8fc..e95d3ac 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -536,6 +536,11 @@ struct sta_bss_parameters { * This number should increase every time the list of stations * changes, i.e. when a station is added or removed, so that * userspace can tell whether it got a consistent snapshot. + * @assoc_req_ies: IEs from (Re)Association Request. + * This is used only when in AP mode with drivers that do not use + * user space MLME/SME implementation. The information is provided for + * the cfg80211_new_sta() calls to notify user space of the IEs. + * @assoc_req_ies_len: Length of assoc_req_ies buffer in octets. */ struct station_info { u32 filled; @@ -558,6 +563,14 @@ struct station_info { struct sta_bss_parameters bss_param; int generation; + + const u8 *assoc_req_ies; + size_t assoc_req_ies_len; + + /* + * Note: Add a new enum station_info_flags value for each new field and + * use it to check which fields are initialized. + */ }; /** |