summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2007-03-10 19:34:36 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 07:24:42 +0200
commit37e6636669b0b996681586facee8034f7f674f6a (patch)
tree4ab874ffd5b5408aa0d8bf59b3dcdb0c89b9b770
parent[SK_BUFF]: Introduce skb_mac_header() (diff)
downloadlinux-37e6636669b0b996681586facee8034f7f674f6a.tar.xz
linux-37e6636669b0b996681586facee8034f7f674f6a.zip
[LLC]: Kill llc_set_pdu_hdr
We'll have skb_reset_network_header soon. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/llc_pdu.h11
1 files changed, 5 insertions, 6 deletions
diff --git a/include/net/llc_pdu.h b/include/net/llc_pdu.h
index aa33a477c3fb..4e620992c806 100644
--- a/include/net/llc_pdu.h
+++ b/include/net/llc_pdu.h
@@ -218,11 +218,6 @@ static inline struct llc_pdu_un *llc_pdu_un_hdr(struct sk_buff *skb)
return (struct llc_pdu_un *)skb->nh.raw;
}
-static inline void *llc_set_pdu_hdr(struct sk_buff *skb, void *ptr)
-{
- return skb->nh.raw = ptr;
-}
-
/**
* llc_pdu_header_init - initializes pdu header
* @skb: input skb that header must be set into it.
@@ -237,7 +232,11 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
u8 ssap, u8 dsap, u8 cr)
{
const int hlen = type == LLC_PDU_TYPE_U ? 3 : 4;
- struct llc_pdu_un *pdu = llc_set_pdu_hdr(skb, skb_push(skb, hlen));
+ struct llc_pdu_un *pdu;
+
+ skb_push(skb, hlen);
+ skb->nh.raw = skb->data;
+ pdu = llc_pdu_un_hdr(skb);
pdu->dsap = dsap;
pdu->ssap = ssap;
pdu->ssap |= cr;