projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
natsemi: Improve diagnostics for DspCfg workaround
[powerpc.git]
/
drivers
/
net
/
fec.c
diff --git
a/drivers/net/fec.c
b/drivers/net/fec.c
index
55d86bc
..
255b091
100644
(file)
--- a/
drivers/net/fec.c
+++ b/
drivers/net/fec.c
@@
-229,7
+229,7
@@
struct fec_enet_private {
static int fec_enet_open(struct net_device *dev);
static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void fec_enet_mii(struct net_device *dev);
static int fec_enet_open(struct net_device *dev);
static int fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void fec_enet_mii(struct net_device *dev);
-static irqreturn_t fec_enet_interrupt(int irq, void * dev_id
, struct pt_regs * regs
);
+static irqreturn_t fec_enet_interrupt(int irq, void * dev_id);
static void fec_enet_tx(struct net_device *dev);
static void fec_enet_rx(struct net_device *dev);
static int fec_enet_close(struct net_device *dev);
static void fec_enet_tx(struct net_device *dev);
static void fec_enet_rx(struct net_device *dev);
static int fec_enet_close(struct net_device *dev);
@@
-450,7
+450,7
@@
fec_timeout(struct net_device *dev)
* This is called from the MPC core interrupt.
*/
static irqreturn_t
* This is called from the MPC core interrupt.
*/
static irqreturn_t
-fec_enet_interrupt(int irq, void * dev_id
, struct pt_regs * regs
)
+fec_enet_interrupt(int irq, void * dev_id)
{
struct net_device *dev = dev_id;
volatile fec_t *fecp;
{
struct net_device *dev = dev_id;
volatile fec_t *fecp;
@@
-647,7
+647,6
@@
while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) {
printk("%s: Memory squeeze, dropping packet.\n", dev->name);
fep->stats.rx_dropped++;
} else {
printk("%s: Memory squeeze, dropping packet.\n", dev->name);
fep->stats.rx_dropped++;
} else {
- skb->dev = dev;
skb_put(skb,pkt_len-4); /* Make room */
eth_copy_and_sum(skb, data, pkt_len-4, 0);
skb->protocol=eth_type_trans(skb,dev);
skb_put(skb,pkt_len-4); /* Make room */
eth_copy_and_sum(skb, data, pkt_len-4, 0);
skb->protocol=eth_type_trans(skb,dev);
@@
-1236,7
+1235,7
@@
static void
mii_link_interrupt(void *dev_id);
#else
static irqreturn_t
mii_link_interrupt(void *dev_id);
#else
static irqreturn_t
-mii_link_interrupt(int irq, void * dev_id
, struct pt_regs * regs
);
+mii_link_interrupt(int irq, void * dev_id);
#endif
#endif
#endif
#endif
@@
-1251,7
+1250,7
@@
static void __inline__ fec_request_intrs(struct net_device *dev)
static const struct idesc {
char *name;
unsigned short irq;
static const struct idesc {
char *name;
unsigned short irq;
- irq
return_t (*handler)(int, void *, struct pt_regs *)
;
+ irq
_handler_t handler
;
} *idp, id[] = {
{ "fec(RX)", 86, fec_enet_interrupt },
{ "fec(TX)", 87, fec_enet_interrupt },
} *idp, id[] = {
{ "fec(RX)", 86, fec_enet_interrupt },
{ "fec(TX)", 87, fec_enet_interrupt },
@@
-2117,7
+2116,7
@@
static void
mii_link_interrupt(void *dev_id)
#else
static irqreturn_t
mii_link_interrupt(void *dev_id)
#else
static irqreturn_t
-mii_link_interrupt(int irq, void * dev_id
, struct pt_regs * regs
)
+mii_link_interrupt(int irq, void * dev_id)
#endif
{
struct net_device *dev = dev_id;
#endif
{
struct net_device *dev = dev_id;