From aa490edbc295f7873e8f36ae937d85699f3673f3 Mon Sep 17 00:00:00 2001 From: Vidhya Govindan Date: Tue, 17 Nov 2009 18:49:54 +0200 Subject: [PATCH] --- yaml --- r: 171873 b: refs/heads/master c: 06cc5d3bb01350466f7a1bf64d9afe06870b6480 h: refs/heads/master i: 171871: 462bc82f69503a47b266b886b9492cedb9661f02 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1251_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de85c7aa367a..b154edde21a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79553f82c993ed511450748f01e16e4dccdc8c02 +refs/heads/master: 06cc5d3bb01350466f7a1bf64d9afe06870b6480 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c index 2e1c10f9670a..ff4be7bf5d36 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c @@ -576,7 +576,8 @@ static int wl1251_build_null_data(struct wl1251 *wl) memcpy(template.header.sa, wl->mac_addr, ETH_ALEN); template.header.frame_ctl = cpu_to_le16(IEEE80211_FTYPE_DATA | - IEEE80211_STYPE_NULLFUNC); + IEEE80211_STYPE_NULLFUNC | + IEEE80211_FCTL_TODS); return wl1251_cmd_template_set(wl, CMD_NULL_DATA, &template, sizeof(template));