git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ppc
/
8xx_io
/
enet.c
diff --git
a/arch/ppc/8xx_io/enet.c
b/arch/ppc/8xx_io/enet.c
index
8ddef1c
..
f720d2a
100644
(file)
--- a/
arch/ppc/8xx_io/enet.c
+++ b/
arch/ppc/8xx_io/enet.c
@@
-38,11
+38,12
@@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/spinlock.h>
+#include <linux/dma-mapping.h>
+#include <linux/bitops.h>
#include <asm/8xx_immap.h>
#include <asm/pgtable.h>
#include <asm/mpc8xx.h>
#include <asm/8xx_immap.h>
#include <asm/pgtable.h>
#include <asm/mpc8xx.h>
-#include <asm/bitops.h>
#include <asm/uaccess.h>
#include <asm/commproc.h>
#include <asm/uaccess.h>
#include <asm/commproc.h>
@@
-581,10
+582,10
@@
static void set_multicast_list(struct net_device *dev)
/* Log any net taps. */
printk("%s: Promiscuous mode enabled.\n", dev->name);
/* Log any net taps. */
printk("%s: Promiscuous mode enabled.\n", dev->name);
- cep->sccp->scc_p
msr |= SCC_PMS
R_PRO;
+ cep->sccp->scc_p
smr |= SCC_PSM
R_PRO;
} else {
} else {
- cep->sccp->scc_p
msr &= ~SCC_PMS
R_PRO;
+ cep->sccp->scc_p
smr &= ~SCC_PSM
R_PRO;
if (dev->flags & IFF_ALLMULTI) {
/* Catch all multicast addresses, so set the
if (dev->flags & IFF_ALLMULTI) {
/* Catch all multicast addresses, so set the
@@
-835,7
+836,8
@@
static int __init scc_enet_init(void)
/* Allocate a page.
*/
/* Allocate a page.
*/
- ba = (unsigned char *)consistent_alloc(GFP_KERNEL, PAGE_SIZE, &mem_addr);
+ ba = (unsigned char *)dma_alloc_coherent(NULL, PAGE_SIZE,
+ &mem_addr, GFP_KERNEL);
/* BUG: no check for failure */
/* Initialize the BD for every fragment in the page.
/* BUG: no check for failure */
/* Initialize the BD for every fragment in the page.
@@
-889,7
+891,7
@@
static int __init scc_enet_init(void)
/* Set processing mode. Use Ethernet CRC, catch broadcast, and
* start frame search 22 bit times after RENA.
*/
/* Set processing mode. Use Ethernet CRC, catch broadcast, and
* start frame search 22 bit times after RENA.
*/
- sccp->scc_p
msr = (SCC_PMSR_ENCRC | SCC_PMS
R_NIB22);
+ sccp->scc_p
smr = (SCC_PSMR_ENCRC | SCC_PSM
R_NIB22);
/* It is now OK to enable the Ethernet transmitter.
* Unfortunately, there are board implementation differences here.
/* It is now OK to enable the Ethernet transmitter.
* Unfortunately, there are board implementation differences here.