Commit d4446f7a authored by Jeff Garzik's avatar Jeff Garzik

de4x5 net driver endian-related fixes.

Caught by Ralf and the mips crowd.
parent 349acfe2
...@@ -3645,7 +3645,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len) ...@@ -3645,7 +3645,7 @@ de4x5_alloc_rx_buff(struct net_device *dev, int index, int len)
tmp = virt_to_bus(p->data); tmp = virt_to_bus(p->data);
i = ((tmp + ALIGN) & ~ALIGN) - tmp; i = ((tmp + ALIGN) & ~ALIGN) - tmp;
skb_reserve(p, i); skb_reserve(p, i);
lp->rx_ring[index].buf = tmp + i; lp->rx_ring[index].buf = cpu_to_le32(tmp + i);
ret = lp->rx_skb[index]; ret = lp->rx_skb[index];
lp->rx_skb[index] = p; lp->rx_skb[index] = p;
...@@ -5616,7 +5616,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) ...@@ -5616,7 +5616,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (!capable(CAP_NET_ADMIN)) return -EPERM; if (!capable(CAP_NET_ADMIN)) return -EPERM;
omr = inl(DE4X5_OMR); omr = inl(DE4X5_OMR);
omr &= ~OMR_PR; omr &= ~OMR_PR;
outb(omr, DE4X5_OMR); outl(omr, DE4X5_OMR);
dev->flags &= ~IFF_PROMISC; dev->flags &= ~IFF_PROMISC;
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment