From b911414dd9bfe30928cd5de4fa8d3c503ad5b407 Mon Sep 17 00:00:00 2001
From: Johan Meiring <johanmeiring@gmail.com>
Date: Sat, 6 Nov 2010 18:21:59 +0200
Subject: [PATCH] --- yaml --- r: 228062 b: refs/heads/master c:
 6f710907ff452ab67bd1161bc3f7a95f9a7e809d h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/staging/wlan-ng/p80211netdev.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3ccdc593ad80..cd69901fa22e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 869c4b4a715af94a14ec074c0a5528a562e3322b
+refs/heads/master: 6f710907ff452ab67bd1161bc3f7a95f9a7e809d
diff --git a/trunk/drivers/staging/wlan-ng/p80211netdev.c b/trunk/drivers/staging/wlan-ng/p80211netdev.c
index aa1792c8429e..48f223e05ddd 100644
--- a/trunk/drivers/staging/wlan-ng/p80211netdev.c
+++ b/trunk/drivers/staging/wlan-ng/p80211netdev.c
@@ -301,7 +301,8 @@ static void p80211netdev_rx_bh(unsigned long arg)
 					if (memcmp
 					    (hdr->a1, wlandev->netdev->dev_addr,
 					     ETH_ALEN) != 0) {
-						/* but reject anything else that isn't multicast */
+						/* but reject anything else that
+						   isn't multicast */
 						if (!(hdr->a1[0] & 0x01)) {
 							dev_kfree_skb(skb);
 							continue;
@@ -770,7 +771,8 @@ int wlan_setup(wlandevice_t *wlandev, struct device *physdev)
 	}
 
 	/* Allocate and initialize the struct device */
-	netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d", ether_setup);
+	netdev = alloc_netdev(sizeof(struct wireless_dev), "wlan%d",
+				ether_setup);
 	if (netdev == NULL) {
 		printk(KERN_ERR "Failed to alloc netdev.\n");
 		wlan_free_wiphy(wiphy);