summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2007-05-05 20:41:18 +0200
committerDavid S. Miller <davem@davemloft.net>2007-05-05 20:41:18 +0200
commitaf7cd373b01ccb8191dc16c77fff4cf2b11def50 (patch)
tree8580251b5db69d083a7db7acf296756bbeac2803
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drz... (diff)
downloadlinux-af7cd373b01ccb8191dc16c77fff4cf2b11def50.tar.xz
linux-af7cd373b01ccb8191dc16c77fff4cf2b11def50.zip
[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' Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/iucv/af_iucv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 2f1373855a8b..d9e9ddb8eac5 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -961,7 +961,7 @@ static void iucv_callback_connack(struct iucv_path *path, u8 ipuser[16])
}
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 *sk, struct sk_buff *skb, int len,
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);