summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Wei <jiaweiwei.xiyou@gmail.com>2011-04-28 09:30:01 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-03 12:52:00 -0700
commit9005fcd89c24f2a0fa6f87588b9208aae6d4d6cd (patch)
treea8fdb26f0070ac003307dc74d13431a1a5bdeeb9
parentb27b8ea853c4c1c1d5d95448cf69b3f10a9558d4 (diff)
staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c
Hi us, When i was compiling kernel, a warning happened to me. The warning said like following. drivers/staging/wlan-ng/cfg80211.c:709: warning: initialization from incompatible pointer type. See http://s1202.photobucket.com/albums/bb364/harrywei/?action=view&current=patched2.png for more details. So i patch like following. Signed-off-by: Harry Wei <harryxiyou@gmail.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/wlan-ng/cfg80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/wlan-ng/cfg80211.c b/drivers/staging/wlan-ng/cfg80211.c
index 6a71f52c59b..76378397b76 100644
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
@@ -273,7 +273,7 @@ exit:
}
int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
- u8 key_index)
+ u8 key_index, bool unicast, bool multicast)
{
wlandevice_t *wlandev = dev->ml_priv;