diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 14:13:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-05 14:13:36 -0700 |
| commit | 68762f3d8e7ea644fae1f490f9850ebf462548bd (patch) | |
| tree | 81be52e9ba33fc4d8aa5f569aaab77b5a34e09ab /net/iucv/af_iucv.c | |
| parent | 4f7a307dc6e4d8bfeb56f7cf7231b08cb845687c (diff) | |
| parent | 7544b0972c1fc1a0e6c54baa1f44c81019743daa (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Add TG3_FLAG_SUPPORT_MSI flag.
[TG3]: Eliminate the TG3_FLAG_5701_REG_WRITE_BUG flag.
[TG3]: Eliminate the TG3_FLAG_GOT_SERDES_FLOWCTL flag.
[TG3]: Remove reset during MAC address changes.
[TG3]: WoL fixes.
[TG3]: Clear GPIO mask before storing.
[TG3]: Improve NVRAM sizing.
[TG3]: Fix TSO bugs.
[MAC80211]: Add maintainers entry for mac80211.
[MAC80211]: Add debugfs attributes.
[MAC80211]: Add mac80211 wireless stack.
[MAC80211]: Add generic include/linux/ieee80211.h
[NETLINK]: Remove references to process ID
[AF_IUCV]: Compile fix - adopt to skbuff changes.
Diffstat (limited to 'net/iucv/af_iucv.c')
| -rw-r--r-- | net/iucv/af_iucv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index 2f1373855a8..d9e9ddb8eac 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); |