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 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
drivers
/
net
/
wan
/
farsync.c
diff --git
a/drivers/net/wan/farsync.c
b/drivers/net/wan/farsync.c
index
7981a2c
..
58a53b6
100644
(file)
--- a/
drivers/net/wan/farsync.c
+++ b/
drivers/net/wan/farsync.c
@@
-864,7
+864,7
@@
fst_tx_dma_complete(struct fst_card_info *card, struct fst_port_info *port,
static __be16 farsync_type_trans(struct sk_buff *skb, struct net_device *dev)
{
skb->dev = dev;
static __be16 farsync_type_trans(struct sk_buff *skb, struct net_device *dev)
{
skb->dev = dev;
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
skb->pkt_type = PACKET_HOST;
return htons(ETH_P_CUST);
}
skb->pkt_type = PACKET_HOST;
return htons(ETH_P_CUST);
}
@@
-1498,7
+1498,7
@@
do_bottom_half_rx(struct fst_card_info *card)
* Dev_id is our fst_card_info pointer
*/
static irqreturn_t
* Dev_id is our fst_card_info pointer
*/
static irqreturn_t
-fst_intr(int irq, void *dev_id
, struct pt_regs *regs
)
+fst_intr(int irq, void *dev_id)
{
struct fst_card_info *card;
struct fst_port_info *port;
{
struct fst_card_info *card;
struct fst_port_info *port;
@@
-2519,7
+2519,7
@@
fst_add_one(struct pci_dev *pdev, const struct pci_device_id *ent)
dbg(DBG_PCI, "kernel mem %p, ctlmem %p\n", card->mem, card->ctlmem);
/* Register the interrupt handler */
dbg(DBG_PCI, "kernel mem %p, ctlmem %p\n", card->mem, card->ctlmem);
/* Register the interrupt handler */
- if (request_irq(pdev->irq, fst_intr,
SA_SHIRQ
, FST_DEV_NAME, card)) {
+ if (request_irq(pdev->irq, fst_intr,
IRQF_SHARED
, FST_DEV_NAME, card)) {
printk_err("Unable to register interrupt %d\n", card->irq);
pci_release_regions(pdev);
pci_disable_device(pdev);
printk_err("Unable to register interrupt %d\n", card->irq);
pci_release_regions(pdev);
pci_disable_device(pdev);
@@
-2697,7
+2697,7
@@
fst_init(void)
for (i = 0; i < FST_MAX_CARDS; i++)
fst_card_array[i] = NULL;
spin_lock_init(&fst_work_q_lock);
for (i = 0; i < FST_MAX_CARDS; i++)
fst_card_array[i] = NULL;
spin_lock_init(&fst_work_q_lock);
- return pci_
module_init
(&fst_driver);
+ return pci_
register_driver
(&fst_driver);
}
static void __exit
}
static void __exit