Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 22097
b: refs/heads/master
c: da81817
h: refs/heads/master
i:
  22095: 8aa973e
v: v3
  • Loading branch information
Eugene Teo authored and Greg Kroah-Hartman committed Mar 20, 2006
1 parent 058ef0b commit bfb2948
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 09abfa8048de8e68eaa09eb07ac18f2d549dfe58
refs/heads/master: da81817fbd744ce70983f1d3c61841265003c7f4
5 changes: 3 additions & 2 deletions trunk/drivers/net/irda/irda-usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
struct sk_buff *newskb;
struct sk_buff *dataskb;
struct urb *next_urb;
int docopy;
unsigned int len, docopy;

IRDA_DEBUG(2, "%s(), len=%d\n", __FUNCTION__, urb->actual_length);

Expand Down Expand Up @@ -851,10 +851,11 @@ static void irda_usb_receive(struct urb *urb, struct pt_regs *regs)
dataskb->dev = self->netdev;
dataskb->mac.raw = dataskb->data;
dataskb->protocol = htons(ETH_P_IRDA);
len = dataskb->len;
netif_rx(dataskb);

/* Keep stats up to date */
self->stats.rx_bytes += dataskb->len;
self->stats.rx_bytes += len;
self->stats.rx_packets++;
self->netdev->last_rx = jiffies;

Expand Down

0 comments on commit bfb2948

Please sign in to comment.