Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 314613
b: refs/heads/master
c: b42f7b5
h: refs/heads/master
i:
  314611: daafd24
v: v3
  • Loading branch information
Sjur Brændeland authored and David S. Miller committed Jun 25, 2012
1 parent 98f9cd5 commit b40a3f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: 90de9bab9123d7fe905cb885c1e3ed32dc516f18
refs/heads/master: b42f7b5cfda6f7dac298da2d9a8855f6364e35d9
10 changes: 5 additions & 5 deletions trunk/drivers/net/caif/caif_hsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
/* Check if we can embed a CAIF frame. */
if (skb->len < CFHSI_MAX_EMB_FRM_SZ) {
struct caif_payload_info *info;
int hpad = 0;
int tpad = 0;
int hpad;
int tpad;

/* Calculate needed head alignment and tail alignment. */
info = (struct caif_payload_info *)&skb->cb;
Expand Down Expand Up @@ -282,8 +282,8 @@ static int cfhsi_tx_frm(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
pfrm = desc->emb_frm + CFHSI_MAX_EMB_FRM_SZ;
while (nfrms < CFHSI_MAX_PKTS) {
struct caif_payload_info *info;
int hpad = 0;
int tpad = 0;
int hpad;
int tpad;

if (!skb)
skb = cfhsi_dequeue(cfhsi);
Expand Down Expand Up @@ -573,7 +573,7 @@ static int cfhsi_rx_pld(struct cfhsi_desc *desc, struct cfhsi *cfhsi)
struct sk_buff *skb;
u8 *dst = NULL;
u8 *pcffrm = NULL;
int len = 0;
int len;

/* CAIF frame starts after head padding. */
pcffrm = pfrm + *pfrm + 1;
Expand Down

0 comments on commit b40a3f0

Please sign in to comment.