chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.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/rtl818x/rtl8187_dev.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:

View side-by-side diff with in-line comments

Download patch

« chromeos/compat-wireless/drivers/net/wireless/ath/ath9k/rc.c ('K') | « chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8180_dev.c ('k') | chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_rtl8225.c » ('j') | chromeos/compat-wireless/net/mac80211/debugfs_netdev.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.c

diff --git a/chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.c b/chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.c

index 2d9ce322d40316b534545d3a2d330c9d35fa98d2..85f1f4e11c364fc12fd0db3978d90593f4bea964 100644

--- a/chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.c

+++ b/chromeos/compat-wireless/drivers/net/wireless/rtl818x/rtl8187_dev.c

@@ -573,7 +573,7 @@ static int rtl8187_cmd_reset(struct ieee80211_hw *dev)

} while (--i);

if (!i) {

- wiphy_err(dev->wiphy, "reset timeout!\n");

+ wiphy_err(dev->wiphy, "Reset timeout!\n");

return -ETIMEDOUT;

}

@@ -1534,7 +1534,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,

mutex_init(&priv->conf_mutex);

skb_queue_head_init(&priv->b_tx_status.queue);

- wiphy_info(dev->wiphy, "hwaddr %pm, %s v%d + %s, rfkill mask %d\n",

+ wiphy_info(dev->wiphy, "hwaddr %pM, %s V%d + %s, rfkill mask %d\n",

mac_addr, chip_name, priv->asic_rev, priv->rf->name,

priv->rfkill_mask);