chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c - Issue 5326002: Update compat-wireless to 2.6.36-5-spn

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master

Patch Set: Created 10 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c

diff --git a/chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c b/chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c

index 427b46f558ed4f57b0066a2ae312be0d0e82c7ae..0e937dc0c9c41df6cff985c6b538f6cb17cf1091 100644

--- a/chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c

+++ b/chromeos/compat-wireless/drivers/net/wireless/p54/txrx.c

@@ -446,7 +446,7 @@ static void p54_rx_frame_sent(struct p54_common *priv, struct sk_buff *skb)

}

if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) &&

- (!payload->status))

+ !(payload->status & P54_TX_FAILED))

info->flags |= IEEE80211_TX_STAT_ACK;

if (payload->status & P54_TX_PSM_CANCELLED)

info->flags |= IEEE80211_TX_STAT_TX_FILTERED;

@@ -540,7 +540,7 @@ static void p54_rx_trap(struct p54_common *priv, struct sk_buff *skb)

case P54_TRAP_BEACON_TX:

break;

case P54_TRAP_RADAR:

- wiphy_info(priv->hw->wiphy, "radar (freq:%d mhz)\n", freq);

+ wiphy_info(priv->hw->wiphy, "radar (freq:%d MHz)\n", freq);

break;

case P54_TRAP_NO_BEACON:

if (priv->vif)