git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
libertas
/
main.c
diff --git
a/drivers/net/wireless/libertas/main.c
b/drivers/net/wireless/libertas/main.c
index
f78afd7
..
b03779b
100644
(file)
--- a/
drivers/net/wireless/libertas/main.c
+++ b/
drivers/net/wireless/libertas/main.c
@@
-934,7
+934,7
@@
static const struct net_device_ops lbs_netdev_ops = {
.ndo_stop = lbs_eth_stop,
.ndo_start_xmit = lbs_hard_start_xmit,
.ndo_set_mac_address = lbs_set_mac_address,
.ndo_stop = lbs_eth_stop,
.ndo_start_xmit = lbs_hard_start_xmit,
.ndo_set_mac_address = lbs_set_mac_address,
- .ndo_set_
multicast_list
= lbs_set_multicast_list,
+ .ndo_set_
rx_mode
= lbs_set_multicast_list,
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
};
.ndo_change_mtu = eth_change_mtu,
.ndo_validate_addr = eth_validate_addr,
};