vserver 1.9.3

[linux-2.6.git] / drivers / usb / net / catc.c

diff --git a/drivers/usb/net/catc.c b/drivers/usb/net/catc.c
index d705e81..455fe6e 100644 (file)
--- a/drivers/usb/net/catc.c
+++ b/drivers/usb/net/catc.c
@@ -242,7 +242,7 @@ static void catc_rx_done(struct urb *urb, struct pt_regs *regs)
 
        do {
                if(!catc->is_f5u011) {
-                       pkt_len = le16_to_cpup((u16*)pkt_start);
+                       pkt_len = le16_to_cpup((__le16*)pkt_start);
                        if (pkt_len > urb->actual_length) {
                                catc->stats.rx_length_errors++;
                                catc->stats.rx_errors++;
@@ -303,7 +303,7 @@ static void catc_irq_done(struct urb *urb, struct pt_regs *regs)
                else if (data[1] & 0x20)
                        linksts = LinkBad;
        } else {
-               hasdata = (unsigned int)(be16_to_cpup((u16*)data) & 0x0fff);
+               hasdata = (unsigned int)(be16_to_cpup((__be16*)data) & 0x0fff);
                if (data[0] == 0x90)
                        linksts = LinkGood;
                else if (data[0] == 0xA0)
@@ -672,7 +672,7 @@ static int netdev_ethtool_ioctl(struct net_device *dev, void __user *useraddr)
         struct catc *catc = dev->priv;
         u32 cmd;
         
-        if (get_user(cmd, (u32 *)useraddr))
+        if (get_user(cmd, (u32 __user *)useraddr))
                 return -EFAULT;
 
         switch (cmd) {
@@ -726,7 +726,7 @@ static int catc_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
         switch(cmd) {
         case SIOCETHTOOL:
-                return netdev_ethtool_ioctl(dev, (void __user *)rq->ifr_data);
+                return netdev_ethtool_ioctl(dev, rq->ifr_data);
         default:
                 return -EOPNOTSUPP;
         }