From patchwork Wed Oct 30 08:18:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 287155 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E9AC92C037D for ; Wed, 30 Oct 2013 19:18:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752693Ab3J3ISm (ORCPT ); Wed, 30 Oct 2013 04:18:42 -0400 Received: from mail-ee0-f53.google.com ([74.125.83.53]:63444 "EHLO mail-ee0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752273Ab3J3ISj (ORCPT ); Wed, 30 Oct 2013 04:18:39 -0400 Received: by mail-ee0-f53.google.com with SMTP id e51so442372eek.12 for ; Wed, 30 Oct 2013 01:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NsCHzSKJ07w1Tb9rW8EYFUn3ed574kJhT5phsov7tfY=; b=mfnxbFBrTSf5350YKM7qEEK2JB9Xc0SA6csX39EJreXepk0XXuRS6XcUfbhJzYtmau DiZT1qmufRMHRluku86CVfiwnZ9SrgAfMRk1Abi3VdfOjKd8s1OBOxtaYgK4sJivDJcN AbzF6+h1gY14pIwfWDjekEESbJdAOvAgjbI5Jd9aXq878jMmwuCJ3+J8ZU4r+Tv7vlZB 0c9gkjTOg5sMDzC+9FytZHoEpbYLVUu7O8gUv+XbqMxPQiDfcwOUCzFokx0c/Q/St9If Kj0TxznapnZtmiv5zM4t8G2wQBLv+ylkyI7AbPyd06Tkj5x7jniCzRymXWPH6XDkiH2v xG7A== X-Received: by 10.14.102.66 with SMTP id c42mr3733248eeg.47.1383121118178; Wed, 30 Oct 2013 01:18:38 -0700 (PDT) Received: from localhost.localdomain (p4FD31CA4.dip0.t-ipconnect.de. [79.211.28.164]) by mx.google.com with ESMTPSA id s3sm80508677eeo.3.2013.10.30.01.18.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Oct 2013 01:18:37 -0700 (PDT) From: Alexander Aring To: alex.bluesman.smirnov@gmail.com Cc: linux-zigbee-devel@lists.sourceforge.net, werner@almesberger.net, dbaryshkov@gmail.com, netdev@vger.kernel.org, Alexander Aring Subject: [PATCH net-next 3/4] 6lowpan: set 6lowpan network and transport header Date: Wed, 30 Oct 2013 09:18:23 +0100 Message-Id: <1383121104-2515-4-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1383121104-2515-1-git-send-email-alex.aring@gmail.com> References: <1383121104-2515-1-git-send-email-alex.aring@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is necessary to access network header with the skb_network_header function instead of calculate the position with mac_len, etc. Do the same for the transport header, when we replace the IPv6 header with the 6LoWPAN header. Signed-off-by: Alexander Aring Acked-by: Werner Almesberger --- net/ieee802154/6lowpan.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index e6db1f5..58c07fd 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -654,7 +654,9 @@ static int lowpan_header_create(struct sk_buff *skb, head[1] = iphc1; skb_pull(skb, sizeof(struct ipv6hdr)); + skb_reset_transport_header(skb); memcpy(skb_push(skb, hc06_ptr - head), head, hc06_ptr - head); + skb_reset_network_header(skb); lowpan_raw_dump_table(__func__, "raw skb data dump", skb->data, skb->len);