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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
drivers
/
net
/
benet
/
be_main.c
diff --git
a/drivers/net/benet/be_main.c
b/drivers/net/benet/be_main.c
index
a71163f
..
9a54c8b
100644
(file)
--- a/
drivers/net/benet/be_main.c
+++ b/
drivers/net/benet/be_main.c
@@
-708,7
+708,7
@@
static void be_set_multicast_list(struct net_device *netdev)
goto done;
}
- /* BE was previously in promiscous mode; disable it */
+ /* BE was previously in promisc
u
ous mode; disable it */
if (adapter->promiscuous) {
adapter->promiscuous = false;
be_cmd_promiscuous_config(adapter, adapter->port_num, 0);