diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-03-10 13:34:36 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:42 -0400 |
commit | 37e6636669b0b996681586facee8034f7f674f6a (patch) | |
tree | 4ab874ffd5b5408aa0d8bf59b3dcdb0c89b9b770 | |
parent | 98e399f82ab3a6d863d1d4a7ea48925cc91c830e (diff) |
[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.h | 11 |
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) | |||
218 | return (struct llc_pdu_un *)skb->nh.raw; | 218 | return (struct llc_pdu_un *)skb->nh.raw; |
219 | } | 219 | } |
220 | 220 | ||
221 | static inline void *llc_set_pdu_hdr(struct sk_buff *skb, void *ptr) | ||
222 | { | ||
223 | return skb->nh.raw = ptr; | ||
224 | } | ||
225 | |||
226 | /** | 221 | /** |
227 | * llc_pdu_header_init - initializes pdu header | 222 | * llc_pdu_header_init - initializes pdu header |
228 | * @skb: input skb that header must be set into it. | 223 | * @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, | |||
237 | u8 ssap, u8 dsap, u8 cr) | 232 | u8 ssap, u8 dsap, u8 cr) |
238 | { | 233 | { |
239 | const int hlen = type == LLC_PDU_TYPE_U ? 3 : 4; | 234 | const int hlen = type == LLC_PDU_TYPE_U ? 3 : 4; |
240 | struct llc_pdu_un *pdu = llc_set_pdu_hdr(skb, skb_push(skb, hlen)); | 235 | struct llc_pdu_un *pdu; |
236 | |||
237 | skb_push(skb, hlen); | ||
238 | skb->nh.raw = skb->data; | ||
239 | pdu = llc_pdu_un_hdr(skb); | ||
241 | pdu->dsap = dsap; | 240 | pdu->dsap = dsap; |
242 | pdu->ssap = ssap; | 241 | pdu->ssap = ssap; |
243 | pdu->ssap |= cr; | 242 | pdu->ssap |= cr; |