git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
82596.c
diff --git
a/drivers/net/82596.c
b/drivers/net/82596.c
index
65f97b1
..
da0c878
100644
(file)
--- a/
drivers/net/82596.c
+++ b/
drivers/net/82596.c
@@
-546,11
+546,11
@@
static inline void init_rx_bufs(struct net_device *dev)
rbd->b_next = WSWAPrbd(virt_to_bus(rbd+1));
rbd->b_addr = WSWAPrbd(virt_to_bus(rbd));
rbd->skb = skb;
rbd->b_next = WSWAPrbd(virt_to_bus(rbd+1));
rbd->b_addr = WSWAPrbd(virt_to_bus(rbd));
rbd->skb = skb;
- rbd->v_data = skb->
tail
;
- rbd->b_data = WSWAPchar(virt_to_bus(skb->
tail
));
+ rbd->v_data = skb->
data
;
+ rbd->b_data = WSWAPchar(virt_to_bus(skb->
data
));
rbd->size = PKT_BUF_SZ;
#ifdef __mc68000__
rbd->size = PKT_BUF_SZ;
#ifdef __mc68000__
- cache_clear(virt_to_phys(skb->
tail
), PKT_BUF_SZ);
+ cache_clear(virt_to_phys(skb->
data
), PKT_BUF_SZ);
#endif
}
lp->rbd_head = lp->rbds;
#endif
}
lp->rbd_head = lp->rbds;
@@
-614,7
+614,7
@@
static void rebuild_rx_bufs(struct net_device *dev)
static int init_i596_mem(struct net_device *dev)
{
struct i596_private *lp = dev->priv;
static int init_i596_mem(struct net_device *dev)
{
struct i596_private *lp = dev->priv;
-#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
+#if !defined(ENABLE_MVME16x_NET) && !defined(ENABLE_BVME6000_NET)
|| defined(ENABLE_APRICOT)
short ioaddr = dev->base_addr;
#endif
unsigned long flags;
short ioaddr = dev->base_addr;
#endif
unsigned long flags;
@@
-816,10
+816,10
@@
static inline int i596_rx(struct net_device *dev)
rx_in_place = 1;
rbd->skb = newskb;
newskb->dev = dev;
rx_in_place = 1;
rbd->skb = newskb;
newskb->dev = dev;
- rbd->v_data = newskb->
tail
;
- rbd->b_data = WSWAPchar(virt_to_bus(newskb->
tail
));
+ rbd->v_data = newskb->
data
;
+ rbd->b_data = WSWAPchar(virt_to_bus(newskb->
data
));
#ifdef __mc68000__
#ifdef __mc68000__
- cache_clear(virt_to_phys(newskb->
tail
), PKT_BUF_SZ);
+ cache_clear(virt_to_phys(newskb->
data
), PKT_BUF_SZ);
#endif
}
else
#endif
}
else
@@
-840,7
+840,7
@@
memory_squeeze:
skb->protocol=eth_type_trans(skb,dev);
skb->len = pkt_len;
#ifdef __mc68000__
skb->protocol=eth_type_trans(skb,dev);
skb->len = pkt_len;
#ifdef __mc68000__
- cache_clear(virt_to_phys(rbd->skb->
tail
),
+ cache_clear(virt_to_phys(rbd->skb->
data
),
pkt_len);
#endif
netif_rx(skb);
pkt_len);
#endif
netif_rx(skb);