aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-04-10 20:50:43 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-25 22:24:59 -0700
commitd56f90a7c96da5187f0cdf07ee7434fe6aa78bbc (patch)
tree3b9073cecfbb3b6a1e25ab2b5dd2a22a43aef238 /include/linux
parentbbe735e4247dba32568a305553b010081c8dea99 (diff)
downloadkernel_samsung_espresso10-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.zip
kernel_samsung_espresso10-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.tar.gz
kernel_samsung_espresso10-d56f90a7c96da5187f0cdf07ee7434fe6aa78bbc.tar.bz2
[SK_BUFF]: Introduce skb_network_header()
For the places where we need a pointer to the network header, it is still legal to touch skb->nh.raw directly if just adding to, subtracting from or setting it to another layer header. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/if_pppox.h2
-rw-r--r--include/linux/skbuff.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
index 7044f8a..29d6579 100644
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
@@ -116,7 +116,7 @@ struct pppoe_hdr {
static inline struct pppoe_hdr *pppoe_hdr(const struct sk_buff *skb)
{
- return (struct pppoe_hdr *)skb->nh.raw;
+ return (struct pppoe_hdr *)skb_network_header(skb);
}
struct pppoe_opt {
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 47cc8b0..76d30f3 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -960,6 +960,11 @@ static inline void skb_reserve(struct sk_buff *skb, int len)
skb->tail += len;
}
+static inline unsigned char *skb_network_header(const struct sk_buff *skb)
+{
+ return skb->nh.raw;
+}
+
static inline void skb_reset_network_header(struct sk_buff *skb)
{
skb->nh.raw = skb->data;