diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-09-26 22:13:38 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:52:51 -0700 |
| commit | b95cce3576813ac3f86bafa6b5daaaaf7574b0fe (patch) | |
| tree | 54da3f245ee145722623a8e0eaab5fc49ea78511 /net/netfilter/nfnetlink_log.c | |
| parent | 0c4e85813d0a94eeb8bf813397a4907bdd7bb610 (diff) | |
| download | linux-b95cce3576813ac3f86bafa6b5daaaaf7574b0fe.tar.gz linux-b95cce3576813ac3f86bafa6b5daaaaf7574b0fe.tar.bz2 linux-b95cce3576813ac3f86bafa6b5daaaaf7574b0fe.zip | |
[NET]: Wrap hard_header_parse
Wrap the hard_header_parse function to simplify next step of
header_ops conversion.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_log.c')
| -rw-r--r-- | net/netfilter/nfnetlink_log.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c index 8e4001b8f764..332e0f7f6f9e 100644 --- a/net/netfilter/nfnetlink_log.c +++ b/net/netfilter/nfnetlink_log.c @@ -481,12 +481,13 @@ __build_packet_message(struct nfulnl_instance *inst, NFA_PUT(inst->skb, NFULA_MARK, sizeof(tmp_uint), &tmp_uint); } - if (indev && skb->dev && skb->dev->hard_header_parse) { + if (indev && skb->dev) { struct nfulnl_msg_packet_hw phw; - int len = skb->dev->hard_header_parse((struct sk_buff *)skb, - phw.hw_addr); - phw.hw_addrlen = htons(len); - NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw); + int len = dev_parse_header(skb, phw.hw_addr); + if (len > 0) { + phw.hw_addrlen = htons(len); + NFA_PUT(inst->skb, NFULA_HWADDR, sizeof(phw), &phw); + } } if (skb->tstamp.tv64) { |