Linux s390 Architecture development
 help / color / mirror / Atom feed
* [patch] af_iucv: compile fix - adopt to skbuff changes.
@ 2007-05-05 13:20 Heiko Carstens
  2007-05-05 18:41 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Heiko Carstens @ 2007-05-05 13:20 UTC (permalink / raw)
  To: Linus Torvalds, Andrew Morton, David Miller
  Cc: Frank Pavlic, Martin Schwidefsky, Arnaldo Carvalho de Melo,
	linux-kernel, linux-s390

[patch] af_iucv: compile fix - adopt to skbuff changes.

From: Heiko Carstens <heiko.carstens@de.ibm.com>

  CC [M]  net/iucv/af_iucv.o
net/iucv/af_iucv.c: In function `iucv_fragment_skb':
net/iucv/af_iucv.c:984: error: structure has no member named `h'
net/iucv/af_iucv.c:985: error: structure has no member named `nh'
net/iucv/af_iucv.c:988: error: incompatible type for argument 1 of
			`skb_queue_tail'

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Miller <davem@davemloft.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
---
 net/iucv/af_iucv.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6/net/iucv/af_iucv.c
===================================================================
--- linux-2.6.orig/net/iucv/af_iucv.c
+++ linux-2.6/net/iucv/af_iucv.c
@@ -961,7 +961,7 @@ static void iucv_callback_connack(struct
 }
 
 static int iucv_fragment_skb(struct sock *sk, struct sk_buff *skb, int len,
-			     struct sk_buff_head fragmented_skb_q)
+			     struct sk_buff_head *fragmented_skb_q)
 {
 	int dataleft, size, copied = 0;
 	struct sk_buff *nskb;
@@ -981,8 +981,8 @@ static int iucv_fragment_skb(struct sock
 		copied += size;
 		dataleft -= size;
 
-		nskb->h.raw = nskb->data;
-		nskb->nh.raw = nskb->data;
+		skb_reset_transport_header(nskb);
+		skb_reset_network_header(nskb);
 		nskb->len = size;
 
 		skb_queue_tail(fragmented_skb_q, nskb);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch] af_iucv: compile fix - adopt to skbuff changes.
  2007-05-05 13:20 [patch] af_iucv: compile fix - adopt to skbuff changes Heiko Carstens
@ 2007-05-05 18:41 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-05-05 18:41 UTC (permalink / raw)
  To: heiko.carstens
  Cc: torvalds, akpm, fpavlic, schwidefsky, acme, linux-kernel,
	linux-s390

From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Sat, 5 May 2007 15:20:58 +0200

> [patch] af_iucv: compile fix - adopt to skbuff changes.
> 
> From: Heiko Carstens <heiko.carstens@de.ibm.com>
> 
>   CC [M]  net/iucv/af_iucv.o
> net/iucv/af_iucv.c: In function `iucv_fragment_skb':
> net/iucv/af_iucv.c:984: error: structure has no member named `h'
> net/iucv/af_iucv.c:985: error: structure has no member named `nh'
> net/iucv/af_iucv.c:988: error: incompatible type for argument 1 of
> 			`skb_queue_tail'
> 
> Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
> Cc: David Miller <davem@davemloft.net>
> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Frank Pavlic <fpavlic@de.ibm.com>
> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

Applied, thanks Heiko.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-05-05 18:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-05 13:20 [patch] af_iucv: compile fix - adopt to skbuff changes Heiko Carstens
2007-05-05 18:41 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox