projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] cpuset: remove marker_pid documentation
[powerpc.git]
/
drivers
/
atm
/
he.c
diff --git
a/drivers/atm/he.c
b/drivers/atm/he.c
index
c2c31a5
..
fde9334
100644
(file)
--- a/
drivers/atm/he.c
+++ b/
drivers/atm/he.c
@@
-57,7
+57,6
@@
#include <linux/config.h>
#include <linux/module.h>
#include <linux/config.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/skbuff.h>
#include <linux/pci.h>
@@
-70,6
+69,7
@@
#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/timer.h>
#include <linux/interrupt.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/byteorder.h>
#include <asm/uaccess.h>
@@
-371,7
+371,7
@@
he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
if (pci_enable_device(pci_dev))
return -EIO;
if (pci_enable_device(pci_dev))
return -EIO;
- if (pci_set_dma_mask(pci_dev,
HE_DMA
_MASK) != 0) {
+ if (pci_set_dma_mask(pci_dev,
DMA_32BIT
_MASK) != 0) {
printk(KERN_WARNING "he: no suitable dma available\n");
err = -EIO;
goto init_one_failure;
printk(KERN_WARNING "he: no suitable dma available\n");
err = -EIO;
goto init_one_failure;
@@
-411,8
+411,7
@@
he_init_one(struct pci_dev *pci_dev, const struct pci_device_id *pci_ent)
init_one_failure:
if (atm_dev)
atm_dev_deregister(atm_dev);
init_one_failure:
if (atm_dev)
atm_dev_deregister(atm_dev);
- if (he_dev)
- kfree(he_dev);
+ kfree(he_dev);
pci_disable_device(pci_dev);
return err;
}
pci_disable_device(pci_dev);
return err;
}
@@
-1887,7
+1886,7
@@
he_service_rbrq(struct he_dev *he_dev, int group)
if (rx_skb_reserve > 0)
skb_reserve(skb, rx_skb_reserve);
if (rx_skb_reserve > 0)
skb_reserve(skb, rx_skb_reserve);
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
for (iov = he_vcc->iov_head;
iov < he_vcc->iov_tail; ++iov) {
for (iov = he_vcc->iov_head;
iov < he_vcc->iov_tail; ++iov) {
@@
-2533,8
+2532,7
@@
he_open(struct atm_vcc *vcc)
open_failed:
if (err) {
open_failed:
if (err) {
- if (he_vcc)
- kfree(he_vcc);
+ kfree(he_vcc);
clear_bit(ATM_VF_ADDR, &vcc->flags);
}
else
clear_bit(ATM_VF_ADDR, &vcc->flags);
}
else