Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 74800
b: refs/heads/master
c: 9b3efc0
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed Dec 11, 2007
1 parent be99bfa commit 2f98b86
Show file tree
Hide file tree
Showing 3 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: 299f590f26da9764f20e905879f0090552ff2e86
refs/heads/master: 9b3efc0133a807070dbd21254102995b65969965
6 changes: 3 additions & 3 deletions trunk/drivers/s390/net/ctcmain.c
Original file line number Diff line number Diff line change
Expand Up @@ -478,14 +478,14 @@ ctc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
skb->dev = pskb->dev;
skb->protocol = pskb->protocol;
pskb->ip_summed = CHECKSUM_UNNECESSARY;
netif_rx_ni(skb);
/**
* Successful rx; reset logflags
* reset logflags
*/
ch->logflags = 0;
dev->last_rx = jiffies;
privptr->stats.rx_packets++;
privptr->stats.rx_bytes += skb->len;
netif_rx_ni(skb);
dev->last_rx = jiffies;
if (len > 0) {
skb_pull(pskb, header->length);
if (skb_tailroom(pskb) < LL_HEADER_LENGTH) {
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/s390/net/netiucv.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,14 +639,14 @@ static void netiucv_unpack_skb(struct iucv_connection *conn,
skb->dev = pskb->dev;
skb->protocol = pskb->protocol;
pskb->ip_summed = CHECKSUM_UNNECESSARY;
privptr->stats.rx_packets++;
privptr->stats.rx_bytes += skb->len;
/*
* Since receiving is always initiated from a tasklet (in iucv.c),
* we must use netif_rx_ni() instead of netif_rx()
*/
netif_rx_ni(skb);
dev->last_rx = jiffies;
privptr->stats.rx_packets++;
privptr->stats.rx_bytes += skb->len;
skb_pull(pskb, header->next);
skb_put(pskb, NETIUCV_HDRLEN);
}
Expand Down

0 comments on commit 2f98b86

Please sign in to comment.