From 88cc4d614c1a8f2e968f9244fbe01676e2e6e4c2 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Tue, 17 Jan 2012 15:05:46 +0200 Subject: [PATCH] --- yaml --- r: 290263 b: refs/heads/master c: e572602884c4f979cbba4fed413af24797fd01d9 h: refs/heads/master i: 290261: 4812abd682bf5cd56785b2c74563e76389a7f749 290259: e6a2c25e97fdc3f3d3a20d545b2f77dcf6f89572 290255: 0c7d57dde9c10dfac2ae44c65fa029e1b6ffbb26 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath6kl/txrx.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 852cbb25ff7c..89333616e2a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3462735dadb90efd5bed9d2b81222ed7da1390a0 +refs/heads/master: e572602884c4f979cbba4fed413af24797fd01d9 diff --git a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c index 91bbc1ffa493..dd6337142603 100644 --- a/trunk/drivers/net/wireless/ath/ath6kl/txrx.c +++ b/trunk/drivers/net/wireless/ath/ath6kl/txrx.c @@ -85,7 +85,7 @@ static bool ath6kl_process_uapsdq(struct ath6kl_sta *conn, struct ath6kl *ar = vif->ar; bool is_apsdq_empty = false; struct ethhdr *datap = (struct ethhdr *) skb->data; - u8 up, traffic_class, *ip_hdr; + u8 up = 0, traffic_class, *ip_hdr; u16 ether_type; struct ath6kl_llc_snap_hdr *llc_hdr; @@ -122,8 +122,6 @@ static bool ath6kl_process_uapsdq(struct ath6kl_sta *conn, if (ether_type == IP_ETHERTYPE) up = ath6kl_wmi_determine_user_priority( ip_hdr, 0); - } else { - up = 0; } traffic_class = ath6kl_wmi_get_traffic_class(up);