projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] zd1211rw: Add another ID for Linksys WUSBF54G
[powerpc.git]
/
drivers
/
net
/
atari_pamsnet.c
diff --git
a/drivers/net/atari_pamsnet.c
b/drivers/net/atari_pamsnet.c
index
8b99780
..
5471440
100644
(file)
--- a/
drivers/net/atari_pamsnet.c
+++ b/
drivers/net/atari_pamsnet.c
@@
-119,7
+119,7
@@
static char *version =
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
* Global variable 'pamsnet_debug'. Can be set at load time by 'insmod'
*/
unsigned int pamsnet_debug = NET_DEBUG;
-
MODULE_PARM(pamsnet_debug, "i"
);
+
module_param(pamsnet_debug, int, 0
);
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)");
MODULE_LICENSE("GPL");
@@
-163,7
+163,7
@@
static int pamsnet_close(struct net_device *dev);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
static struct net_device_stats *net_get_stats(struct net_device *dev);
static void pamsnet_tick(unsigned long);
-static irqreturn_t pamsnet_intr(int irq, void *data
, struct pt_regs *fp
);
+static irqreturn_t pamsnet_intr(int irq, void *data);
static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0);
static DEFINE_TIMER(pamsnet_timer, pamsnet_tick, 0, 0);
@@
-494,7
+494,6
@@
static irqreturn_t
pamsnet_intr(irq, data, fp)
int irq;
void *data;
pamsnet_intr(irq, data, fp)
int irq;
void *data;
- struct pt_regs *fp;
{
return IRQ_HANDLED;
}
{
return IRQ_HANDLED;
}
@@
-718,7
+717,8
@@
pamsnet_send_packet(struct sk_buff *skb, struct net_device *dev) {
local_irq_restore(flags);
if( !STRAM_ADDR(buf+length-1) ) {
local_irq_restore(flags);
if( !STRAM_ADDR(buf+length-1) ) {
- memcpy(nic_packet->buffer, skb->data, length);
+ skb_copy_from_linear_data(skb, nic_packet->buffer,
+ length);
buf = (unsigned long)phys_nic_packet;
}
buf = (unsigned long)phys_nic_packet;
}
@@
-793,7
+793,8
@@
pamsnet_poll_rx(struct net_device *dev) {
/* 'skb->data' points to the start of sk_buff data area.
*/
/* 'skb->data' points to the start of sk_buff data area.
*/
- memcpy(skb->data, nic_packet->buffer, pkt_len);
+ skb_copy_to_linear_data(skb, nic_packet->buffer,
+ pkt_len);
netif_rx(skb);
dev->last_rx = jiffies;
lp->stats.rx_packets++;
netif_rx(skb);
dev->last_rx = jiffies;
lp->stats.rx_packets++;
@@
-857,7
+858,7
@@
pamsnet_close(struct net_device *dev) {
/* Get the current statistics.
This may be called with the card open or closed.
*/
/* Get the current statistics.
This may be called with the card open or closed.
*/
-static struct net_device_stats *net_get_stats(struct net_device *dev)
+static struct net_device_stats *net_get_stats(struct net_device *dev)
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;
{
struct net_local *lp = netdev_priv(dev);
return &lp->stats;