From 22fbef338e37e1330eee7a219b100b217624a26a Mon Sep 17 00:00:00 2001 From: Adam Thompson Date: Sat, 29 Jan 2011 02:08:50 -0500 Subject: [PATCH] --- yaml --- r: 235770 b: refs/heads/master c: e80528b78e8d33494a0784dc214e71a728162d92 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/p80211conv.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc97fa3dcd09..9865d7c918a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae639830fe6299d67407ca63f43bb28ea781684a +refs/heads/master: e80528b78e8d33494a0784dc214e71a728162d92 diff --git a/trunk/drivers/staging/wlan-ng/p80211conv.c b/trunk/drivers/staging/wlan-ng/p80211conv.c index 146f3651b6f2..f53a27a2e3fe 100644 --- a/trunk/drivers/staging/wlan-ng/p80211conv.c +++ b/trunk/drivers/staging/wlan-ng/p80211conv.c @@ -379,7 +379,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, } else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap)) - &&(e_llc->dsap == 0xaa) + && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) && (e_llc->ctl == 0x03) && @@ -415,7 +415,7 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv, } else if ((payload_length >= sizeof(struct wlan_llc) + sizeof(struct wlan_snap)) - &&(e_llc->dsap == 0xaa) + && (e_llc->dsap == 0xaa) && (e_llc->ssap == 0xaa) && (e_llc->ctl == 0x03)) { pr_debug("802.1h/RFC1042 len: %d\n", payload_length);