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 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
netwave_cs.c
diff --git
a/drivers/net/wireless/netwave_cs.c
b/drivers/net/wireless/netwave_cs.c
index
644b474
..
45b00e1
100644
(file)
--- a/
drivers/net/wireless/netwave_cs.c
+++ b/
drivers/net/wireless/netwave_cs.c
@@
-406,7
+406,6
@@
static int netwave_probe(struct pcmcia_device *link)
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
link->conf.Attributes = CONF_ENABLE_IRQ;
link->conf.IntType = INT_MEMORY_AND_IO;
link->conf.ConfigIndex = 1;
- link->conf.Present = PRESENT_OPTION;
/* Netwave private struct init. link/dev/node already taken care of,
* other stuff zero'd - Jean II */
/* Netwave private struct init. link/dev/node already taken care of,
* other stuff zero'd - Jean II */
@@
-1284,7
+1283,6
@@
static int netwave_rx(struct net_device *dev)
skb_reserve( skb, 2); /* Align IP on 16 byte */
skb_put( skb, rcvLen);
skb_reserve( skb, 2); /* Align IP on 16 byte */
skb_put( skb, rcvLen);
- skb->dev = dev;
/* Copy packet fragments to the skb data area */
ptr = (u_char*) skb->data;
/* Copy packet fragments to the skb data area */
ptr = (u_char*) skb->data;