Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=878c814500b123dd61a5e211879a32e5fd932713 Commit: 878c814500b123dd61a5e211879a32e5fd932713 Parent: d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc Author: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> AuthorDate: Sun Mar 11 22:38:29 2007 -0300 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Wed Apr 25 22:25:00 2007 -0700
[SK_BUFF] ipmr: Another skb_push related conversion to skb_reset_network_header Signed-off-by: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]> Signed-off-by: David S. Miller <[EMAIL PROTECTED]> --- net/ipv4/ipmr.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 4a8d99b..465459d 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -561,8 +561,10 @@ static int ipmr_cache_report(struct sk_buff *pkt, vifi_t vifi, int assert) And all this only to mangle msg->im_msgtype and to set msg->im_mbz to "mbz" :-) */ - msg = (struct igmpmsg*)skb_push(skb, sizeof(struct iphdr)); - skb->nh.raw = skb->h.raw = (u8*)msg; + skb_push(skb, sizeof(struct iphdr)); + skb_reset_network_header(skb); + skb->h.raw = skb->data; + msg = (struct igmpmsg *)skb->nh.raw; memcpy(msg, skb_network_header(pkt), sizeof(struct iphdr)); msg->im_msgtype = IGMPMSG_WHOLEPKT; msg->im_mbz = 0; - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html