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 commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
drivers
/
net
/
benet
/
be_cmds.c
diff --git
a/drivers/net/benet/be_cmds.c
b/drivers/net/benet/be_cmds.c
index
5a4a87e
..
1e2d825
100644
(file)
--- a/
drivers/net/benet/be_cmds.c
+++ b/
drivers/net/benet/be_cmds.c
@@
-1331,7
+1331,7
@@
err:
/*
* Uses MCC for this command as it may be called in BH context
/*
* Uses MCC for this command as it may be called in BH context
- * (mc == NULL) => multicast promiscous
+ * (mc == NULL) => multicast promisc
u
ous
*/
int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
struct net_device *netdev, struct be_dma_mem *mem)
*/
int be_cmd_multicast_set(struct be_adapter *adapter, u32 if_id,
struct net_device *netdev, struct be_dma_mem *mem)