projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
staging
/
wlags49_h2
/
wl_netdev.c
diff --git
a/drivers/staging/wlags49_h2/wl_netdev.c
b/drivers/staging/wlags49_h2/wl_netdev.c
index
cf917e6
..
5a2b334
100644
(file)
--- a/
drivers/staging/wlags49_h2/wl_netdev.c
+++ b/
drivers/staging/wlags49_h2/wl_netdev.c
@@
-217,7
+217,7
@@
int wl_config( struct net_device *dev, struct ifmap *map )
/* The only thing we care about here is a port change. Since this not needed,
ignore the request. */
/* The only thing we care about here is a port change. Since this not needed,
ignore the request. */
- DBG_TRACE(
DbgInfo, "%s: %s called.\n", dev->name, __FUNC__
);
+ DBG_TRACE(
DbgInfo, "%s: %s called.\n", dev->name, __func__
);
DBG_LEAVE( DbgInfo );
return 0;
DBG_LEAVE( DbgInfo );
return 0;
@@
-1179,7
+1179,7
@@
static const struct net_device_ops wl_netdev_ops =
.ndo_set_config = &wl_config,
.ndo_get_stats = &wl_stats,
.ndo_set_config = &wl_config,
.ndo_get_stats = &wl_stats,
- .ndo_set_
multicast_list
= &wl_multicast,
+ .ndo_set_
rx_mode
= &wl_multicast,
.ndo_init = &wl_insert,
.ndo_open = &wl_adapter_open,
.ndo_init = &wl_insert,
.ndo_open = &wl_adapter_open,