X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fwan%2Fwanxl.c;h=6370aa7c2760bab093274f6775615dac11cf207d;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=e71b1800ef2f2f90d873c7ca26819c5a8939ae2a;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index e71b1800e..6370aa7c2 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -71,7 +71,7 @@ typedef struct card_t {
 	int n_ports;		/* 1, 2 or 4 ports */
 	u8 irq;
 
-	u8 __iomem *plx;	/* PLX PCI9060 virtual base address */
+	u8 *plx;		/* PLX PCI9060 virtual base address */
 	struct pci_dev *pdev;	/* for pdev->slot_name */
 	int rx_in;
 	struct sk_buff *rx_skbs[RX_QUEUE_LENGTH];
@@ -224,6 +224,8 @@ static inline void wanxl_rx_intr(card_t *card)
 #endif
 				stats->rx_packets++;
 				stats->rx_bytes += skb->len;
+				skb->mac.raw = skb->data;
+				skb->dev = dev;
 				dev->last_rx = jiffies;
 				skb->protocol = hdlc_type_trans(skb, dev);
 				netif_rx(skb);
@@ -397,7 +399,7 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 static int wanxl_open(struct net_device *dev)
 {
 	port_t *port = dev_to_port(dev);
-	u8 __iomem *dbr = port->card->plx + PLX_DOORBELL_TO_CARD;
+	u8 *dbr = port->card->plx + PLX_DOORBELL_TO_CARD;
 	unsigned long timeout;
 	int i;
 
@@ -560,7 +562,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
 	unsigned long timeout;
 	u32 plx_phy;		/* PLX PCI base address */
 	u32 mem_phy;		/* memory PCI base addr */
-	u8 __iomem *mem;	/* memory virtual base addr */
+	u8 *mem;		/* memory virtual base addr */
 	int i, ports, alloc_size;
 
 #ifndef MODULE