Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340516
b: refs/heads/master
c: a932657
h: refs/heads/master
v: v3
  • Loading branch information
Bjørn Mork authored and David S. Miller committed Oct 28, 2012
1 parent bf7e380 commit 2acccdb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7b1e0cba0372c011fc9128a772cf668e70ba9219
refs/heads/master: a932657f51eadb8280166e82dc7034dfbff3985a
4 changes: 2 additions & 2 deletions trunk/drivers/net/usb/sierra_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 2acccdb

Please sign in to comment.