]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
net: sierra: shut up sparse restricted type warnings
authorBjørn Mork <bjorn@mork.no>
Thu, 25 Oct 2012 22:15:40 +0000 (22:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Oct 2012 23:09:02 +0000 (19:09 -0400)
Removes the warnings

 drivers/net/usb/sierra_net.c:343:45: warning: incorrect type in assignment (different base types)
 drivers/net/usb/sierra_net.c:343:45:    expected unsigned short [unsigned] [short] [usertype] <noident>
 drivers/net/usb/sierra_net.c:343:45:    got restricted __be16 [usertype] <noident>

and

 drivers/net/usb/sierra_net.c:658:18: warning: cast to restricted __le16

Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/usb/sierra_net.c

index eb5c7a8da9dbe3c838240cdc27898e438278e7ca..18dd4257ab17eaba7115ab33fe3bef2743f38a63 100644 (file)
@@ -339,7 +339,7 @@ static void sierra_net_set_ctx_index(struct sierra_net_data *priv, u8 ctx_ix)
        dev_dbg(&(priv->usbnet->udev->dev), "%s %d", __func__, ctx_ix);
        priv->tx_hdr_template[0] = 0x3F;
        priv->tx_hdr_template[1] = ctx_ix;
-       *((u16 *)&priv->tx_hdr_template[2]) =
+       *((__be16 *)&priv->tx_hdr_template[2]) =
                cpu_to_be16(SIERRA_NET_HIP_EXT_IP_OUT_ID);
 }
 
@@ -631,7 +631,7 @@ static int sierra_net_change_mtu(struct net_device *net, int new_mtu)
 static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap)
 {
        int result = 0;
-       u16 attrdata;
+       __le16 attrdata;
 
        result = usbnet_read_cmd(dev,
                                /* _u8 vendor specific request */