← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to net/netfilter/nfnetlink_log.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/netfilter/nfnetlink_log.c
381
381
        struct nfulnl_msg_packet_hdr pmsg;
382
382
        struct nlmsghdr *nlh;
383
383
        struct nfgenmsg *nfmsg;
384
 
        __be32 tmp_uint;
385
384
        sk_buff_data_t old_tail = inst->skb->tail;
386
385
 
387
386
        nlh = NLMSG_PUT(inst->skb, 0, 0,
428
427
        }
429
428
 
430
429
        if (outdev) {
431
 
                tmp_uint = htonl(outdev->ifindex);
432
430
#ifndef CONFIG_BRIDGE_NETFILTER
433
431
                NLA_PUT_BE32(inst->skb, NFULA_IFINDEX_OUTDEV,
434
432
                             htonl(outdev->ifindex));
458
456
        if (skb->mark)
459
457
                NLA_PUT_BE32(inst->skb, NFULA_MARK, htonl(skb->mark));
460
458
 
461
 
        if (indev && skb->dev) {
 
459
        if (indev && skb->dev &&
 
460
            skb->mac_header != skb->network_header) {
462
461
                struct nfulnl_msg_packet_hw phw;
463
462
                int len = dev_parse_header(skb, phw.hw_addr);
464
463
                if (len > 0) {